From 760f13c7bc65f53db08c7a8101a0e469ef69ff73 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 01 八月 2024 16:13:32 +0800
Subject: [PATCH] feat:矿场改单位
---
pages/driver-page/driver-index/driver-index.vue | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 0cbbb46..b3312b8 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -9,7 +9,7 @@
<!-- 寮曞椤� -->
<noob-tour></noob-tour>
<!-- 鑷富閰嶉�佺晫闈� -->
- <view class="self-deliver">
+ <!-- <view class="self-deliver">
<view class="self-deliver_text">
鍒涘缓鑷富閰嶉�佸崟
</view>
@@ -19,7 +19,7 @@
shape="cirle"
@click="selfDeliver"></u-button>
</view>
- </view>
+ </view> -->
<view class="collection-form">
<view class="collection-form-item"
v-for="(item, index) in driverBillOfLoadingData.list1"
@@ -157,7 +157,7 @@
</view>
<view class="fifth-line">
<view class="button-img"
- v-if="item.isDanger === 1"
+ v-if="item.isDanger === 1 && !item.idCardEscort"
@click.stop="cancelCerifCate(item)">
閬撹矾杩愯緭璇�
</view>
@@ -430,6 +430,7 @@
.then(res => {
if (res.code == 0) {
this.$u.toast('娣诲姞鎴愬姛');
+ this.qiangDanList();
this.show=false
} else {
this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
@@ -540,13 +541,13 @@
},
list3CardIconClick(value) {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${value.id}&yyId=${value.yyId}&orderType=${value.orderType}`
+ url: `/subPages/bill-of-lading-details/bill-of-lading-details?orderPlanId=${value.id}&yyId=${value.yyId}&orderType=${value.orderType}`
});
},
// 鏀跺彂鍗曡鎯�
cardBodyClick(name) {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}`
+ url: `/subPages/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}`
});
},
// 璇锋眰閫�鍗�
@@ -615,14 +616,20 @@
uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0);
//鍒ゆ柇鏄笉鏄泦瑁呯 鏄惁闇�瑕佽緭鍏�
this.activeObj = value;
- console.log(value,'123')
+ if(value.isDanger === 1){
+ if(!value.idCardEscort){
+ this.$u.toast('璇烽�夋嫨閬撹矾杩愯緭璇佸徃鏈猴紒');
+ this.cancelCerifCate(value);
+ return
+ }
+ }
if(value.isContainerNum){
this.enterCode = true;
}else{
this.enterCode = false;
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}&isWeight=${value.isWeight}`
+ 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}`
});
} else {
uni.navigateTo({
@@ -654,7 +661,7 @@
}).finally(() => {
if (this.activeObj.orderType === '澶栬喘') {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/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}`
+ 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}`
});
} else {
uni.navigateTo({
@@ -668,7 +675,7 @@
this.enterCodeStr = '';
if (this.activeObj.orderType === '澶栬喘') {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/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}`
+ 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}`
});
} else {
uni.navigateTo({
--
Gitblit v1.9.1