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 | 386 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 272 insertions(+), 114 deletions(-)
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index e7f8941..0c42b65 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -90,10 +90,11 @@
{{ 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://wrzs.czjlchem.com:9090/appimg/image/banner/printer.png"
@@ -108,7 +109,7 @@
<u-icon name="arrow-right"
size="36"></u-icon>
</view>
- </view>
+ </view> -->
<!-- <view class="information-line"
@click="addressManageHandle">
<view class="line-label"
@@ -150,7 +151,7 @@
<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 class="label-text">鍓ф瘨鍖栧鍝侀亾璺繍杈撻�氳璇�</view>
</view>
<view class="information-value">
<view class="">
@@ -207,11 +208,11 @@
<view class="label-title">
<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)">
@@ -227,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>
@@ -256,7 +262,7 @@
<u--form labelPosition="left"
:model="editUserInfo"
ref="editUserInfo">
- <u-form-item labelWidth="20%"
+ <u-form-item labelWidth="35%"
label="濮撳悕"
prop="name"
required>
@@ -264,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>
@@ -272,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>
@@ -280,7 +286,7 @@
border="none"
inputAlign="left"></u--input>
</u-form-item> -->
- <u-form-item labelWidth="20%"
+ <u-form-item labelWidth="35%"
label="鎵嬫満鍙�"
prop="phone"
required>
@@ -289,7 +295,7 @@
disabled
inputAlign="left"></u--input>
</u-form-item>
- <!-- <u-form-item labelWidth="20%"
+ <!-- <u-form-item labelWidth="35%"
label="杞︾墝鍙�"
prop="carNo"
required>
@@ -297,7 +303,7 @@
border="none"
inputAlign="left"></u--input>
</u-form-item> -->
- <u-form-item labelWidth="20%"
+ <u-form-item labelWidth="35%"
label="浣撻噸"
prop="weight"
>
@@ -306,7 +312,7 @@
inputAlign="left"
placeholder="浣撻噸浠g浣滀负鍗曚綅"></u--input>
</u-form-item>
- <u-form-item labelWidth="20%"
+ <u-form-item labelWidth="35%"
label="杞﹁酱鏁�"
prop="axleNum"
>
@@ -314,7 +320,7 @@
border="none"
inputAlign="left"></u--input>
</u-form-item>
- <u-form-item labelWidth="20%"
+ <u-form-item labelWidth="35%"
label="鐜繚鏍囧噯"
borderBottom
required
@@ -332,7 +338,7 @@
:name="item.name"></u-radio>
</u-radio-group>
</u-form-item>
- <u-form-item labelWidth="20%"
+ <u-form-item labelWidth="35%"
label="杞﹁締绫诲瀷"
borderBottom
ref="roleRef"
@@ -344,17 +350,28 @@
@change="productcarTypeChange"
></niceui-data-select-input>
</u-form-item>
- <view style="margin:0 30vw" v-if="isshow">
- <u-button text="澧炲姞"
- type="primary"
- @click="addData"
- ></u-button>
- </view>
+ <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="鏆傛棤鏇村鏁版嵁"
- v-if="isshow">
+ >
<uni-tr>
<uni-th align="center" >韬唤璇佸彿</uni-th>
<uni-th align="center">鎿嶄綔</uni-th>
@@ -374,17 +391,6 @@
</view></uni-td>
</uni-tr>
</uni-table>
- <u-form-item prop="idCard"
- label="韬唤璇�"
- labelWidth="20%"
- borderBottom
- required
- v-if="!isshow"
- >
- <u--input v-model="editUserInfo.idCard"
- placeholder="璇疯緭鍏ュ唴瀹�"
- clearable></u--input>
- </u-form-item>
<u-form-item>
<view class="person-utils">
<u-button text="淇敼瀵嗙爜"
@@ -413,12 +419,11 @@
<u--form labelPosition="left"
:model="registerFormModel"
>
- <u-form-item prop="cardImg1"
- label="韬唤璇佹闈�"
- labelWidth="20%"
+ <u-form-item prop="carImg"
+ label="杞﹁締鐓х墖"
+ labelWidth="35%"
borderBottom
required
- v-if="!isshow"
@click="beforeRead">
<u-upload :fileList="fileList6"
deletable
@@ -432,35 +437,9 @@
:previewFullImage="true">
</u-upload>
</u-form-item>
- <u-form-item prop="cardImg2"
- label="韬唤璇佸弽闈�"
- labelWidth="20%"
- borderBottom
- required
- v-if="!isshow"
- @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%"
- v-if="!isshow"
- borderBottom>
- <uni-datetime-picker v-model="registerFormModel.expirationTimeIdcard" type="datetime" :start="minDate" />
- </u-form-item>
<u-form-item prop="drivingImg"
- label="琛岄┒璇�"
- labelWidth="20%"
+ label="琛岄┒璇佽溅澶�"
+ labelWidth="35%"
borderBottom
required
@click="beforeRead">
@@ -476,15 +455,33 @@
: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"
+ height="150"
+ :previewFullImage="true">
+ </u-upload>
+ </u-form-item>
<u-form-item prop="expirationTimeDriving"
label="琛岄┒璇佽繃鏈熸椂闂�"
- labelWidth="20%"
+ labelWidth="35%"
borderBottom>
<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">
@@ -502,13 +499,56 @@
</u-form-item>
<u-form-item prop="expirationTimeDriver"
label="椹鹃┒璇佽繃鏈熸椂闂�"
- labelWidth="20%"
+ labelWidth="35%"
borderBottom>
<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="roadTransportImgCw"
+ label="閬撹矾杩愯緭璇佽溅灏�"
+ labelWidth="35%"
+ borderBottom
+ required
+ @click="beforeRead">
+ <u-upload :fileList="fileList10"
+ deletable
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="10"
+ 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
required
@click="beforeRead">
@@ -524,9 +564,26 @@
: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"
+ height="150"
+ :previewFullImage="true">
+ </u-upload>
+ </u-form-item>
<u-form-item prop="expirationTimeTradequalification"
label="浠庝笟璧勬牸杩囨湡鏃堕棿"
- labelWidth="20%"
+ labelWidth="35%"
borderBottom
>
<uni-datetime-picker v-model="registerFormModel.expirationTimeTradequalification" type="datetime" :start="minDate" />
@@ -548,8 +605,9 @@
@confirm="logoutConfirm"
@cancel="logoutCancel"></u-modal>
</view>
- <printerStyle ref="printerStyleRef"
- @selectedPrintStyle='selectedPrintStyleHandle' />
+ <!-- <printerStyle ref="printerStyleRef"
+ v-if="printerVisible"
+ @selectedPrintStyle='selectedPrintStyleHandle' /> -->
</view>
</template>
@@ -558,17 +616,17 @@
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 '@/subPages/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,qianTree },
+ components: { previewImage, noobTour,qianTree },
data() {
return {
- isshow:false,
tablist:[],
minDate: this.getToday(),
customerName:"",
+ printerVisible:false,
// 鑾峰彇鐨勫徃鏈鸿鎯�
userInfo: {},
productName:"",
@@ -590,7 +648,10 @@
tradeQualificationImg: '',
roadTransportImg: '',
inventoryImg: '',
- countryNumberCar: 0
+ countryNumberCar: 0,
+ driverImgCw:'',
+ roadTransportImgCw:"",
+ tradeQualificationImgYyy:"",
},
registerFormModel:{},
radiolist2: [{
@@ -602,12 +663,8 @@
value:2
},
{
- text: '娑叉隘妲借溅',
+ text: '妲借溅',
value:3
- },
- {
- text: '娑茬⒈妲借溅',
- value:4
}
],
countryNumberCarList: [{
@@ -617,6 +674,10 @@
{
name: 2,
label: '鍥藉叚',
+ },
+ {
+ name: 3,
+ label: '鏂拌兘婧�',
}
],
rules: {
@@ -727,7 +788,7 @@
roadTransportImg: {
type: 'string',
required: true,
- message: '璇蜂笂浼犻亾璺繍杈撹瘉鐓х墖',
+ message: '璇蜂笂浼犲墽姣掗�氳璇佺収鐗�',
trigger: ['blur', 'change']
},
tradeQualificationImg: {
@@ -745,6 +806,9 @@
fileList6: [],
fileList7: [],
fileList8: [],
+ fileList9: [],
+ fileList10: [],
+ fileList11: [],
// 淇敼淇℃伅寮瑰嚭妗�
editDriverPopupShow: false,
editDocShow:false,
@@ -756,7 +820,8 @@
logoutTitle: '鎻愮ず',
logoutContent: '鏄惁纭閫�鍑�',
BaseUrl,
- selectedPrintStyle: null
+ selectedPrintStyle: null,
+ phoneList:[]
};
},
computed: {
@@ -771,9 +836,8 @@
editDriverPopupShow(newVal) {
console.log(newVal,'newval')
let reg=RegExp(/,/)
- this.isshow=reg.test(this.editUserInfo.idCard)
- if(this.isshow){
- this.tablist= this.editUserInfo.idCard.split(",").map(item=>{
+ if(this.editUserInfo.otherIdCard){
+ this.tablist= this.editUserInfo.otherIdCard.split(",").map(item=>{
return {idCard:item}
})
}
@@ -809,6 +873,57 @@
},
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({
@@ -846,25 +961,24 @@
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
+ type:res.data.carType,
+ driverImgCw:res.data.driverImgCw,
+ roadTransportImgCw:res.data.roadTransportImgCw,
+ tradeQualificationImgYyy:res.data.tradeQualificationImgYyy,
}
- 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) {
@@ -872,9 +986,35 @@
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}`
+ });
+ }
+ }
+ 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 = ''
});
},
@@ -891,7 +1031,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;
@@ -969,15 +1109,27 @@
.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){
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}`);
}
@@ -1015,14 +1167,18 @@
updateDoc(){
this.$reqPost('saveDriverDocs', {
userId:this.registerFormModel.customerid,
- idCardImg:this.registerFormModel.cardImg1+","+this.registerFormModel.cardImg2,
- expirationTimeIdcard:this.registerFormModel.expirationTimeIdcard.slice(0,16),
+ 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),
+ driverImgCw:this.registerFormModel.driverImgCw,
+ roadTransportImgCw:this.registerFormModel.roadTransportImgCw,
+ tradeQualificationImgYyy:this.registerFormModel.tradeQualificationImgYyy,
}, 'json').then(res => {
if (res.code == 0) {
this.$u.toast('淇敼鎴愬姛');
@@ -1041,9 +1197,7 @@
this.tablist.push({idCard:""})
},
delData(e){
- if(this.tablist.length>2){
- this.tablist.splice(e,1)
- }
+ this.tablist.splice(e,1)
},
// 淇敼鐢ㄦ埛淇℃伅
updateUser() {
@@ -1053,6 +1207,7 @@
drivingImg: uni.getStorageSync('drivingImg'),
tradeQualificationImg: uni.getStorageSync('tradeQualificationImg')
};
+ this.editUserInfo.otherIdCard=''
let errorList = ['name','phone','countryNumberCar','carType']
for(let item in this.editUserInfo){
if(item ==='bunkerList'){
@@ -1068,7 +1223,7 @@
}
}
}
- if(this.isshow){
+ 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){
@@ -1097,7 +1252,7 @@
});
submit=false
}
- this.editUserInfo.idCard=this.tablist.map(item=>{
+ this.editUserInfo.otherIdCard=this.tablist.map(item=>{
return item.idCard
}).join(',')
}
@@ -1111,7 +1266,8 @@
idCard:this.editUserInfo.idCard,
userId:this.editUserInfo.userId,
type:this.editUserInfo.type,
- username:this.editUserInfo.username
+ username:this.editUserInfo.username,
+ otherIdCard:this.editUserInfo.otherIdCard,
}
this.$reqPost('updateUser', data, 'json').then(res => {
this.editDriverPopupShow = false;
@@ -1142,6 +1298,8 @@
},
//淇敼纾呭崟鎵撳嵃鏍峰紡
modifyPrint() {
+ this.printerVisible = true;
+ console.log(printerStyle,'123')
this.$nextTick(() => {
this.$refs.printerStyleRef.init()
})
@@ -1324,7 +1482,7 @@
&-block {
width: 690rpx;
- height: 760rpx;
+ 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;
@@ -1358,7 +1516,7 @@
font-size: 30rpx;
font-weight: 400;
color: #000000;
- line-height: 85rpx;
+ line-height: 32rpx;
text-align: left;
}
}
@@ -1455,9 +1613,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;
--
Gitblit v1.9.1