From 8d80e8c9a3feb6c7e4c3d5dd9aa18f74885d1435 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 07 十一月 2024 10:48:27 +0800
Subject: [PATCH] feat:修改逻辑条件
---
pages/driver-page/driver-index/driver-index.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 24a41d3..45edb4f 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -471,6 +471,8 @@
qiangDanShow: false,
enterCode:false,
openObj:{},
+ //
+ falseProductNames:['1818237609508347905','1818237832536268801','1818211942485995521'],
activeObj:{},
enterCodeStr:'',
qiangDanTitle: '鎺ュ崟鎻愮ず',
@@ -587,7 +589,7 @@
// 鎺ュ崟鎸夐挳
qiangDanBtn(value) {
uni.setStorageSync('isFirstMeet',true)
- if(/鑱氭隘涔欑儻鏍戣剛/.test(value.productName) ){
+ if(/鑱氭隘涔欑儻鏍戣剛/.test(value.productName) || value.packingType == 1 ){
this.activeObj = value;
this.showLing = true;
this.lingFlag = true;
@@ -781,7 +783,7 @@
this.enterCode = true;
}else{
this.enterCode = false;
- if (value.orderType === '澶栬喘') {
+ if (value.orderType === '澶栬喘' && value.isWeight === 1 && value.productNames.split(',').filter(item => item != '').length <= 1 && this.falseProductNames.includes(value.productId)) {
uni.navigateTo({
url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}&isWeight=${value.isWeight}`
});
@@ -813,7 +815,7 @@
}).catch(err=>{
}).finally(() => {
- if (this.activeObj.orderType === '澶栬喘') {
+ if (this.activeObj.orderType === '澶栬喘' && this.activeObj.isWeight === 1 && this.activeObj.productNames.filter(item => item != '').length <= 1 && this.falseProductNames.includes(this.activeObj.productId)) {
uni.navigateTo({
url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}&isSpecial=${this.activeObj.isSpecial}&isWeight=${this.activeObj.isWeight}`
});
@@ -827,7 +829,7 @@
cancelCodeCancel(){
this.enterCode = false;
this.enterCodeStr = '';
- if (this.activeObj.orderType === '澶栬喘') {
+ if (this.activeObj.orderType === '澶栬喘 '&& this.activeObj.isWeight === 1 && this.activeObj.productNames.split(',').filter(item => item != '').length <= 1 && this.falseProductNames.includes(this.activeObj.productId)) {
uni.navigateTo({
url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}&isSpecial=${this.activeObj.isSpecial}&isWeight=${this.activeObj.isWeight}`
});
@@ -847,7 +849,7 @@
// 缃┖ radioGroupValue 鍗冲彇娑堥�変腑鐨勫��
this.radioGroupValue = ''
// 鍒濆鍖� num
- this.num = 0
+ this.num = 0
}
},
// 褰撳垏鎹㈠叾浠栭�夐」鐨勬椂鍊欐鏂规硶鎵嶄細鎵ц
--
Gitblit v1.9.1