From 8edf190dd8755446613da55e0730c4aeabf60890 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 11 二月 2025 08:30:10 +0800
Subject: [PATCH] Revert "faat:提煤单详情下磅文字修改"
---
pages/driver-page/driver-index/driver-index.vue | 253 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 212 insertions(+), 41 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 88116c4..cb3290c 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -4,10 +4,22 @@
<view class="driver-index-body">
<!-- 寰呴鍙栨彁鐓ゅ崟 -->
<view class="wait-collection"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain">
+ style="background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain">
</view>
<!-- 寮曞椤� -->
<noob-tour></noob-tour>
+ <!-- 鑷富閰嶉�佺晫闈� -->
+ <view class="self-deliver">
+ <view class="self-deliver_text">
+ 鍒涘缓鑷富閰嶉�佸崟
+ </view>
+ <view class="self-deliver_btn">
+ <u-button text="鍘诲垱寤�"
+ type="primary"
+ shape="cirle"
+ @click="selfDeliver"></u-button>
+ </view>
+ </view>
<view class="collection-form">
<view class="collection-form-item"
v-for="(item, index) in driverBillOfLoadingData.list1"
@@ -62,7 +74,9 @@
<view class="fourth-line"
@click="qiangDanBtn(item)"
v-if="item.carNum - item.taskNum !== 0">
- <view class="button-img">绔嬪嵆鎺ュ崟</view>
+ <!-- <view class="button-img">绔嬪嵆鎺ュ崟</view> -->
+ <u-button type="primary"
+ class="button-img">绔嬪嵆鎺ュ崟</u-button>
</view>
</view>
</view>
@@ -75,7 +89,6 @@
@confirm="qiangDanConfirm"
@cancel="qiangDanCancel"></u-modal>
</view>
-
<!-- 寰呴绾︽彁鐓ゅ崟 -->
<view class="wait-appointment">
<combined-title title="寰呴绾︽彁鐓ゅ崟"></combined-title>
@@ -144,11 +157,13 @@
</view>
<view class="fourth-line">
<view class="button-img"
+ v-if="!(item.orderType === '鍐呰喘' ||item.orderType === '杞叆')"
@click.stop="cancelAppoint(item)">
璇锋眰閫�鍗�
</view>
<view class="button-img"
@click.stop="toAppointmentClick(item)">绔嬪嵆棰勭害</view>
+
</view>
</view>
</view>
@@ -161,6 +176,30 @@
content="鏄惁纭閫�鍗�"
@confirm="cancelAppointConfirm"
@cancel="cancelAppointCancel"></u-modal>
+ </view>
+ <!-- 鍦哄唴鎺ュ崟寮圭獥 -->
+ <view class="">
+ <u-modal :show="insideConnectShow"
+ title="鎺ュ崟閫夋嫨"
+ showCancelButton
+ cancel-text="姝ｅ父鎺ュ崟"
+ confirm-text="鍦哄唴鎺ュ崟"
+ content="鍦哄唴鎺ュ崟鏃犻渶绉扮毊,鏄惁纭鎺ュ崟"
+ @confirm="insideConnectConfirm"
+ @cancel="insideConnectCancel"></u-modal>
+ </view>
+ <!-- 浜岀淮鐮佸脊绐� -->
+ <view class="qCodeModal">
+ <u-modal :show="qCodeModalVisible"
+ :showConfirmButton="false"
+ :negativeTop="150"
+ @close="qCodeModalVisible = false"
+ closeOnClickOverlay
+ >
+ <uv-qrcode ref="qrcode" canvas-id="qrcode" :value="qCodeValue" size="500rpx" :loading="qCodeloading"
+ :options="options"></uv-qrcode>
+
+ </u-modal>
</view>
<!-- 宸查绾︽彁鐓ゅ崟 -->
<view class="Reserved">
@@ -231,6 +270,16 @@
<!-- <view class="order-type">{{ item.orderType }}</view> -->
</view>
</view>
+ <view class="fourth-line">
+ <view class="button-img"
+ v-if="item.status<3 && !(item.orderType === '鍐呰喘' ||item.orderType === '杞叆')"
+ @click.stop="cancelAppoint(item)">
+ 璇锋眰閫�鍗�
+ </view>
+ <view class="button-img"
+ v-if="item.qrCode == 1"
+ @click.stop="viewQcode(item)">鏌ョ湅浜岀淮鐮�</view>
+ </view>
</view>
</view>
<view class="white-block"></view>
@@ -247,11 +296,13 @@
import noobTour from '@/components/noobTour/noobTour.vue'
import { mapState } from 'vuex'
import { BaseUrl } from '@/api/publicInterface.js'
+ import uvQrcode from '@/uni_modules/uv-qrcode/components/uv-qrcode/uv-qrcode.vue'; // 寮曞叆鐢熸垚浜岀淮鐮佺粍浠�
export default {
components: {
combinedTitle,
previewImage,
- noobTour
+ noobTour,
+ uvQrcode
},
props: {
indexdriverBillOfLoadingData: {
@@ -276,6 +327,8 @@
},
data() {
return {
+ qCodeValue:'',
+ qCodeloading:false,
driverBillOfLoadingData: {
list1: [],
list2: [],
@@ -284,16 +337,28 @@
// 鎺ュ崟妯℃�佹
qiangDanShow: false,
qiangDanTitle: '鎺ュ崟鎻愮ず',
+ qCodeModalVisible:false,
qiangDanContent: '',
qiangDanOrderPlanId: null,
- fleetId: '',
- xsUserId: '',
- customerId: '',
isFirstLogin: true, //鏄惁鏄涓�娆＄櫥褰�
phone: "",
isFirstTime: false, //鏄惁鏄櫥褰曡繘鍏ラ椤碉紝杩樻槸鍒殑椤甸潰杩斿洖 false鏄櫥褰� true鏄埆鐨勯〉闈�
cancelAppointShow: false, //纭閫�鍗曞脊绐楁帶鍒�
- cancelAppointId: ''
+ cancelAppointId: '',
+ insideConnectShow: false,
+ orderPlanId: '',
+ fleetId: '',
+ customerId: '',
+ xsUserId: '',
+ filedId: '',
+ options: {
+ useDynamicSize: false,
+ errorCorrectLevel: 'Q',
+ margin: 10,
+ areaColor: "#fff",
+ // 鎸囧畾浜岀淮鐮佸墠鏅紝涓�鑸彲鍦ㄤ腑闂存斁logo
+ foregroundImageSrc: '',
+ }
};
},
onShow() {
@@ -323,16 +388,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}鍗曪紝纭畾鎺ュ崟锛焋;
+ }
}
},
// 鎺ュ崟妯℃�佹
@@ -358,7 +433,7 @@
.then(res => {
uni.hideLoading()
if (res.code == 0) {
- this.$u.toast('鎺ュ崟鎴愬姛');
+ this.$u.toast('鎺ュ崟姝ｅ湪澶勭悊涓�...');
} else {
this.$u.toast(res.msg ? res.msg : '鎺ュ崟澶辫触');
}
@@ -366,10 +441,29 @@
.then(() => {
setTimeout(() => {
this.qiangDanList();
- }, 1000);
+ }, 1500);
}).catch(e => {
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({
@@ -384,6 +478,10 @@
},
// 璇锋眰閫�鍗�
cancelAppoint(item) {
+ if (item.status >= 3) {
+ this.$u.toast('褰撳墠鐘舵�佷笉鍙��鍗�')
+ return
+ }
this.cancelAppointShow = true
this.cancelAppointId = item.id
},
@@ -412,12 +510,62 @@
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) {
- uni.navigateTo({
- url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
- });
+ // 鐢变簬鑷富閰嶉�佸崟 鏄璐崟 浣嗘槸涓嶉渶瑕佸～鍐欏師鍙戜负1涓嶉渶瑕佸～鍐欏師鍙�
+ uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0)
+ 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}&coalName=${value.coalName}`
+ });
+ } else {
+ uni.navigateTo({
+ url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&coalName=${value.coalName}`
+ });
+ }
},
+ // 鑷富閰嶉��
+ selfDeliver() {
+ uni.navigateTo({
+ url: '/pages/driver-page/driver-index/SelfDelivery/SelfDelivery'
+ })
+ },
+ //鏌ョ湅浜岀淮鐮�
+ viewQcode(item){
+ console.log('鏌ョ湅浜岀淮鐮�')
+
+ this.$reqGet('showQRCode',{code:item.code}).then(res=>{
+ console.log(res,'ress')
+ if(res.data){
+ this.qCodeModalVisible = true;
+ this.qCodeValue = res.data;
+ this.$nextTick(() => {
+ this.$refs.qrcode.remake({
+ success: () => {
+ console.log('鐢熸垚鎴愬姛');
+ },
+ fail: err => {
+ console.log(err)
+ }
+ });
+ })
+ }else{
+ this.$u.toast(res.msg || '鐢熸垚澶辫触')
+ }
+
+ })
+
+
+ }
}
};
</script>
@@ -491,8 +639,7 @@
.button-img {
width: vww(122);
height: vww(41);
-
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
+ background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
font-weight: 300;
@@ -501,6 +648,20 @@
line-height: vww(40);
}
+ }
+
+ /deep/.u-button {
+ width: 100%;
+ height: 28px !important;
+ line-height: 40px;
+ padding: 0 12px;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #ffffff;
+ background: #497bfb !important;
+ letter-spacing: 4rpx;
+ border-radius: 37rpx 37rpx 37rpx 37rpx !important;
+ box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
}
.exceedHide {
@@ -521,6 +682,20 @@
.wait-collection {
width: 100%;
height: 600rpx;
+ }
+
+ // 鑷富閰嶉��
+ .self-deliver {
+ position: relative;
+ top: vww(-120);
+ width: 88%;
+ height: vww(50);
+ margin: vww(8) auto;
+ padding: 0 vww(8);
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ @include flex;
}
.collection-form {
@@ -569,7 +744,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat;
+ background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -612,7 +787,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
+ background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -714,27 +889,17 @@
}
}
+ // 寰呴绾�
.fourth-line {
width: 30%;
height: vww(68);
margin-left: vww(15);
+ margin-top: vww(5);
display: flex;
justify-content: flex-end;
position: relative;
left: vww(203);
bottom: vww(3);
-
- .button-img {
- width: 100%;
- height: 100%;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
- background-size: cover;
- font-size: 28rpx;
- font-weight: 300;
- color: #ffffff;
- text-align: center;
- line-height: vww(33);
- }
}
}
}
@@ -780,7 +945,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat;
+ background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -816,7 +981,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
+ background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -854,7 +1019,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
+ background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -926,6 +1091,12 @@
}
.Reserved {
+ .fourth-line {
+ justify-content: flex-end;
+ letter-spacing: vww(2);
+ left: 223rpx !important;
+ }
+
.white-block {
width: 100%;
height: vww(50);
--
Gitblit v1.9.1