From 4f9eb354382eda4fe5e47c12e58a40896df552d9 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 05 七月 2024 17:08:34 +0800
Subject: [PATCH] fix:沧化修改测试bug
---
pages/driver-page/driver-index/driver-index.vue | 70 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index aa915ea..2017cc9 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>
@@ -157,6 +157,7 @@
</view>
<view class="fifth-line">
<view class="button-img"
+ v-if="item.isDanger === 1"
@click.stop="cancelCerifCate(item)">
閬撹矾杩愯緭璇�
</view>
@@ -227,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}}
@@ -248,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}}
@@ -459,7 +460,6 @@
},
// 鎺ュ崟鎸夐挳
qiangDanBtn(value) {
- this.activeObj = value;
//鏄惁鍙互鍦哄唴鎺ュ崟锛�1 鍙互2涓嶅彲浠�
if (value.isInsideConnect === 1) {
this.insideConnectShow = true
@@ -506,12 +506,6 @@
uni.hideLoading()
if (res.code == 0) {
this.$u.toast('鎺ュ崟鎴愬姛');
- //鍒ゆ柇鏄笉鏄泦瑁呯 鏄惁闇�瑕佽緭鍏�
- if(this.activeObj.isContainerNum){
- this.enterCode = true;
- }else{
- this.enterCode = false;
- }
} else {
this.$u.toast(res.msg ? res.msg : '鎺ュ崟澶辫触');
@@ -618,16 +612,25 @@
// 鍘婚绾�
toAppointmentClick(value) {
// 鐢变簬鑷富閰嶉�佸崟 鏄璐崟 浣嗘槸涓嶉渶瑕佸～鍐欏師鍙戜负1涓嶉渶瑕佸～鍐欏師鍙�
- uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0)
- if (value.orderType === '澶栬喘') {
+ uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0);
+ //鍒ゆ柇鏄笉鏄泦瑁呯 鏄惁闇�瑕佽緭鍏�
+ this.activeObj = value;
+ console.log(value,'123')
+ 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}`
+ 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({
url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
});
}
+ }
+
},
// 鑷富閰嶉��
selfDeliver() {
@@ -636,9 +639,10 @@
})
},
cancelCodeEnter(){
+ console.log(this.activeObj,'tmid')
this.activeObj.containerNumber = this.enterCodeStr;
this.$reqPut('addContainer',{
- id:this.activeObj.tmId,
+ id:this.activeObj.id,
containerNumber:this.activeObj.containerNumber
}).then(res=>{
this.$u.toast('鎿嶄綔鎴愬姛');
@@ -647,12 +651,30 @@
}).catch(err=>{
+ }).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}`
+ });
+ } else {
+ uni.navigateTo({
+ url: `/pages/driver-page/appointment/appointment?takeCoalId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}`
+ });
+ }
})
},
cancelCodeCancel(){
- this.activeObj = {};
this.enterCode = false;
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}`
+ });
+ } else {
+ uni.navigateTo({
+ url: `/pages/driver-page/appointment/appointment?takeCoalId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}`
+ });
+ }
}
}
};
--
Gitblit v1.9.1