From 77252da784ffa4036d613054696f73fbfdafb6d9 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期六, 27 七月 2024 17:48:51 +0800
Subject: [PATCH] feature：质检样式调整
---
pages/driver-page/driver-index/driver-index.vue | 137 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 30 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index eb39f0c..cdc62db 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,8 +157,9 @@
</view>
<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)">
@@ -191,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"
@@ -210,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}}
@@ -231,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}}
@@ -263,7 +281,7 @@
v-if="item.isDanger === 1">
<view class="button-img"
@click.stop="cancelCerifCate(item)">
- 娣诲姞鎶艰繍鍛� 鎶艰繍鍛�
+ 閬撹矾杩愯緭璇�
</view>
<view class="button-img"
@click.stop="cancelAppoint(item)">
@@ -282,19 +300,36 @@
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="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"
@@ -341,8 +376,10 @@
data() {
return {
show: false,
+ BaseUrl,
yaList:[],
inspectData:[],
+ activeObj:{},
driverBillOfLoadingData: {
list1: [],
list2: [],
@@ -350,6 +387,8 @@
},
// 鎺ュ崟妯℃�佹
qiangDanShow: false,
+ enterCode:false,
+ enterCodeStr:'',
qiangDanTitle: '鎺ュ崟鎻愮ず',
qiangDanContent: '',
qiangDanOrderPlanId: null,
@@ -364,6 +403,7 @@
customerId: '',
xsUserId: '',
filedId: '',
+ previewImageSrc:"",
};
},
onShow() {
@@ -420,6 +460,7 @@
},
// 鎺ュ崟鎸夐挳
qiangDanBtn(value) {
+ this.activeObj = value;
//鏄惁鍙互鍦哄唴鎺ュ崟锛�1 鍙互2涓嶅彲浠�
if (value.isInsideConnect === 1) {
this.insideConnectShow = true
@@ -466,6 +507,13 @@
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 : '鎺ュ崟澶辫触');
}
@@ -521,6 +569,7 @@
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}
})
@@ -586,6 +635,25 @@
uni.navigateTo({
url: '/pages/driver-page/driver-index/SelfDelivery/SelfDelivery'
})
+ },
+ cancelCodeEnter(){
+ this.activeObj.containerNumber = this.enterCodeStr;
+ this.$reqPut('addContainer',{
+ id:this.activeObj.tmId,
+ containerNumber:this.activeObj.containerNumber
+ }).then(res=>{
+ this.$u.toast('鎿嶄綔鎴愬姛');
+ this.enterCodeStr = '';
+ this.enterCode = false;
+
+ }).catch(err=>{
+
+ })
+ },
+ cancelCodeCancel(){
+ this.activeObj = {};
+ this.enterCode = false;
+ this.enterCodeStr = '';
}
}
};
@@ -671,9 +739,18 @@
}
}
.receiverPopup {
- height: vww(110);
- width: 300rpx;
-
+ 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%;
--
Gitblit v1.9.1