From b5d3561a2e06106ed9cce2c6bcc9c2463951e998 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期五, 15 十一月 2024 11:06:26 +0800
Subject: [PATCH] 新增申请页面不显示发运通知单的问题修改

---
 pages/home/home.vue                       |    1 +
 pages/jihua/jihua.vue                     |   21 ++++++++++++++++++---
 pages/new-application/new-application.vue |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5a5a717..f0910eb 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -867,6 +867,7 @@
 };
 </script>
 
+
 <style lang="scss" scoped>
 ::v-deep.home {
 	width: 100%;
diff --git a/pages/jihua/jihua.vue b/pages/jihua/jihua.vue
index 4c28ca2..5f6488b 100644
--- a/pages/jihua/jihua.vue
+++ b/pages/jihua/jihua.vue
@@ -17,6 +17,9 @@
 						<view class="jihua-main-line">
 							<view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view>
 						</view>
+            <view class="jihua-main-line" v-if="item.order && item.order.customerAddressName != item.customerName">
+              <view class="name">鏀惰揣鍗曚綅锛歿{item.order && item.order.customerAddressName || ''}}</view>
+            </view>
 						<view class="jihua-main-line">
 							<view class="main-flex">
 								<view>鐓ょ锛歿{ item.order.coalName || '' }}</view>
@@ -119,7 +122,7 @@
 			<view class="editPopup">
 				<view class="editPopup__title"><text>璁″垝杞︽暟</text></view>
 				<view class="editPopup__input"><u--input v-model="keyBoardValue" placeholder="璇疯緭鍏ュ唴瀹�" type="number" border="surround"></u--input></view>
-				<!-- <view class="editPopup__btn"><u-button text="纭畾" type="primary" @click="popupDetermineClick"></u-button></view> -->
+				<view class="editPopup__btn"><u-button text="纭畾" type="primary" @click="keyBoardConfirm"></u-button></view>
 			</view>
 		</u-popup>
 
@@ -138,6 +141,11 @@
 	components: {
 		popupMenu
 	},
+  computed: {
+    isShowCAN() {  //鏄惁鏄剧ず鏀惰揣鍗曚綅
+
+    }
+  },
 	data() {
 		return {
 			radioValue: '鍏ㄩ儴',
@@ -243,7 +251,8 @@
 				status: 2,
 				trainType: 1,
 				compId: compId,
-				endDate: this.info.shippingDate
+        type: '澶栭攢',
+				endDate: this.info.shippingDate,
 			};
 			this.$reqGet('fyList', params).then(res => {
 				if (res.code == 0) {
@@ -435,6 +444,7 @@
 		},
 		// 閿洏
 		valChange(val) {
+      console.log(val,'宸茶缃殑璁″垝====')
 			// this.keyBoardValue += val;
 			// 灏嗘瘡娆℃寜閿殑鍊兼嫾鎺ュ埌value鍙橀噺涓紝娉ㄦ剰+=鍐欐硶
 			this.fyData.map(item => {
@@ -512,6 +522,10 @@
   width: 100%;
   display: flex;
   flex-direction: column;
+}
+.editPopup__btn{
+  width: vww(100);
+  margin:20rpx auto 0;
 }
 ::v-deep {
 	.u-tabs__wrapper__nav {
@@ -639,7 +653,8 @@
 			}
 
 			.name {
-				font-weight: 600 !important;
+				font-weight: 550 !important;
+        line-height: 54rpx;
 			}
 
 			.main-flex {
diff --git a/pages/new-application/new-application.vue b/pages/new-application/new-application.vue
index cf51a50..797a895 100644
--- a/pages/new-application/new-application.vue
+++ b/pages/new-application/new-application.vue
@@ -84,7 +84,7 @@
 				filter: true,
 				status: 1,
 				pageNumber: 1,
-				pageSize: 10,
+				pageSize: 100,
 				sort: 'createTime',
 				order: 'desc'
 			},

--
Gitblit v1.9.1