From 22bf89749751bf2204ca1d1d30bda9ce7fde3e5b Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期五, 22 三月 2024 10:20:47 +0800 Subject: [PATCH] fix:皮重阈值删除等于 --- pages/driver-page/driver-index/driver-index.vue | 83 ++++++++++++++++++++++++++++++++++------- 1 files changed, 68 insertions(+), 15 deletions(-) diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue index 86a6c78..caa9cb0 100644 --- a/pages/driver-page/driver-index/driver-index.vue +++ b/pages/driver-page/driver-index/driver-index.vue @@ -175,6 +175,17 @@ @confirm="cancelAppointConfirm" @cancel="cancelAppointCancel"></u-modal> </view> + <!-- 鍦哄唴鎺ュ崟寮圭獥 --> + <view class=""> + <u-modal :show="insideConnectShow" + title="鎺ュ崟閫夋嫨" + showCancelButton + cancel-text="姝e父鎺ュ崟" + confirm-text="鍦哄唴鎺ュ崟" + content="鍦哄唴鎺ュ崟鏃犻渶绉扮毊,鏄惁纭鎺ュ崟" + @confirm="insideConnectConfirm" + @cancel="insideConnectCancel"></u-modal> + </view> <!-- 宸查绾︽彁鐓ゅ崟 --> <view class="Reserved"> <combined-title title="宸查绾︽彁鐓ゅ崟"></combined-title> @@ -244,7 +255,8 @@ <!-- <view class="order-type">{{ item.orderType }}</view> --> </view> </view> - <view class="fourth-line"> + <view class="fourth-line" + v-if="item.status<3"> <view class="button-img" @click.stop="cancelAppoint(item)"> 璇锋眰閫�鍗� @@ -305,14 +317,17 @@ qiangDanTitle: '鎺ュ崟鎻愮ず', qiangDanContent: '', qiangDanOrderPlanId: null, - fleetId: '', - xsUserId: '', - customerId: '', isFirstLogin: true, //鏄惁鏄涓�娆$櫥褰� phone: "", isFirstTime: false, //鏄惁鏄櫥褰曡繘鍏ラ椤碉紝杩樻槸鍒殑椤甸潰杩斿洖 false鏄櫥褰� true鏄埆鐨勯〉闈� cancelAppointShow: false, //纭閫�鍗曞脊绐楁帶鍒� - cancelAppointId: '' + cancelAppointId: '', + insideConnectShow: false, + orderPlanId: '', + fleetId: '', + customerId: '', + xsUserId: '', + filedId: '', }; }, onShow() { @@ -342,16 +357,26 @@ }, // 鎺ュ崟鎸夐挳 qiangDanBtn(value) { - if (value.tmcCount == '0') { - this.qiangDan(value.orderPlanId, value.fleetId, value.customerId === null ? '0' : value.customerId, - value.xsUserId === null ? '0' : value.xsUserId); + //鏄惁鍙互鍦哄唴鎺ュ崟锛�1 鍙互2涓嶅彲浠� + if (value.isInsideConnect === 1) { + this.insideConnectShow = true + this.orderPlanId = value.orderPlanId + this.fleetId = value.fleetId + this.customerId = !value.customerId ? '0' : value.customerId + this.xsUserId = !value.xsUserId ? '0' : value.xsUserId + this.filedId = value.filedId } else { - this.qiangDanOrderPlanId = value.orderPlanId; - this.fleetId = value.fleetId; - this.customerId = value.customerId === null ? '0' : value.customerId; - this.xsUserId = value.xsUserId === null ? '0' : value.xsUserId; - this.qiangDanShow = true; - this.qiangDanContent = `宸叉帴${value.tmcCount}鍗曪紝纭畾鎺ュ崟锛焋; + if (value.tmcCount == '0') { + this.qiangDan(value.orderPlanId, value.fleetId, !value.customerId ? '0' : value.customerId, + !value.xsUserId ? '0' : value.xsUserId); + } else { + this.qiangDanOrderPlanId = value.orderPlanId; + this.fleetId = value.fleetId; + this.customerId = !value.customerId ? '0' : value.customerId; + this.xsUserId = !value.xsUserId ? '0' : value.xsUserId; + this.qiangDanShow = true; + this.qiangDanContent = `宸叉帴${value.tmcCount}鍗曪紝纭畾鎺ュ崟锛焋; + } } }, // 鎺ュ崟妯℃�佹 @@ -390,6 +415,25 @@ uni.hideLoading() }) }, + insideConnectHandle(orderPlanId, fleetId, customerId, xsUserId, filedId) { + uni.showLoading({ + title: '鍔犺浇涓�' + }) + this.$reqPost('insideConnect', { + orderPlanId, + fleetId, + customerId, + xsUserId, + filedId + }, 'params').then(res => { + uni.hideLoading() + if (res.code == 0) { + this.$u.toast('鍦哄唴鎺ュ崟鎴愬姛'); + } else { + this.$u.toast(res.msg ? res.msg : '鍦哄唴鎺ュ崟澶辫触'); + } + }) + }, 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}` @@ -404,7 +448,7 @@ // 璇锋眰閫�鍗� cancelAppoint(item) { if (item.status >= 3) { - this.$uy.toast('褰撳墠鐘舵�佷笉鍙��鍗�') + this.$u.toast('褰撳墠鐘舵�佷笉鍙��鍗�') return } this.cancelAppointShow = true @@ -435,6 +479,15 @@ cancelAppointCancel() { this.cancelAppointShow = false }, + insideConnectCancel() { + this.insideConnectShow = false + this.qiangDan(this.orderPlanId, this.fleetId, this.customerId, this.xsUserId) + }, + // 鍦哄唴鎺ュ崟 + insideConnectConfirm() { + this.insideConnectShow = false + this.insideConnectHandle(this.orderPlanId, this.fleetId, this.customerId, this.xsUserId, this.filedId) + }, // 鍘婚绾� toAppointmentClick(value) { // 鐢变簬鑷富閰嶉�佸崟 鏄璐崟 浣嗘槸涓嶉渶瑕佸~鍐欏師鍙戜负1涓嶉渶瑕佸~鍐欏師鍙� -- Gitblit v1.9.1