From bc283f3277c5da93684864e8fbd9f3aee262ca7a Mon Sep 17 00:00:00 2001
From: wk
Date: 星期六, 29 六月 2024 13:49:25 +0800
Subject: [PATCH] feta:临时入场

---
 pages/driver-page/driver-index/driver-index.vue |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index b7f8e31..85d7c49 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -30,9 +30,9 @@
 								<view class="sign">瑁�</view>
 								<view class="filedname exceedHide">
 									<text
-										v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'  ">{{ item.deptName|| ''  }}</text>
+										v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�'  ">{{ item.deptName|| ''  }}</text>
 									<text
-										v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.customerId?item.customerName:item.customerNameCopy|| ''  }}</text>
+										v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�'  ">{{ item.customerId?item.customerName:item.customerNameCopy|| ''  }}</text>
 									<text v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.filedName}}
 
 									</text>
@@ -47,11 +47,11 @@
 							<view class="main-information">
 								<view class="sign">鍗�</view>
 								<view class="filedname exceedHide">
-									<text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">
+									<text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">
 										{{ item.customerNameCopy ? item.customerNameCopy : item.customerName|| ''  }}
 									</text>
 									<text
-										v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.deptName|| ''  }}</text>
+										v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�'  ">{{ item.deptName|| ''  }}</text>
 									<text
 										v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.toFiledName}}
 
@@ -109,9 +109,9 @@
 									<view class="sign">瑁�</view>
 									<view class="filedname exceedHide">
 										<text
-											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.deptName }}</text>
+											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.deptName }}</text>
 										<text
-											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.customerName }}</text>
+											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.customerName }}</text>
 										<text
 											v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.filedName}}
 										</text>
@@ -129,9 +129,9 @@
 									<view class="sign">鍗�</view>
 									<view class="filedname exceedHide">
 										<text
-											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.customerName }}</text>
+											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.customerName }}</text>
 										<text
-											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.deptName }}</text>
+											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�'  ">{{ item.deptName }}</text>
 										<text
 											v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.toFiledName}}</text>
 									</view>
@@ -228,9 +228,9 @@
 									<view class="sign">瑁�</view>
 									<view class="filedname exceedHide">
 										<text
-											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.deptName }}</text>
+											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.deptName }}</text>
 										<text
-											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.customerName }}</text>
+											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�'  ">{{ item.customerName }}</text>
 										<text v-else-if="item.orderType == '杞嚭'||item.orderType == '杞叆'">
 											{{item.filedName}}
 
@@ -249,9 +249,9 @@
 									<view class="sign">鍗�</view>
 									<view class="filedname exceedHide">
 										<text
-											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.customerName }}</text>
+											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.customerName }}</text>
 										<text
-											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'">{{ item.deptName }}</text>
+											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.deptName }}</text>
 										<text v-else-if="item.orderType == '杞嚭'||item.orderType == '杞叆'">
 											{{item.toFiledName}}
 
@@ -622,7 +622,7 @@
 				uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0)
 				if (value.orderType === '澶栬喘') {
 					uni.navigateTo({
-						url: `/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}`
+						url: `/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}&isWeight=${value.isWeight}`
 					});
 				} else {
 					uni.navigateTo({

--
Gitblit v1.9.1