From 4e517dc54e1e3e5e5b543383c321161de351272e Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 11 十一月 2024 16:05:06 +0800
Subject: [PATCH] Merge branch 'feature/jlhg/first' of http://39.96.92.240:10000/r/~fyy/unattended-app into feature/jlhg/first
---
pages/driver-page/drvier-my/drvier-my.vue | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 108 insertions(+), 10 deletions(-)
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 3eb36e0..0c42b65 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -438,7 +438,7 @@
</u-upload>
</u-form-item>
<u-form-item prop="drivingImg"
- label="琛岄┒璇�"
+ label="琛岄┒璇佽溅澶�"
labelWidth="35%"
borderBottom
required
@@ -448,6 +448,24 @@
@afterRead="afterRead"
@delete="deletePic"
name="2"
+ multiple
+ :maxCount="1"
+ width="250"
+ height="150"
+ :previewFullImage="true">
+ </u-upload>
+ </u-form-item>
+ <u-form-item prop="driverImgCw"
+ label="琛岄┒璇佽溅灏�"
+ labelWidth="35%"
+ borderBottom
+ required
+ @click="beforeRead">
+ <u-upload :fileList="fileList9"
+ deletable
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="9"
multiple
:maxCount="1"
width="250"
@@ -486,7 +504,7 @@
<uni-datetime-picker v-model="registerFormModel.expirationTimeDriver" type="datetime" :start="minDate" />
</u-form-item>
<u-form-item prop="roadTransportImg"
- label="閬撹矾杩愯緭璇�"
+ label="閬撹矾杩愯緭璇佽溅澶�"
labelWidth="35%"
borderBottom
required
@@ -496,6 +514,24 @@
@afterRead="afterRead"
@delete="deletePic"
name="7"
+ multiple
+ :maxCount="1"
+ width="250"
+ height="150"
+ :previewFullImage="true">
+ </u-upload>
+ </u-form-item>
+ <u-form-item prop="roadTransportImgCw"
+ label="閬撹矾杩愯緭璇佽溅灏�"
+ labelWidth="35%"
+ borderBottom
+ required
+ @click="beforeRead">
+ <u-upload :fileList="fileList10"
+ deletable
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="10"
multiple
:maxCount="1"
width="250"
@@ -521,6 +557,23 @@
@afterRead="afterRead"
@delete="deletePic"
name="4"
+ multiple
+ :maxCount="1"
+ width="250"
+ height="150"
+ :previewFullImage="true">
+ </u-upload>
+ </u-form-item>
+ <u-form-item prop="tradeQualificationImgYyy"
+ label="浠庝笟璧勬牸璇佹娂杩愬憳"
+ labelWidth="35%"
+ borderBottom
+ @click="beforeRead">
+ <u-upload :fileList="fileList11"
+ deletable
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="11"
multiple
:maxCount="1"
width="250"
@@ -595,7 +648,10 @@
tradeQualificationImg: '',
roadTransportImg: '',
inventoryImg: '',
- countryNumberCar: 0
+ countryNumberCar: 0,
+ driverImgCw:'',
+ roadTransportImgCw:"",
+ tradeQualificationImgYyy:"",
},
registerFormModel:{},
radiolist2: [{
@@ -750,6 +806,9 @@
fileList6: [],
fileList7: [],
fileList8: [],
+ fileList9: [],
+ fileList10: [],
+ fileList11: [],
// 淇敼淇℃伅寮瑰嚭妗�
editDriverPopupShow: false,
editDocShow:false,
@@ -911,7 +970,10 @@
roadTransportImg:res.data.roadTransportImg,
expirationTimeRoadtransport:res.data.expirationTimeRoadtransport,
expirationTimeTradequalification:res.data.expirationTimeTradequalification,
- type:res.data.carType
+ type:res.data.carType,
+ driverImgCw:res.data.driverImgCw,
+ roadTransportImgCw:res.data.roadTransportImgCw,
+ tradeQualificationImgYyy:res.data.tradeQualificationImgYyy,
}
if(this.registerFormModel.carImg){
if (this.fileList6.length == 0 && this.registerFormModel.carImg.split(",")[0]) {
@@ -925,12 +987,33 @@
});
}
}
- if(this.registerFormModel.roadTransportImg){
- if (this.fileList7.length == 0 && this.userInfo.roadTransportImg) {
- this.fileList7.push({
- url: `${BaseUrl}${this.userInfo.roadTransportImg}`
- });
+ if(this.registerFormModel.roadTransportImg){
+ if (this.fileList7.length == 0 && this.userInfo.roadTransportImg) {
+ this.fileList7.push({
+ url: `${BaseUrl}${this.userInfo.roadTransportImg}`
+ });
+ }
}
+ if(this.registerFormModel.driverImgCw){
+ if (this.fileList9.length == 0 && this.userInfo.driverImgCw) {
+ this.fileList9.push({
+ url: `${BaseUrl}${this.userInfo.driverImgCw}`
+ });
+ }
+ }
+ if(this.registerFormModel.roadTransportImgCw){
+ if (this.fileList10.length == 0 && this.userInfo.roadTransportImgCw) {
+ this.fileList10.push({
+ url: `${BaseUrl}${this.userInfo.roadTransportImgCw}`
+ });
+ }
+ }
+ if(this.registerFormModel.tradeQualificationImgYyy){
+ if (this.fileList11.length == 0 && this.userInfo.tradeQualificationImgYyy) {
+ this.fileList11.push({
+ url: `${BaseUrl}${this.userInfo.tradeQualificationImgYyy}`
+ });
+ }
}
this.editUserInfo.password = ''
});
@@ -1037,6 +1120,18 @@
this.registerFormModel.driverImg = JSON.parse(res.data)
.data.url;
resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+ }else if(num==9){
+ this.registerFormModel.driverImgCw = JSON.parse(res.data)
+ .data.url;
+ resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+ }else if(num==10){
+ this.registerFormModel.roadTransportImgCw = JSON.parse(res.data)
+ .data.url;
+ resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+ }else if(num==11){
+ this.registerFormModel.tradeQualificationImgYyy = JSON.parse(res.data)
+ .data.url;
+ resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
}
}
@@ -1081,6 +1176,9 @@
roadTransportImg:this.registerFormModel.roadTransportImg,
expirationTimeRoadtransport:this.registerFormModel.expirationTimeRoadtransport.slice(0,16),
expirationTimeTradequalification:this.registerFormModel.expirationTimeTradequalification.slice(0,16),
+ driverImgCw:this.registerFormModel.driverImgCw,
+ roadTransportImgCw:this.registerFormModel.roadTransportImgCw,
+ tradeQualificationImgYyy:this.registerFormModel.tradeQualificationImgYyy,
}, 'json').then(res => {
if (res.code == 0) {
this.$u.toast('淇敼鎴愬姛');
@@ -1109,7 +1207,7 @@
drivingImg: uni.getStorageSync('drivingImg'),
tradeQualificationImg: uni.getStorageSync('tradeQualificationImg')
};
- this.editUserInfo.otherIdCard=null
+ this.editUserInfo.otherIdCard=''
let errorList = ['name','phone','countryNumberCar','carType']
for(let item in this.editUserInfo){
if(item ==='bunkerList'){
--
Gitblit v1.9.1