From 34b154be6ee139490d82920f0cee2cd03945267a Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 28 十月 2024 09:06:49 +0800
Subject: [PATCH] feat:库管确认装卸单位显示
---
pages/register/register.vue | 344 +++++++++++++++++++++------------------------------------
1 files changed, 128 insertions(+), 216 deletions(-)
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 2648e14..9fe38d3 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -4,7 +4,7 @@
<u--form :rules="rules"
:model="registerFormModel"
ref="regesterFormRef">
- <u-form-item labelWidth="20%"
+ <!-- <u-form-item labelWidth="35%"
label="閫夋嫨韬唤"
borderBottom
ref="roleRef"
@@ -23,83 +23,32 @@
:name="item.name"
@change="radioChange"></u-radio>
</u-radio-group>
- </u-form-item>
- <u-form-item labelWidth="20%"
- label="澶氳韩浠借瘉"
- borderBottom
- ref="roleRef"
- required
- v-if="radiovalue1 == '鍙告満'">
- <u-radio-group v-model="radiovalue2"
- placement="row"
- @change="groupChange"
- size="30"
- shape="circle"
- iconSize="20">
- <u-radio labelSize="14px"
- size="20px"
- v-for="(item, index) in radiolist3"
- :key="index"
- :label="item.name"
- :name="item.value"
- @change="radioChange2"></u-radio>
- </u-radio-group>
- </u-form-item>
+ </u-form-item> -->
<u-form-item prop="name"
:label="radiovalue1 == '鍙告満'?'濮撳悕':'鎵胯繍鍟嗗悕绉�'"
- labelWidth="20%"
+ labelWidth="35%"
borderBottom
required>
<u--input v-model="registerFormModel.name"
placeholder="璇疯緭鍏ュ唴瀹�"
clearable></u--input>
</u-form-item>
- <view style="margin:0 30vw" v-if="radiovalue2 == 1">
- <u-button text="澧炲姞"
- type="primary"
- @click="addData"
- ></u-button>
- </view>
- <uni-table
- border
- id="table-box"
- emptyText="鏆傛棤鏇村鏁版嵁" v-if="radiovalue2 == 1">
- <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 prop="idCard"
- label="韬唤璇�"
- labelWidth="20%"
+ :label="radiovalue1 == '鍙告満'?'韬唤璇�':'璇佷欢鍙�'"
+ labelWidth="35%"
borderBottom
- required
- v-if="radiovalue2 == 0">
+ required>
<u--input v-model="registerFormModel.idCard"
placeholder="璇疯緭鍏ュ唴瀹�"
clearable></u--input>
</u-form-item>
<u-form-item prop="cardImg1"
:label="radiovalue1 == '鍙告満'?'韬唤璇佹闈�':'韬唤璇佹垨钀ヤ笟鎵х収鐓х墖'"
- labelWidth="20%"
+ labelWidth="35%"
borderBottom
required
@click="beforeRead"
- v-if="radiovalue2 == 0">
+ v-if="radiovalue1 == '鎵胯繍鍟�'">
<u-upload :fileList="fileList5"
deletable
@afterRead="afterRead"
@@ -112,35 +61,9 @@
:previewFullImage="true">
</u-upload>
</u-form-item>
- <u-form-item prop="cardImg2"
- :label="radiovalue1 == '鍙告満'?'韬唤璇佸弽闈�':'韬唤璇佹垨钀ヤ笟鎵х収鐓х墖'"
- labelWidth="20%"
- borderBottom
- required
- @click="beforeRead"
- v-if="radiovalue2 == 0">
- <u-upload :fileList="fileList6"
- deletable
- @afterRead="afterRead"
- @delete="deletePic"
- name="6"
- multiple
- :maxCount="1"
- width="250"
- height="150"
- :previewFullImage="true">
- </u-upload>
- </u-form-item>
- <u-form-item prop="expirationTimeIdcard"
- label="韬唤璇佽繃鏈熸椂闂�"
- labelWidth="20%"
- borderBottom
- v-if="radiovalue2 == 0">
- <uni-datetime-picker v-model="registerFormModel.expirationTimeIdcard" type="date" :start="minDate" />
- </u-form-item>
<u-form-item prop="phone"
label="鎵嬫満鍙�"
- labelWidth="20%"
+ labelWidth="35%"
borderBottom
required>
<u--input v-model="registerFormModel.phone"
@@ -149,7 +72,7 @@
</u-form-item>
<u-form-item prop="password"
label="瀵嗙爜"
- labelWidth="20%"
+ labelWidth="35%"
borderBottom
required>
<u--input v-model="registerFormModel.password"
@@ -174,7 +97,7 @@
</view>
<u-form-item prop="confirmPassword"
label="纭瀵嗙爜"
- labelWidth="20%"
+ labelWidth="35%"
borderBottom
required>
<u--input v-model="registerFormModel.confirmPassword"
@@ -185,15 +108,14 @@
</u-form-item>
<u-form-item prop="carNo"
label="杞︾墝鍙�"
- labelWidth="20%"
+ labelWidth="35%"
borderBottom
v-if="radiovalue1 == '鍙告満'"
required>
- <u--input v-model="registerFormModel.carNo"
- placeholder="璇疯緭鍏ュ唴瀹�"
- clearable></u--input>
+ <xm-cell special label="杞︾墝鍙�" :value="registerFormModel.carNo" @show="showKeyboard('xmKeyboard')"></xm-cell>
+ <xm-keyboard-v2 ref="xmKeyboard" @confirm="(v) => registerFormModel.carNo = v"></xm-keyboard-v2>
</u-form-item>
- <u-form-item labelWidth="20%"
+ <u-form-item labelWidth="35%"
label="杞﹁締绫诲瀷"
borderBottom
ref="roleRef"
@@ -208,7 +130,7 @@
</u-form-item>
<u-form-item prop="carImg"
label="杞﹁締鐓х墖"
- labelWidth="20%"
+ labelWidth="35%"
borderBottom
v-if="radiovalue1 == '鍙告満'"
required
@@ -227,7 +149,7 @@
</u-form-item>
<u-form-item prop="drivingImg"
label="琛岄┒璇�"
- labelWidth="20%"
+ labelWidth="35%"
borderBottom
v-if="radiovalue1 == '鍙告満'"
required
@@ -245,15 +167,15 @@
</u-upload>
</u-form-item>
<u-form-item prop="expirationTimeDriving"
- label="琛岄┒璇佽繃鏈熸椂闂�"
- labelWidth="20%"
+ label="璇佷欢杩囨湡鏃堕棿"
+ labelWidth="35%"
borderBottom
v-if="radiovalue1 == '鍙告満'">
<uni-datetime-picker v-model="registerFormModel.expirationTimeDriving" type="date" :start="minDate" />
</u-form-item>
<u-form-item prop="driverImg"
label="椹鹃┒璇�"
- labelWidth="24%"
+ labelWidth="35%"
borderBottom
v-if="radiovalue1 == '鍙告満'"
required
@@ -271,15 +193,41 @@
</u-upload>
</u-form-item>
<u-form-item prop="expirationTimeDriver"
- label="椹鹃┒璇佽繃鏈熸椂闂�"
- labelWidth="20%"
+ label="璇佷欢杩囨湡鏃堕棿"
+ labelWidth="35%"
borderBottom
v-if="radiovalue1 == '鍙告満'">
<uni-datetime-picker v-model="registerFormModel.expirationTimeDriver" type="date" :start="minDate" />
</u-form-item>
+ <u-form-item prop="roadTransportImg"
+ label="閬撹矾杩愯緭璇�"
+ labelWidth="35%"
+ borderBottom
+ v-if="radiovalue1 == '鍙告満'"
+ required
+ @click="beforeRead">
+ <u-upload :fileList="fileList6"
+ deletable
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="6"
+ multiple
+ :maxCount="1"
+ width="250"
+ height="150"
+ :previewFullImage="true">
+ </u-upload>
+ </u-form-item>
+ <u-form-item prop="expirationTimeRoadtransport"
+ label="璇佷欢杩囨湡鏃堕棿"
+ labelWidth="35%"
+ borderBottom
+ v-if="radiovalue1 == '鍙告満'">
+ <uni-datetime-picker v-model="registerFormModel.expirationTimeRoadtransport" type="date" :start="minDate" />
+ </u-form-item>
<u-form-item prop="tradeQualificationImg"
label="浠庝笟璧勬牸璇�"
- labelWidth="24%"
+ labelWidth="35%"
borderBottom
v-if="radiovalue1 == '鍙告満'"
@click="beforeRead">
@@ -299,15 +247,15 @@
</span>
</u-form-item>
<u-form-item prop="expirationTimeTradequalification"
- label="浠庝笟璧勬牸杩囨湡鏃堕棿"
- labelWidth="20%"
+ label="璇佷欢杩囨湡鏃堕棿"
+ labelWidth="35%"
borderBottom
v-if="radiovalue1 == '鍙告満'">
<uni-datetime-picker v-model="registerFormModel.expirationTimeTradequalification" type="date" :start="minDate" />
</u-form-item>
- <u-form-item labelWidth="20%"
+ <u-form-item labelWidth="35%"
v-if="radiovalue1 == '鍙告満'"
- label="鐜繚绫诲瀷"
+ label="鎺掓斁绫诲瀷"
borderBottom
prop="countryNumberCar">
<u-radio-group v-model="registerFormModel.countryNumberCar"
@@ -432,8 +380,10 @@
return callback()
};
return {
+ radiovalue1: '鍙告満',
+ beforeChangeValue: '',
tablist:[{idCard:""},{idCard:""}],
- level:[], //瀵嗙爜寮哄害鏁扮粍
+ level:[], //瀵嗙爜寮哄害鏁扮粍
minDate: this.getToday(),
// 杞︾墝鍙烽敭鐩樻帶鍒�
carNumShow: false,
@@ -452,8 +402,10 @@
tuiJianMa: '',
confirmPassword: '',
tradeQualificationImg: '',
+ roadTransportImg:"",
+ expirationTimeRoadtransport:"",
driverImg: '',
- countryNumberCar: 2, //鐜繚绫诲瀷;鍥戒簲 1锛屽浗鍏� 2
+ countryNumberCar: 2, //鎺掓斁绫诲瀷;鍥戒簲 1锛屽浗鍏� 2
carType:null,
},
fileList1: [],
@@ -466,9 +418,6 @@
countryNumberCar: {
required: false,
},
- expirationTimeIdcard: {
- required: false,
- },
expirationTimeDriving: {
required: false,
},
@@ -478,14 +427,14 @@
expirationTimeTradequalification: {
required: false,
},
- name: [{
+ name:[{
type: 'string',
required: true,
- message: '璇峰～鍐欏鍚�',
+ message: this.getname,
trigger: ['blur', 'change']
- },{
- pattern: /^[\u4e00-\u9fa5]{1,6}$/, //闄愬埗闀垮害鏈�澶氫负 6 浣�
- message: '濮撳悕鍙兘鏄腑鏂�',
+ },{
+ pattern: /^[\u4e00-\u9fa5]+$/, //闄愬埗闀垮害鏈�澶氫负 6 浣�
+ message: this.getnames,
trigger: ['blur', 'change']
}],
carType:[{
@@ -497,12 +446,12 @@
idCard: [{
type: 'string',
required: true,
- message: '璇疯緭鍏ヨ韩浠借瘉鍙�',
+ message: this.getidcard,
trigger: ['blur', 'change']
},
{
pattern: /^([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]$/,
- message: '韬唤璇佸彿鏍煎紡涓嶆纭�',
+ message: this.getidcards,
trigger: ['blur', 'change']
}
],
@@ -559,13 +508,7 @@
cardImg1:{
type: 'string',
required: true,
- message: '璇蜂笂浼犺韩浠借瘉姝ｉ潰',
- trigger: ['blur', 'change']
- },
- cardImg2:{
- type: 'string',
- required: true,
- message: '璇蜂笂浼犺韩浠借瘉鍙嶉潰',
+ message: '璇蜂笂浼犺瘉浠�',
trigger: ['blur', 'change']
},
carImg: {
@@ -592,7 +535,7 @@
disabled: false
},
{
- name: '璐т唬',
+ name: '鎵胯繍鍟�',
disabled: false
}
],
@@ -605,23 +548,8 @@
value:2
},
{
- text: '娑叉隘妲借溅',
+ text: '妲借溅',
value:3
- },
- {
- text: '娑茬⒈妲借溅',
- value:4
- }
- ],
- radiolist3: [{
- name: '鍚�',
- disabled: false,
- value:0
- },
- {
- name: '鏄�',
- disabled: false,
- value:1
}
],
countryNumberCarList: [{
@@ -637,9 +565,7 @@
label: '鏂拌兘婧�',
}
],
- radiovalue1: '鍙告満',
- radiovalue2:0,
- beforeChangeValue: '',
+
// 鏇存崲瑙掕壊寮规
editRoleModelShow: false,
title: '鎻愮ず',
@@ -660,8 +586,7 @@
}
}
switch (newV) {
- case '璐т唬':
- this.radiovalue2 = 0;
+ case '鎵胯繍鍟�':
this.registerFormModel.type = 2;
break;
case '鍙告満':
@@ -672,18 +597,50 @@
}
return;
},
- radiovalue2(newV){
-
- }
},
methods: {
...mapMutations(['changeisUploadimg']),
+ showKeyboard(ref){
+ this.$refs[ref].toShow(this.registerFormModel.carNo)
+ },
getToday() {
let now = new Date();
let year = now.getFullYear();
let month = this.padStart(now.getMonth() + 1); // 鏈堜唤鏄粠0寮�濮嬬殑
let day = this.padStart(now.getDate());
return `${year}-${month}-${day}`;
+ },
+ getname(){
+ let that=this
+ if(that.radiovalue1=='鍙告満'){
+ return '濮撳悕涓嶈兘涓虹┖'
+ }else{
+ return '鎵胯繍鍟嗗悕绉颁笉鑳戒负绌�'
+ }
+ },
+ getnames(){
+ let that=this
+ if(that.radiovalue1=='鍙告満'){
+ return '濮撳悕鍙兘鏄腑鏂�'
+ }else{
+ return '鎵胯繍鍟嗗悕绉板彧鑳芥槸涓枃'
+ }
+ },
+ getidcard(){
+ let that=this
+ if(that.radiovalue1=='鍙告満'){
+ return '璇疯緭鍏ヨ韩浠借瘉鍙�'
+ }else{
+ return '璇疯緭鍏ヨ瘉浠跺彿'
+ }
+ },
+ getidcards(){
+ let that=this
+ if(that.radiovalue1=='鍙告満'){
+ return '韬唤璇佸彿鏍煎紡涓嶆纭�'
+ }else{
+ return '璇佷欢鍙锋牸寮忎笉姝ｇ‘'
+ }
},
padStart(value) {
return value.toString().padStart(2, '0');
@@ -692,7 +649,7 @@
this.registerFormModel.carType = this.radiolist2.find(v => v.value === e).value
},
registerClick() {
- if(this.registerFormModel.carType==3&&!this.registerFormModel.tradeQualificationImg||this.registerFormModel.carType==4&&!this.registerFormModel.tradeQualificationImg){
+ if(this.registerFormModel.carType==3&&!this.registerFormModel.tradeQualificationImg){
uni.showToast({
title: '璇蜂笂浼犱粠涓氳祫鏍艰瘉锛�',
icon: 'error',
@@ -704,10 +661,8 @@
.then(res => {
this.registerClickloading = true;
this.registerFormModel.username = this.registerFormModel.phone;
- if(this.radiovalue2 == 0){
- this.registerFormModel.idCardImg = this.registerFormModel.cardImg1+","+this.registerFormModel.cardImg2;
- }else{
- this.registerFormModel.expirationTimeIdcard=null
+ if(this.radiovalue1 == '鎵胯繍鍟�'){
+ this.registerFormModel.idCardImg = this.registerFormModel.cardImg1
}
if(this.registerFormModel.expirationTimeDriver){
this.registerFormModel.expirationTimeDriver=this.registerFormModel.expirationTimeDriver.slice(0,16)
@@ -715,69 +670,28 @@
if(this.registerFormModel.expirationTimeDriving){
this.registerFormModel.expirationTimeDriving=this.registerFormModel.expirationTimeDriving.slice(0,16)
}
- if(this.registerFormModel.expirationTimeIdcard){
- this.registerFormModel.expirationTimeIdcard=this.registerFormModel.expirationTimeIdcard.slice(0,16)
- }
if(this.registerFormModel.expirationTimeTradequalification){
this.registerFormModel.expirationTimeTradequalification=this.registerFormModel.expirationTimeTradequalification.slice(0,16)
}
- 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]$/
- let submit=true
- if(this.radiovalue2 == 1){
- const uniqueSampleTypeIds = new Set(this.tablist.map(item => item.idCard));
- const hasDuplicateSampleTypeId = this.tablist.length !== uniqueSampleTypeIds.size;
- 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
- }
- })
- if(hasDuplicateSampleTypeId){
+ this.$reqPost('registerDriver', this.registerFormModel, 'json')
+ .then(res => {
+ this.registerClickloading = false;
+ if (res.code == 0) {
uni.showToast({
- title: `韬唤璇佷笉鑳介噸澶嶏紒`,
- icon: 'error',
- duration: 2000
+ title: '娉ㄥ唽鎴愬姛,鍗冲皢杩斿洖鐧诲綍椤�',
+ icon: 'none',
+ duration: 1000
});
- submit=false
- }
- if(submit){
- this.registerFormModel.idCard=this.tablist.map(item=>{
- return item.idCard
- }).join(',')
- }
- }
- if(submit){
- this.$reqPost('registerDriver', this.registerFormModel, 'json')
- .then(res => {
- this.registerClickloading = false;
- if (res.code == 0) {
- uni.showToast({
- title: '娉ㄥ唽鎴愬姛,鍗冲皢杩斿洖鐧诲綍椤�',
- icon: 'none',
- duration: 1000
- });
- setTimeout(() => {
- uni.redirectTo({ url: '/pages/login/login' });
- }, 1000);
- } else {
- this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
- }
- })
- .catch(err => {
- console.log('閿欒', err);
- });
- }
+ setTimeout(() => {
+ uni.redirectTo({ url: '/pages/login/login' });
+ }, 1000);
+ } else {
+ this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
+ }
+ })
+ .catch(err => {
+ console.log('閿欒', err);
+ });
})
.catch(err => {
console.log('err', err);
@@ -798,8 +712,6 @@
this.$refs.regesterFormRef.clearValidate();
this.beforeChangeValue = e;
}
- },
- radioChange2(e) {
},
addData(){
this.tablist.push({idCard:""})
@@ -876,7 +788,7 @@
.data.url;
resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
}else if(num==6){
- this.registerFormModel.cardImg2 = JSON.parse(res.data)
+ this.registerFormModel.roadTransportImg = JSON.parse(res.data)
.data.url;
resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
}
@@ -922,7 +834,7 @@
.u-form {
.u-radio {
- width: 33%;
+ width: 35%;
}
}
}
--
Gitblit v1.9.1