From 0ad1bb4a25e7b5d98b4d0fc18e7294d132e1ec3e Mon Sep 17 00:00:00 2001
From: wk
Date: 星期四, 13 六月 2024 14:44:58 +0800
Subject: [PATCH] feat：运输证
---
pages/driver-page/driver-index/driver-index.vue | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 264 insertions(+), 36 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 88116c4..ec676d1 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -8,6 +8,18 @@
</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"
@@ -56,13 +68,15 @@
size="40"></u-icon></view>
<view class="send-date">{{ item.sendDate }}</view>
<view class="type">
- <view class="coal-name">{{ item.coalName }}</view>
+ <view class="coal-name">{{ item.productNames || item.productName }}</view>
</view>
</view>
<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>
@@ -138,11 +151,15 @@
<view class="send-date">{{ item.sendDate }}</view>
</view>
<view class="type">
- <view class="coal-name">{{ item.coalName }}</view>
+ <view class="coal-name">{{ item.productNames || item.productName }}</view>
<!-- <view class="order-type">{{ item.orderType }}</view> -->
</view>
</view>
- <view class="fourth-line">
+ <view class="fifth-line">
+ <view class="button-img"
+ @click.stop="cancelCerifCate(item)">
+ 娣诲姞鎶艰繍鍛�
+ </view>
<view class="button-img"
@click.stop="cancelAppoint(item)">
璇锋眰閫�鍗�
@@ -161,6 +178,17 @@
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="Reserved">
@@ -227,8 +255,19 @@
<view class="send-date">{{ item.yuYueSection|| '' }}</view>
</view>
<view class="type">
- <view class="coal-name">{{ item.coalName || '' }}</view>
+ <view class="coal-name">{{ item.productNames || item.productName }}</view>
<!-- <view class="order-type">{{ item.orderType }}</view> -->
+ </view>
+ </view>
+ <view class="fourth-line"
+ v-if="item.status<3">
+ <view class="button-img"
+ @click.stop="cancelCerifCate(item)">
+ 娣诲姞鎶艰繍鍛�
+ </view>
+ <view class="button-img"
+ @click.stop="cancelAppoint(item)">
+ 璇锋眰閫�鍗�
</view>
</view>
</view>
@@ -237,6 +276,31 @@
</view>
</view>
</view>
+ <u-popup :show="show"
+ @close="close"
+ @open="open"
+ mode="center"
+ round="10">
+ <view class="receiverPopup">
+ <uni-table border
+ stripe
+ type="selection"
+ @selection-change="selectionChange"
+ emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <uni-th align="center">鎶艰繍鍛�</uni-th>
+ </uni-tr>
+ <uni-tr v-for="(item, index) in inspectData"
+ :key="item.id">
+ <uni-td align="center">{{ item.name.split("|")[0] }}</uni-td>
+ </uni-tr>
+ </uni-table>
+ <view class="receiverPopup__btn"><u-button text="纭畾"
+ type="primary"
+ @click="popClick"
+ :loading="ClickLoading"></u-button></view>
+ </view>
+ </u-popup>
</view>
</template>
@@ -276,6 +340,9 @@
},
data() {
return {
+ show: false,
+ yaList:[],
+ inspectData:[],
driverBillOfLoadingData: {
list1: [],
list2: [],
@@ -286,20 +353,49 @@
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() {
this.init();
},
methods: {
+ open() {},
+ close() {
+ this.show = false;
+ },
+ selectionChange(e) {
+ this.yaList= e.detail.index.map(item=>{
+ return this.inspectData[item]
+ })
+ },
+ popClick(){
+ let data=this.yaList.map(item=>{
+ return item.name
+ })
+ let paramsData={
+ idCardEscort:data.join(','),roadTransportId:this.yaList[0].roadTransportId,id: this.yaList[0].Id
+ }
+ this.$reqPut('saveMyEscort', paramsData, 'json')
+ .then(res => {
+ if (res.code == 0) {
+ this.$u.toast('娣诲姞鎴愬姛');
+ this.show=false
+ } else {
+ this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
+ }
+ })
+ },
// 璺宠浆鍦板浘
skipMap(val) {
uni.navigateTo({
@@ -309,6 +405,7 @@
});
},
init() {
+ this.inspectData=[]
this.qiangDanList();
},
// 鍙告満棣栭〉鍒楄〃
@@ -323,16 +420,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}鍗曪紝纭畾鎺ュ崟锛焋;
+ }
}
},
// 鎺ュ崟妯℃�佹
@@ -366,10 +473,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,8 +510,28 @@
},
// 璇锋眰閫�鍗�
cancelAppoint(item) {
+ if (item.status >= 3) {
+ this.$u.toast('褰撳墠鐘舵�佷笉鍙��鍗�')
+ return
+ }
this.cancelAppointShow = true
this.cancelAppointId = item.id
+ },
+ cancelCerifCate(value){
+ this.$reqGet('getMyEscortList', { customerId: value.customerId }).then(res => {
+ this.inspectData=[]
+ if (res.code == 0) {
+ this.inspectData=res.data.persons.map(item=>{
+ return {name:item,roadTransportId:res.data.id,Id: value.id}
+ })
+ this.show=true
+ } else {
+ this.$u.toast(res.msg ? res.msg : '璇锋坊鍔犻亾璺繍杈撹瘉');
+ uni.navigateTo({
+ url: '/pages/driver-page/drvier-my/certifiCate/certifiCate'
+ })
+ }
+ })
},
// 閫�鍗曞脊绐楃‘璁�
cancelAppointConfirm() {
@@ -412,12 +558,35 @@
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}`
+ });
+ } else {
+ uni.navigateTo({
+ url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
+ });
+ }
},
+ // 鑷富閰嶉��
+ selfDeliver() {
+ uni.navigateTo({
+ url: '/pages/driver-page/driver-index/SelfDelivery/SelfDelivery'
+ })
+ }
}
};
</script>
@@ -491,7 +660,6 @@
.button-img {
width: vww(122);
height: vww(41);
-
background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
@@ -501,6 +669,39 @@
line-height: vww(40);
}
+ }
+ .receiverPopup {
+ height: vww(110);
+ width: 300rpx;
+
+ .receiverPopup__title {
+ margin: vww(10) auto 0;
+ width: 80%;
+ text-align: center;
+ }
+
+
+ &__btn {
+ margin: vww(10) auto;
+ width: 50%;
+
+ .u-button {
+ height: vww(20);
+ }
+ }
+ }
+ /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 +722,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 {
@@ -714,27 +929,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);
- }
}
}
}
@@ -922,10 +1127,33 @@
.fourth-line {
@include fourthLine;
}
+ .fifth-line {
+ height: vww(68);
+ display: flex;
+ align-items: center;
+ .button-img {
+ width: vww(122);
+ height: vww(41);
+ 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(40);
+
+ }
+ }
}
}
.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