From 04d59f2664e399e691e6212c0a4e1ed2a18e1917 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 05 十一月 2024 09:59:18 +0800
Subject: [PATCH] feat:集装箱号bug
---
pages/driver-page/driver-index/driver-index.vue | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 795fe9e..45edb4f 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -75,7 +75,7 @@
</view>
<view class="fourth-line"
- @click="qiangDanBtn(item)"
+ @click="qiangDanTiShi(item)"
v-if="item.carNum - item.taskNum !== 0">
<!-- <view class="button-img">绔嬪嵆鎺ュ崟</view> -->
<u-button type="primary"
@@ -164,7 +164,7 @@
<view class="button-img"
v-if="item.isDanger === 1 && !item.idCardEscort"
@click.stop="cancelCerifCate(item)">
- 鍓ф瘨杩愯緭璇�
+ 鍓ф瘨閫氳璇�
</view>
<view class="button-img"
@click.stop="cancelAppoint(item)">
@@ -288,7 +288,7 @@
v-if="item.isDanger === 1">
<view class="button-img"
@click.stop="cancelCerifCate(item)">
- 鍓ф瘨杩愯緭璇�
+ 鍓ф瘨閫氳璇�
</view>
<view class="button-img"
@click.stop="cancelAppoint(item)">
@@ -409,6 +409,9 @@
:loading="ClickLoading"></u-button></view>
</view>
</u-popup>
+ <u-modal :show="isFirstShow" :title="'娓╅Θ鎻愮ず'" @confirm="isFirstConFirm">
+ <view>鍏ュ満闇�瑕佹壂鎻忚溅鐗岀収鍜屽埛韬唤璇佸叆鍦猴紝璇锋惡甯﹁韩浠借瘉鍘熶欢!</view>
+ </u-modal>
</view>
</template>
@@ -450,9 +453,11 @@
show: false,
BaseUrl,
yaList:[],
+ isFirstShow:false,
num:0,
radioValue:'',
showLing:false,
+ jiedanObj:{},
pageList:[],
receiveNum:"",
inspectData:[],
@@ -466,6 +471,8 @@
qiangDanShow: false,
enterCode:false,
openObj:{},
+ //
+ falseProductNames:['1818237609508347905','1818237832536268801','1818211942485995521'],
activeObj:{},
enterCodeStr:'',
qiangDanTitle: '鎺ュ崟鎻愮ず',
@@ -581,7 +588,8 @@
},
// 鎺ュ崟鎸夐挳
qiangDanBtn(value) {
- if(/鑱氭隘涔欑儻鏍戣剛/.test(value.productName) ){
+ uni.setStorageSync('isFirstMeet',true)
+ if(/鑱氭隘涔欑儻鏍戣剛/.test(value.productName) || value.packingType == 1 ){
this.activeObj = value;
this.showLing = true;
this.lingFlag = true;
@@ -611,6 +619,16 @@
this.qiangDanContent = `宸叉帴${value.tmcCount}鍗曪紝纭畾鎺ュ崟锛焋;
}
}
+ },
+ qiangDanTiShi(item){
+ const flag = uni.getStorageSync('isFirstMeet');
+ this.jiedanObj = item;
+ if(!flag){
+ this.isFirstShow = true;
+ }else{
+ this.qiangDanBtn(item)
+ }
+
},
// 鎺ュ崟妯℃�佹
qiangDanConfirm() {
@@ -707,7 +725,7 @@
})
this.show=true
} else {
- this.$u.toast(res.msg ? res.msg : '璇锋坊鍔犲墽姣掕繍杈撹瘉');
+ this.$u.toast(res.msg ? res.msg : '璇锋坊鍔犲墽姣掗�氳璇�');
uni.navigateTo({
url: '/pages/driver-page/drvier-my/certifiCate/certifiCate'
})
@@ -756,7 +774,7 @@
this.activeObj = value;
if(value.isDanger === 1){
if(!value.idCardEscort){
- this.$u.toast('璇烽�夋嫨鍓ф瘨杩愯緭璇佸徃鏈猴紒');
+ this.$u.toast('璇烽�夋嫨鍓ф瘨閫氳璇佸徃鏈猴紒');
this.cancelCerifCate(value);
return
}
@@ -765,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}`
});
@@ -797,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}`
});
@@ -811,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}`
});
@@ -831,13 +849,18 @@
// 缃┖ radioGroupValue 鍗冲彇娑堥�変腑鐨勫��
this.radioGroupValue = ''
// 鍒濆鍖� num
- this.num = 0
+ this.num = 0
}
},
// 褰撳垏鎹㈠叾浠栭�夐」鐨勬椂鍊欐鏂规硶鎵嶄細鎵ц
radioChange(n) {
console.log(n,'213')
+ },
+ isFirstConFirm(){
+ this.isFirstShow = false;
+ console.log(this.jiedanObj,'jiedan')
+ this.qiangDanBtn(this.jiedanObj)
}
}
--
Gitblit v1.9.1