From 0eab6dcc163bec041d44bc27c9c89ef9c6ec988d Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期四, 26 九月 2024 17:17:39 +0800 Subject: [PATCH] feat:确认装卸bug提交 --- pages/driver-page/drvier-my/drvier-my.vue | 727 ++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 497 insertions(+), 230 deletions(-) diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue index 0538457..b206cbe 100644 --- a/pages/driver-page/drvier-my/drvier-my.vue +++ b/pages/driver-page/drvier-my/drvier-my.vue @@ -1,12 +1,12 @@ <template> <view class="driver-my"> <view class="" - style="height: 586rpx;width: 100%;"> + style="height: 540rpx;width: 100%;"> <view class="driver-banner"> <view class="navgation">鎴戠殑</view> <view class="avatar"> <view class="avatar-imgage" - style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/driverava.png')no-repeat;background-size: cover;"> + style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/driverava.png')no-repeat;background-size: cover;"> </view> <view class="avatar-name">{{ userInfo.name || '' }}</view> <view class="edit-button"><u-button type="primary" @@ -31,6 +31,10 @@ shape="circle" plain>缂栬緫璇佷欢淇℃伅</u-button></view> </view> + <view class="process-tran" + > + </view> + <view class="information-block"> <view class="personal-information"> <view class="personal-information-block"> @@ -38,7 +42,7 @@ <view class="information-line" @click=""> <view class="line-label"> - <image src="https://mx.jzeg.cn:9096/appimg/image/banner/personalicon.png" + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/personalicon.png" mode="widthFix"></image> <view class="label-text">韬唤璇佸彿</view> </view> @@ -48,7 +52,7 @@ </view> <view class="information-line"> <view class="line-label"> - <image src="https://mx.jzeg.cn:9096/appimg/image/banner/phonenum.png" + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/phonenum.png" mode="widthFix"></image> <view class="label-text">鎵嬫満鍙�</view> </view> @@ -58,7 +62,7 @@ </view> <view class="information-line"> <view class="line-label"> - <image src="https://mx.jzeg.cn:9096/appimg/image/banner/carnum.png" + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/carnum.png" mode="widthFix"></image> <view class="label-text">杞︾墝鍙�</view> </view> @@ -68,7 +72,7 @@ </view> <view class="information-line"> <view class="line-label"> - <image src="https://mx.jzeg.cn:9096/appimg/image/banner/axisnum.png" + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/axisnum.png" mode="widthFix"></image> <view class="label-text">杞﹁酱鏁�</view> </view> @@ -78,7 +82,7 @@ </view> <view class="information-line"> <view class="line-label"> - <image src="https://mx.jzeg.cn:9096/appimg/image/banner/weighnum.png" + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/weighnum.png" mode="widthFix"></image> <view class="label-text">浣撻噸</view> </view> @@ -86,13 +90,14 @@ {{ userInfo.weight || '' }} </view> </view> - <view class="information-line" - @click="modifyPrint"> <!-- 鐢变簬鏄嚜瀹氫箟icon 闈炶璁″浘icon 鎵�浠ヨ鍔犱笂杩欎釜style="margin-left: 1.5%;" icon 涓嬭浇鏍煎紡涓�18x18--> + <!-- <view class="information-line" + @click="modifyPrint"> + <view class="line-label" style="margin-left: 1.5%;"> - <image src="https://mx.jzeg.cn:9096/appimg/image/banner/printer.png" + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/printer.png" mode="widthFix" style="width: 18px;"></image> <view class="label-text">纾呭崟鏍峰紡</view> @@ -104,12 +109,12 @@ <u-icon name="arrow-right" size="36"></u-icon> </view> - </view> + </view> --> <!-- <view class="information-line" @click="addressManageHandle"> <view class="line-label" style="margin-left: 1.5%;"> - <image src="https://mx.jzeg.cn:9096/appimg/image/banner/address.png" + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/address.png" mode="widthFix" style="width: 18px;"></image> <view class="label-text" @@ -120,11 +125,11 @@ size="36"></u-icon> </view> </view> --> - <view class="information-line last" + <view class="information-line" @click="scoreDetail"> <view class="line-label" style="margin-left: 1.5%;"> - <image src="https://mx.jzeg.cn:9096/appimg/image/banner/score.png" + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/score.png" mode="widthFix" style="width: 36rpx;position: relative;left: 8rpx;"></image> <view class="label-text">鎴戠殑绉垎</view> @@ -138,7 +143,25 @@ size="36"></u-icon> </view> </view> - + </view> + <view class="information-line last" + @click="scoreCert"> + <view class="line-label" + style="margin-left: 1.5%;"> + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/score.png" + mode="widthFix" + style="width: 36rpx;position: relative;left: 8rpx;"></image> + <view class="label-text">鍓ф瘨鍖栧鍝侀亾璺繍杈撻�氳璇�</view> + </view> + <view class="information-value"> + <view class=""> + {{ '' }} + </view> + <view class=""> + <u-icon name="arrow-right" + size="36"></u-icon> + </view> + </view> </view> </view> </view> @@ -149,7 +172,7 @@ <view class="information-body"> <view class="car-img"> <view class="label-title"> - <image src="https://mx.jzeg.cn:9096/appimg/image/banner/carimg.png" + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/carimg.png" mode="widthFix"></image> <view class="label-text">杞﹁締鐓х墖</view> </view> @@ -166,7 +189,7 @@ </view> <view class="car-img"> <view class="label-title"> - <image src="https://mx.jzeg.cn:9096/appimg/image/banner/cardimg.png" + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/cardimg.png" mode="widthFix"></image> <view class="label-text">琛岄┒璇佺収鐗�</view> </view> @@ -183,13 +206,13 @@ </view> <view class="car-img"> <view class="label-title"> - <image src="https://mx.jzeg.cn:9096/appimg/image/banner/cardimg.png" + <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/cardimg.png" mode="widthFix"></image> - <view class="label-text">杞﹁締绫诲瀷鐓х墖</view> + <view class="label-text">椹鹃┒璇�</view> </view> <view class="img-container"> <u--image :showLoading="true" - :src="userInfo.inventoryImg != null ? BaseUrl + userInfo.drivingImg : ''" + :src="userInfo.driverImg != null ? BaseUrl + userInfo.drivingImg : ''" width="80px" height="80px" @click="imageClick(3)"> @@ -205,6 +228,11 @@ <view class="loginout-main"><u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout" + shape="circle" + plain></u-button></view> + <view class="loginout-main"><u-button text="鑱旂郴鎴戜滑" + type="primary" + @click="contactUs" shape="circle" plain></u-button></view> </view> @@ -233,8 +261,8 @@ <view class="editDriverPopup-container-box"> <u--form labelPosition="left" :model="editUserInfo" - ref="editRef"> - <u-form-item labelWidth="20%" + ref="editUserInfo"> + <u-form-item labelWidth="35%" label="濮撳悕" prop="name" required> @@ -242,7 +270,7 @@ border="none" inputAlign="left"></u--input> </u-form-item> - <!-- <u-form-item labelWidth="20%" + <!-- <u-form-item labelWidth="35%" label="瀵嗙爜" prop="password" required> @@ -250,7 +278,7 @@ border="none" inputAlign="left"></u--input> </u-form-item> --> - <!-- <u-form-item labelWidth="20%" + <!-- <u-form-item labelWidth="35%" label="韬唤璇佸彿" prop="idCard" required> @@ -258,15 +286,16 @@ border="none" inputAlign="left"></u--input> </u-form-item> --> - <u-form-item labelWidth="20%" + <u-form-item labelWidth="35%" label="鎵嬫満鍙�" prop="phone" required> <u--input v-model="editUserInfo.phone" border="none" + disabled inputAlign="left"></u--input> </u-form-item> - <!-- <u-form-item labelWidth="20%" + <!-- <u-form-item labelWidth="35%" label="杞︾墝鍙�" prop="carNo" required> @@ -274,25 +303,25 @@ border="none" inputAlign="left"></u--input> </u-form-item> --> - <u-form-item labelWidth="20%" + <u-form-item labelWidth="35%" label="浣撻噸" prop="weight" - required> + > <u--input v-model="editUserInfo.weight" border="none" inputAlign="left" placeholder="浣撻噸浠g浣滀负鍗曚綅"></u--input> </u-form-item> - <u-form-item labelWidth="20%" + <u-form-item labelWidth="35%" label="杞﹁酱鏁�" prop="axleNum" - required> + > <u--input v-model="editUserInfo.axleNum" border="none" inputAlign="left"></u--input> </u-form-item> - <u-form-item labelWidth="20%" - label="杞﹁締绫诲瀷" + <u-form-item labelWidth="35%" + label="鐜繚鏍囧噯" borderBottom required prop="countryNumberCar"> @@ -309,88 +338,61 @@ :name="item.name"></u-radio> </u-radio-group> </u-form-item> - <u-form-item labelWidth="25%" - label="杞﹁締鐓х墖" - @click="beforeRead" - prop="carImg" - required> - <u-upload :fileList="fileList1" - @afterRead="afterRead" - @delete="deletePic" - name="1" - multiple - :maxCount="1" - width="250" - height="150" - :previewFullImage="true"></u-upload> - </u-form-item> - <u-form-item labelWidth="25%" - label="琛岄┒璇佺収鐗�" - ref="item1" - @click="beforeRead" - prop="drivingImg" - required> - <u-upload :fileList="fileList2" - @afterRead="afterRead" - @delete="deletePic" - name="2" - multiple - :maxCount="1" - width="250" - height="150" - :previewFullImage="true"></u-upload> - </u-form-item> - <u-form-item labelWidth="25%" - label="閬撹矾杩愯緭璇�" - ref="item1" - @click="beforeRead" - prop="roadTransportImg" - required> - <u-upload :fileList="fileList3" - @afterRead="afterRead" - @delete="deletePic" - name="3" - multiple - :maxCount="1" - width="250" - height="150" - :previewFullImage="true"></u-upload> - </u-form-item> - <u-form-item labelWidth="25%" - label="浠庝笟璧勬牸璇�" - ref="item1" - @click="beforeRead" - prop="tradeQualificationImg" - required> - <u-upload :fileList="fileList4" - @afterRead="afterRead" - @delete="deletePic" - name="4" - multiple - :maxCount="1" - width="250" - height="150" - :previewFullImage="true"></u-upload> - </u-form-item> - <u-form-item prop="inventoryImg" - label="鐜繚娓呭崟" - labelWidth="24%" + <u-form-item labelWidth="35%" + label="杞﹁締绫诲瀷" borderBottom - @click="beforeRead"> - <u-upload :fileList="fileList5" - deletable - @afterRead="afterRead" - @delete="deletePic" - name="5" - multiple - :maxCount="3" - width="250" - height="150" - :previewFullImage="true"> - </u-upload> + ref="roleRef" + required> + <niceui-data-select-input v-model="editUserInfo.carType" + :localdata="radiolist2" + label="杞﹁締绫诲瀷閫夋嫨" + placeholder="璇烽�夋嫨杞﹁締绫诲瀷" + @change="productcarTypeChange" + ></niceui-data-select-input> </u-form-item> - </u--form> - <view class="person-utils"> + <u-form-item prop="idCard" + label="韬唤璇�" + labelWidth="35%" + borderBottom + required + > + <u--input v-model="editUserInfo.idCard" + placeholder="璇疯緭鍏ュ唴瀹�" + disabled + clearable></u--input> + </u-form-item> + <view style="margin:5vh 30vw" > + <u-button text="澧炲姞" + type="primary" + @click="addData" + ></u-button> + </view> + <uni-table + border + id="table-box" + emptyText="鏆傛棤鏇村鏁版嵁" + > + <uni-tr> + <uni-th align="center" >韬唤璇佸彿</uni-th> + <uni-th align="center">鎿嶄綔</uni-th> + </uni-tr> + <uni-tr v-for="(subItem, index) in tablist" :key="index"> + <uni-td align="center"> + <u--input + placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" + v-model="subItem.idCard" + ></u--input> + </uni-td> + <uni-td align="right"> + <view> + <u-button text="鍒犻櫎" + type="primary" + @click="delData(index)"></u-button> + </view></uni-td> + </uni-tr> + </uni-table> + <u-form-item> + <view class="person-utils"> <u-button text="淇敼瀵嗙爜" @click="modifyPassword" type="primary"></u-button> @@ -398,9 +400,13 @@ @click="updateUser" type="primary"></u-button> </view> + </u-form-item> + </u--form> + </view> </u-popup> </view> + <!-- 淇敼璇佷欢寮瑰嚭 --> <view class="editDriverPopup-container"> <u-popup :show="editDocShow" mode="bottom" @@ -412,10 +418,10 @@ <view class="editDriverPopup-container-box"> <u--form labelPosition="left" :model="registerFormModel" - ref="editRef"> - <u-form-item prop="cardImg1" - label="韬唤璇佹闈�" - labelWidth="20%" + > + <u-form-item prop="carImg" + label="杞﹁締鐓х墖" + labelWidth="35%" borderBottom required @click="beforeRead"> @@ -431,33 +437,9 @@ :previewFullImage="true"> </u-upload> </u-form-item> - <u-form-item prop="cardImg2" - label="韬唤璇佸弽闈�" - labelWidth="20%" - borderBottom - required - @click="beforeRead"> - <u-upload :fileList="fileList7" - deletable - @afterRead="afterRead" - @delete="deletePic" - name="7" - multiple - :maxCount="1" - width="250" - height="150" - :previewFullImage="true"> - </u-upload> - </u-form-item> - <u-form-item prop="expirationTimeIdcard" - label="韬唤璇佽繃鏈熸椂闂�" - labelWidth="20%" - borderBottom> - <uni-datetime-picker v-model="registerFormModel.expirationTimeIdcard" type="datetime" /> - </u-form-item> <u-form-item prop="drivingImg" label="琛岄┒璇�" - labelWidth="20%" + labelWidth="35%" borderBottom required @click="beforeRead"> @@ -475,13 +457,13 @@ </u-form-item> <u-form-item prop="expirationTimeDriving" label="琛岄┒璇佽繃鏈熸椂闂�" - labelWidth="20%" + labelWidth="35%" borderBottom> - <uni-datetime-picker v-model="registerFormModel.expirationTimeDriving" type="datetime" /> + <uni-datetime-picker v-model="registerFormModel.expirationTimeDriving" type="datetime" :start="minDate" /> </u-form-item> <u-form-item prop="driverImg" label="椹鹃┒璇�" - labelWidth="24%" + labelWidth="35%" borderBottom required @click="beforeRead"> @@ -499,15 +481,39 @@ </u-form-item> <u-form-item prop="expirationTimeDriver" label="椹鹃┒璇佽繃鏈熸椂闂�" - labelWidth="20%" + labelWidth="35%" borderBottom> - <uni-datetime-picker v-model="registerFormModel.expirationTimeDriver" type="datetime" /> + <uni-datetime-picker v-model="registerFormModel.expirationTimeDriver" type="datetime" :start="minDate" /> + </u-form-item> + <u-form-item prop="roadTransportImg" + label="閬撹矾杩愯緭璇�" + labelWidth="35%" + borderBottom + required + @click="beforeRead"> + <u-upload :fileList="fileList7" + deletable + @afterRead="afterRead" + @delete="deletePic" + name="7" + multiple + :maxCount="1" + width="250" + height="150" + :previewFullImage="true"> + </u-upload> + </u-form-item> + <u-form-item prop="expirationTimeRoadtransport" + label="璇佷欢杩囨湡鏃堕棿" + labelWidth="35%" + borderBottom + > + <uni-datetime-picker v-model="registerFormModel.expirationTimeRoadtransport" type="datetime" :start="minDate" /> </u-form-item> <u-form-item prop="tradeQualificationImg" label="浠庝笟璧勬牸璇�" - labelWidth="24%" + labelWidth="35%" borderBottom - v-if="registerFormModel.type == 3||registerFormModel.type == 4" required @click="beforeRead"> <u-upload :fileList="fileList4" @@ -524,10 +530,10 @@ </u-form-item> <u-form-item prop="expirationTimeTradequalification" label="浠庝笟璧勬牸杩囨湡鏃堕棿" - labelWidth="20%" + labelWidth="35%" borderBottom - v-if="registerFormModel.type == 3||registerFormModel.type == 4"> - <uni-datetime-picker v-model="registerFormModel.expirationTimeTradequalification" type="datetime" /> + > + <uni-datetime-picker v-model="registerFormModel.expirationTimeTradequalification" type="datetime" :start="minDate" /> </u-form-item> </u--form> <view class="person-utils"> @@ -538,7 +544,6 @@ </view> </u-popup> </view> - <view class="logoutModel"> <u-modal :show="logoutShow" :title="logoutTitle" @@ -547,8 +552,9 @@ @confirm="logoutConfirm" @cancel="logoutCancel"></u-modal> </view> - <printerStyle ref="printerStyleRef" - @selectedPrintStyle='selectedPrintStyleHandle' /> + <!-- <printerStyle ref="printerStyleRef" + v-if="printerVisible" + @selectedPrintStyle='selectedPrintStyleHandle' /> --> </view> </template> @@ -557,14 +563,20 @@ import { BaseUrl } from '@/api/publicInterface.js'; import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue'; import noobTour from '@/components/noobTour/noobTour.vue' - import printerStyle from '@/pages/driver-page/driver-index/bill-of-lading-details/printerStyle/printerStyle.vue' + // import printerStyle from '@/subPages/bill-of-lading-details/printerStyle/printerStyle.vue' import { mapMutations, mapState } from 'vuex'; + import qianTree from '@/components/qian-tree/qian-tree.vue'; export default { - components: { previewImage, noobTour, printerStyle }, + components: { previewImage, noobTour,qianTree }, data() { return { + tablist:[], + minDate: this.getToday(), + customerName:"", + printerVisible:false, // 鑾峰彇鐨勫徃鏈鸿鎯� userInfo: {}, + productName:"", // 淇敼鍙告満璇︽儏 editUserInfo: { phone: '', @@ -585,9 +597,20 @@ inventoryImg: '', countryNumberCar: 0 }, - registerFormModel:{ - - }, + registerFormModel:{}, + radiolist2: [{ + text: '鏅�氳繍杈撹溅', + value:1 + }, + { + text: '闆嗚绠卞钩鏉胯溅', + value:2 + }, + { + text: '妲借溅', + value:3 + } + ], countryNumberCarList: [{ name: 1, label: '鍥戒簲', @@ -595,15 +618,24 @@ { name: 2, label: '鍥藉叚', + }, + { + name: 3, + label: '鏂拌兘婧�', } ], rules: { - name: { + name: [{ type: 'string', required: true, message: '璇峰~鍐欏鍚�', trigger: ['blur', 'change'] }, + { + pattern: /^[\u4e00-\u9fa5\s]+$/, + message: '濮撳悕鍙兘鏄腑鏂�', + trigger: ['blur', 'change'] + }], idCard: [{ type: 'string', required: true, @@ -694,13 +726,13 @@ countryNumberCar: { type: 'number', required: true, - message: '璇烽�夋嫨杞﹁締绫诲瀷', + message: '璇烽�夋嫨鐜繚鏍囧噯', trigger: ['blur', 'change'] }, roadTransportImg: { type: 'string', required: true, - message: '璇蜂笂浼犻亾璺繍杈撹瘉鐓х墖', + message: '璇蜂笂浼犲墽姣掗�氳璇佺収鐗�', trigger: ['blur', 'change'] }, tradeQualificationImg: { @@ -715,10 +747,9 @@ fileList2: [], fileList3: [], fileList4: [], - fileList5: [], fileList6: [], fileList7: [], - fileList8:[], + fileList8: [], // 淇敼淇℃伅寮瑰嚭妗� editDriverPopupShow: false, editDocShow:false, @@ -730,7 +761,8 @@ logoutTitle: '鎻愮ず', logoutContent: '鏄惁纭閫�鍑�', BaseUrl, - selectedPrintStyle: null + selectedPrintStyle: null, + phoneList:[] }; }, computed: { @@ -741,16 +773,98 @@ return this.userInfo.idCard.slice(0, 6) + '********' + this.userInfo.idCard.slice(-4) } }, + watch: { + editDriverPopupShow(newVal) { + console.log(newVal,'newval') + let reg=RegExp(/,/) + if(this.editUserInfo.otherIdCard){ + this.tablist= this.editUserInfo.otherIdCard.split(",").map(item=>{ + return {idCard:item} + }) + } + if(newVal) + this.$nextTick(() => { + // if(this.$refs.editUserInfo) this.$refs['editUserInfo'].setRules(this.rules); + }); + } + }, onShow() { // this.init(); }, onReady() { - this.$refs.editRef.setRules(this.rules); + // this.$refs.editUserInfo.setRules(this.rules); }, methods: { + productcarTypeChange(e){ + this.registerFormModel.carType = this.radiolist2.find(v => v.value === e).value + }, ...mapMutations(['changeisUploadimg']), + getToday() { + let now = new Date(); + let year = now.getFullYear(); + let month = this.padStart(now.getMonth() + 1); // 鏈堜唤鏄粠0寮�濮嬬殑 + let day = this.padStart(now.getDate()); + let hour = this.padStart(now.getHours()); + let minute = this.padStart(now.getMinutes()); + let second = this.padStart(now.getSeconds()); + return `${year}-${month}-${day} ${hour}:${minute}:${second}`; + }, + padStart(value) { + return value.toString().padStart(2, '0'); + }, init() { this.getUserEntity(); + uni.request({ + url: `${BaseUrl}/admin/dict/page`, + method: 'GET', + data: { + dictType:'Setings' + }, + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'), + clientToc: 'Y', + 'CLIENT_TOC': 'Y', + }, + success: res => { + let dictId=res.data.data?.records[0].id + uni.request({ + url: `${BaseUrl}/admin/dict/item/page`, + method: 'GET', + data: { + dictId:dictId + }, + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'), + clientToc: 'Y', + 'CLIENT_TOC': 'Y', + }, + success: res => { + res.data.data.records.forEach(item=>{ + if(item.description.includes('鑱旂郴')){ + this.phoneList=item.value.split(','); + } + }) + }, + fail: err => { + } + }) + }, + fail: err => { + } + }) + }, + contactUs(){ + uni.showActionSheet({ + itemList: this.phoneList, + success: (res) => { + uni.makePhoneCall({ + phoneNumber:this.phoneList[res.tapIndex].split(":")[1] + }) + }, + fail: (err) => { + console.log('寮圭獥鍙栨秷'); + } + }); }, getUserEntity() { uni.showLoading({ @@ -785,33 +899,24 @@ url: `${BaseUrl}${this.userInfo.tradeQualificationImg}` }); } - if (this.fileList5.length == 0 && this.userInfo.inventoryImg) { - this.fileList5.push({ - url: `${BaseUrl}${this.userInfo.inventoryImg}` - }); - } Object.assign(this.editUserInfo, res.data) this.registerFormModel={ customerid:res.data.userId, - idCardImg:res.data.idCardImg, - expirationTimeIdcard:res.data.expirationTimeIdcard, + carImg:res.data.carImg, drivingImg:res.data.drivingImg, expirationTimeDriving:res.data.expirationTimeDriving, driverImg:res.data.driverImg, expirationTimeDriver:res.data.expirationTimeDriver, tradeQualificationImg:res.data.tradeQualificationImg, + roadTransportImg:res.data.roadTransportImg, + expirationTimeRoadtransport:res.data.expirationTimeRoadtransport, expirationTimeTradequalification:res.data.expirationTimeTradequalification, type:res.data.carType } - if(this.registerFormModel.idCardImg){ - if (this.fileList6.length == 0 && this.registerFormModel.idCardImg.split(",")[0]) { + if(this.registerFormModel.carImg){ + if (this.fileList6.length == 0 && this.registerFormModel.carImg.split(",")[0]) { this.fileList6.push({ - url: `${BaseUrl}${this.registerFormModel.idCardImg.split(",")[0]}` - }); - } - if (this.fileList7.length == 0 && this.registerFormModel.idCardImg.split(",")[1]) { - this.fileList7.push({ - url: `${BaseUrl}${this.registerFormModel.idCardImg.split(",")[1]}` + url: `${BaseUrl}${this.registerFormModel.carImg}` }); } if (this.fileList8.length == 0 && this.userInfo.driverImg) { @@ -819,9 +924,14 @@ url: `${BaseUrl}${this.userInfo.driverImg}` }); } - this.registerFormModel.cardImg1=this.registerFormModel.idCardImg.split(",")[1] - this.registerFormModel.cardImg2=this.registerFormModel.idCardImg.split(",")[1] } + if(this.registerFormModel.roadTransportImg){ + if (this.fileList7.length == 0 && this.userInfo.roadTransportImg) { + this.fileList7.push({ + url: `${BaseUrl}${this.userInfo.roadTransportImg}` + }); + } + } this.editUserInfo.password = '' }); }, @@ -838,7 +948,7 @@ } else if (index == 2) { this.previewImageSrc = this.userInfo.drivingImg; } else { - this.previewImageSrc = this.userInfo.inventoryImg; + this.previewImageSrc = this.userInfo.driverImg; } this.$nextTick(() => { this.previewImageShow = true; @@ -906,6 +1016,8 @@ } else if (num == 4) { this.editUserInfo.tradeQualificationImg = JSON.parse(res.data).data .url; + this.registerFormModel.tradeQualificationImg = JSON.parse(res.data).data + .url; uni.setStorageSync('tradeQualificationImg', JSON.parse(res.data).data .url); resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`); @@ -914,11 +1026,11 @@ .url; resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`); }else if(num==6){ - this.registerFormModel.cardImg1 = JSON.parse(res.data) + this.registerFormModel.carImg = JSON.parse(res.data) .data.url; resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`); }else if(num==7){ - this.registerFormModel.cardImg2 = JSON.parse(res.data) + this.registerFormModel.roadTransportImg = JSON.parse(res.data) .data.url; resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`); }else if(num==8){ @@ -926,6 +1038,7 @@ .data.url; resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`); } + } }); }); @@ -957,46 +1070,110 @@ }, // 淇敼璇佷欢淇℃伅 updateDoc(){ - this.$reqPost('saveDriverDocs', { - userId:this.registerFormModel.customerid, - idCardImg:this.registerFormModel.cardImg1+","+this.registerFormModel.cardImg2, - expirationTimeIdcard:this.registerFormModel.expirationTimeIdcard, - drivingImg:this.registerFormModel.drivingImg, - expirationTimeDriving:this.registerFormModel.expirationTimeDriving, - driverImg:this.registerFormModel.driverImg, - expirationTimeDriver:this.registerFormModel.expirationTimeDriver, - tradeQualificationImg:this.registerFormModel.tradeQualificationImg, - expirationTimeTradequalification:this.registerFormModel.expirationTimeTradequalification, - }, 'json').then(res => { - this.editDocShow = false; - if (res.code == 0) { - this.$u.toast('淇敼鎴愬姛'); - this.init(); - } else { - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }); - } - }) + this.$reqPost('saveDriverDocs', { + userId:this.registerFormModel.customerid, + carImg:this.registerFormModel.carImg, + drivingImg:this.registerFormModel.drivingImg, + expirationTimeDriving:this.registerFormModel.expirationTimeDriving.slice(0,16), + driverImg:this.registerFormModel.driverImg, + expirationTimeDriver:this.registerFormModel.expirationTimeDriver.slice(0,16), + tradeQualificationImg:this.registerFormModel.tradeQualificationImg, + roadTransportImg:this.registerFormModel.roadTransportImg, + expirationTimeRoadtransport:this.registerFormModel.expirationTimeRoadtransport.slice(0,16), + expirationTimeTradequalification:this.registerFormModel.expirationTimeTradequalification.slice(0,16), + }, 'json').then(res => { + if (res.code == 0) { + this.$u.toast('淇敼鎴愬姛'); + this.init(); + this.editDocShow = false; + } else { + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }); + } + }) + }, + addData(){ + this.tablist.push({idCard:""}) + }, + delData(e){ + this.tablist.splice(e,1) }, // 淇敼鐢ㄦ埛淇℃伅 updateUser() { this.editUserInfo = { - ...this.editUserInfo, + ...this.editUserInfo, carImg: uni.getStorageSync('carImg'), drivingImg: uni.getStorageSync('drivingImg'), - isRegister: '0' + tradeQualificationImg: uni.getStorageSync('tradeQualificationImg') }; - this.$refs.editRef - .validate() - .then(res => { - - this.$reqPost('updateUser', this.editUserInfo, 'json').then(res => { - console.log('鏇存柊鏁版嵁', res); - this.editDriverPopupShow = false; - if (res.code == 0) { + this.editUserInfo.otherIdCard='' + let errorList = ['name','phone','countryNumberCar','carType'] + for(let item in this.editUserInfo){ + if(item ==='bunkerList'){ + console.log(item); + if(!this.editUserInfo[item]){ + this.editUserInfo[item] = []; + } + } + if(errorList.includes(item)){ + if(!this.editUserInfo[item]){ + this.$u.tos('璇锋鏌ヨ緭鍏ワ紒锛�') + return + } + } + } + if(this.tablist.length>0){ + let idcardtext=/^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/ + this.tablist.map(item=>{ + if(!item.idCard){ + uni.showToast({ + title: `璇峰~鍐欒韩浠借瘉锛乣, + icon: 'error', + duration: 2000 + }); + submit=false + }else if(!idcardtext.test(item.idCard)){ + uni.showToast({ + title: `璇锋楠岃韩浠借瘉锛乣, + icon: 'error', + duration: 2000 + }); + submit=false + } + }) + const uniqueSampleTypeIds = new Set(this.tablist.map(item => item.idCard)); + const hasDuplicateSampleTypeId = this.tablist.length !== uniqueSampleTypeIds.size; + if(hasDuplicateSampleTypeId){ + uni.showToast({ + title: `韬唤璇佷笉鑳介噸澶嶏紒`, + icon: 'error', + duration: 2000 + }); + submit=false + } + this.editUserInfo.otherIdCard=this.tablist.map(item=>{ + return item.idCard + }).join(',') + } + let data={ + name:this.editUserInfo.name, + phone:this.editUserInfo.phone, + countryNumberCar:this.editUserInfo.countryNumberCar, + carType:this.editUserInfo.carType, + weight:this.editUserInfo.weight, + axleNum:this.editUserInfo.axleNum, + idCard:this.editUserInfo.idCard, + userId:this.editUserInfo.userId, + type:this.editUserInfo.type, + username:this.editUserInfo.username, + otherIdCard:this.editUserInfo.otherIdCard, + } + this.$reqPost('updateUser', data, 'json').then(res => { + this.editDriverPopupShow = false; + if (res.code == 0) { this.$u.toast('淇敼鎴愬姛'); this.init(); } else { @@ -1004,13 +1181,11 @@ title: res.msg, icon: 'none', duration: 2000 - }); + }); } }); - }) - .catch(err => { - this.$u.toast('淇敼澶辫触'); - }); + + }, logout() { this.logoutShow = true; @@ -1025,6 +1200,8 @@ }, //淇敼纾呭崟鎵撳嵃鏍峰紡 modifyPrint() { + this.printerVisible = true; + console.log(printerStyle,'123') this.$nextTick(() => { this.$refs.printerStyleRef.init() }) @@ -1035,6 +1212,11 @@ url: '/pages/driver-page/drvier-my/scoreDetail/scoreDetail' }) }, + scoreCert(){ + uni.navigateTo({ + url: '/pages/driver-page/drvier-my/certifiCate/certifiCate' + }) + }, addressManageHandle() { uni.navigateTo({ url: '/pages/driver-page/drvier-my/addressMange/addressMange' @@ -1042,7 +1224,33 @@ }, selectedPrintStyleHandle(val) { this.selectedPrintStyle = val - } + }, + findNameById(tree, idArr) { + let result = []; + function traverse(node, idArr) { + if (!node) return; + if (idArr.includes(node.id)) { + result.push({name:node.productName,id:node.id}); + } + if (node.children && node.children.length > 0) { + node.children.forEach(child => { + traverse(child, idArr); + }); + } + } + tree.forEach(node => { + traverse(node, idArr); + }); + return result; + }, + // 鎵撳紑浜у搧琛� + treeOpen() { + this.$refs.tkitree._show(); + }, + treeClose() { + this.$refs.tkitree._hide(); + }, + } }; </script> @@ -1128,10 +1336,34 @@ margin-right: vww(6); } } + .process-tran{ + width: 300rpx; + height: 50rpx; + margin: 0 auto; + position: fixed; + top: 390rpx; + left: 37rpx; + display: flex; + align-items: center; + + .state-text { + margin-right: vww(6); + } + } .car-type { position: fixed; top: 284rpx; + right: 20rpx; + width: 100%; + height: 50rpx; + display: flex; + align-items: center; + justify-content: flex-end; + } + .tran-type{ + position: fixed; + top: 390rpx; right: 20rpx; width: 100%; height: 50rpx; @@ -1152,7 +1384,7 @@ &-block { width: 690rpx; - height: 680rpx; + height: 700rpx; 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; @@ -1186,7 +1418,7 @@ font-size: 30rpx; font-weight: 400; color: #000000; - line-height: 85rpx; + line-height: 32rpx; text-align: left; } } @@ -1213,9 +1445,35 @@ } .car-information { + margin-top: 30rpx; width: 100%; position: relative; @include flex justify-content: center; + .roadTransportCertificate{ + width: 690rpx; + 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; + .information-body { + width: 636rpx; + margin: vww(15) vww(14); + @include flex flex-direction: column; + .certificate { + display: flex; + justify-content: space-between; + align-items: center; + width: 636rpx; + height: 90rpx; + border-bottom: 1rpx solid #f0f1f6; + .certificate-left{ + margin-left: 20rpx; + } + .certificate-right{ + margin-right: 20rpx; + } + } + } + } .information-main { width: 690rpx; @@ -1228,7 +1486,6 @@ width: 636rpx; margin: vww(15) vww(14); @include flex flex-direction: column; - .car-img { height: 246rpx; width: 100%; @@ -1258,9 +1515,9 @@ .loginout { width: 100%; - height: 200rpx; + height: 240rpx; @include flex; - justify-content: space-around; + justify-content: space-evenly; flex-direction: column; align-items: center; position: relative; @@ -1331,5 +1588,15 @@ } } } + .superList{ + margin: 10rpx; + padding: 10rpx; + border: 1px solid #f0f1f6; + } + .adddelete{ + display: flex; + justify-content: space-around; + margin: 10rpx; + } } </style> \ No newline at end of file -- Gitblit v1.9.1