From 6a232ec3d1d75af66b5afb475895d585a494cbaf Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期六, 29 六月 2024 16:24:35 +0800
Subject: [PATCH] feat:小程序修改问题若干
---
pages/driver-page/driver-index/driver-index.vue | 249 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 231 insertions(+), 18 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index c979b86..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>
@@ -155,7 +155,12 @@
<!-- <view class="order-type">{{ item.orderType }}</view> -->
</view>
</view>
- <view class="fourth-line">
+ <view class="fifth-line">
+ <view class="button-img"
+ v-if="item.isDanger === 1"
+ @click.stop="cancelCerifCate(item)">
+ 閬撹矾杩愯緭璇�
+ </view>
<view class="button-img"
@click.stop="cancelAppoint(item)">
璇锋眰閫�鍗�
@@ -187,6 +192,23 @@
@cancel="insideConnectCancel"></u-modal>
</view>
<!-- 宸查绾︽彁鐓ゅ崟 -->
+ <!-- 濉啓闆嗚绠卞彿 -->
+ <view class="">
+ <u-modal :show="enterCode"
+ title="闆嗚绠卞彿"
+ showCancelButton
+ content="璇峰～鍐欓泦瑁呯鍙�"
+ @confirm="cancelCodeEnter"
+ @cancel="cancelCodeCancel">
+ <view style=" display: flex; align-items: center;">
+ <text>璇疯緭鍏ワ細</text> <u--input
+ style="border: 1px solid black"
+ v-model="enterCodeStr"
+ placeholder="璇疯緭鍏ラ泦瑁呯鍙�"></u--input>
+ </view>
+
+ </u-modal>
+ </view>
<view class="Reserved">
<combined-title title="宸查绾︽彁鐓ゅ崟"></combined-title>
<u-empty mode="data"
@@ -206,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}}
@@ -227,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}}
@@ -256,7 +278,11 @@
</view>
</view>
<view class="fourth-line"
- v-if="item.status<3">
+ v-if="item.isDanger === 1">
+ <view class="button-img"
+ @click.stop="cancelCerifCate(item)">
+ 閬撹矾杩愯緭璇�
+ </view>
<view class="button-img"
@click.stop="cancelAppoint(item)">
璇锋眰閫�鍗�
@@ -268,6 +294,48 @@
</view>
</view>
</view>
+ <u-popup :show="show"
+ @close="close"
+ @open="open"
+ mode="center"
+ round="10">
+ <view class="receiverPopup">
+ <view class="image">
+ <u--image
+ :src="previewImageSrc != null ? BaseUrl + previewImageSrc : ''"
+ width="80px"
+ height="80px"
+ >
+ <view slot="error"
+ style="font-size: 24rpx;">鍔犺浇澶辫触</view>
+ </u--image>
+ </view>
+ <view class="tables">
+ <uni-table border
+ stripe
+ type="selection"
+ @selection-change="selectionChange"
+ emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <uni-th align="center">鎶艰繍鍛�</uni-th>
+ <uni-th align="center">韬唤璇佸彿</uni-th>
+ <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-td align="center">{{ item.name.split("|")[1] }}</uni-td>
+ <uni-td align="center">{{ item.name.split("|")[2] }}</uni-td>
+ </uni-tr>
+ </uni-table>
+ </view>
+
+ <view class="receiverPopup__btn"><u-button text="纭畾"
+ type="primary"
+ @click="popClick"
+ :loading="ClickLoading"></u-button></view>
+ </view>
+ </u-popup>
</view>
</template>
@@ -307,6 +375,11 @@
},
data() {
return {
+ show: false,
+ BaseUrl,
+ yaList:[],
+ inspectData:[],
+ activeObj:{},
driverBillOfLoadingData: {
list1: [],
list2: [],
@@ -314,6 +387,8 @@
},
// 鎺ュ崟妯℃�佹
qiangDanShow: false,
+ enterCode:false,
+ enterCodeStr:'',
qiangDanTitle: '鎺ュ崟鎻愮ず',
qiangDanContent: '',
qiangDanOrderPlanId: null,
@@ -328,12 +403,39 @@
customerId: '',
xsUserId: '',
filedId: '',
+ previewImageSrc:"",
};
},
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({
@@ -343,6 +445,7 @@
});
},
init() {
+ this.inspectData=[]
this.qiangDanList();
},
// 鍙告満棣栭〉鍒楄〃
@@ -403,6 +506,7 @@
uni.hideLoading()
if (res.code == 0) {
this.$u.toast('鎺ュ崟鎴愬姛');
+
} else {
this.$u.toast(res.msg ? res.msg : '鎺ュ崟澶辫触');
}
@@ -454,6 +558,23 @@
this.cancelAppointShow = true
this.cancelAppointId = item.id
},
+ cancelCerifCate(value){
+ this.$reqGet('getMyEscortList', { customerId: value.customerId }).then(res => {
+ this.inspectData=[]
+ if (res.code == 0) {
+ this.previewImageSrc=res.data.certificateImg
+ 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() {
this.cancelAppointShow = false
@@ -491,22 +612,69 @@
// 鍘婚绾�
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() {
uni.navigateTo({
url: '/pages/driver-page/driver-index/SelfDelivery/SelfDelivery'
})
+ },
+ cancelCodeEnter(){
+ console.log(this.activeObj,'tmid')
+ this.activeObj.containerNumber = this.enterCodeStr;
+ this.$reqPut('addContainer',{
+ id:this.activeObj.id,
+ containerNumber:this.activeObj.containerNumber
+ }).then(res=>{
+ this.$u.toast('鎿嶄綔鎴愬姛');
+ this.enterCodeStr = '';
+ this.enterCode = false;
+
+ }).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.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}`
+ });
+ }
}
}
};
@@ -591,7 +759,35 @@
}
}
-
+ .receiverPopup {
+ height: vww(220);
+ width: 700rpx;
+ .image{
+ width: 100%;
+ height: vww(110);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .tables{
+ width: 100%;
+ }
+ .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;
@@ -1029,6 +1225,23 @@
.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);
+
+ }
+ }
}
}
--
Gitblit v1.9.1