kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

Browse Source
This commit is contained in:
yanran200730
2022-06-16 14:53:11 +08:00
parent f87bc45d4e cfbe6a7a29
commit 393e780440
1 changed files with 60 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/project/police/AppPeopleList/Add.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="add"> <div class="add">
<div class="item"> <div class="item">
<span class="tips">*</span> <span class="tips"></span>
<div class="border"> <div class="border">
<span class="label">居民类型</span> <span class="label">居民类型</span>
<span class="value" @click="clickSelect('residentType', 'residentType')"> <span class="value" @click="clickSelect('residentType', 'residentType')">
@@ -11,7 +11,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="item"> <!-- <div class="item">
<span class="tips">*</span> <span class="tips">*</span>
<div class="border"> <div class="border">
<span class="label">是否户主</span> <span class="label">是否户主</span>
@@ -41,7 +41,7 @@
<img src="./components/img/right-icon.png" alt=""> <img src="./components/img/right-icon.png" alt="">
</span> </span>
</div> </div>
</div> </div> -->
<div class="item"> <div class="item">
<span class="tips">*</span> <span class="tips">*</span>
<div class="border"> <div class="border">
@@ -56,15 +56,15 @@
<div class="border"> <div class="border">
<span class="label">身份证号</span> <span class="label">身份证号</span>
<span class="value"> <span class="value">
<input type="idcard" placeholder="请输入" v-model="form.idNumber" maxlength="18" @input="changeIdNumber" :disabled="this.form.id ? true : false"> <input type="idcard" placeholder="请输入" v-model="form.idNumber" maxlength="18" :disabled="this.form.id ? true : false">
</span> </span>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<span class="tips">*</span> <span class="tips"></span>
<div class="border"> <div class="border">
<span class="label">性别</span> <span class="label">性别</span>
<span class="value"> <span class="value" @click="clickSelect('sex', 'sex')">
<span v-if="form.sex === ''" class="color-999">请选择</span> <span v-if="form.sex === ''" class="color-999">请选择</span>
<span v-else>{{$dict.getLabel('sex', form.sex)}}</span> <span v-else>{{$dict.getLabel('sex', form.sex)}}</span>
<img src="./components/img/right-icon.png" alt=""> <img src="./components/img/right-icon.png" alt="">
@@ -72,15 +72,24 @@
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<span class="tips">*</span> <span class="tips"></span>
<div class="border"> <div class="border">
<span class="label">出生日期</span> <span class="label">出生日期</span>
<span class="value"> <span class="value" @click="dateShow=true">
<span :class="form.birthDate == '' ? 'color-999' : ''">{{form.birthDate || '请选择'}}</span> <span :class="form.birthDate == '' ? 'color-999' : ''">{{form.birthDate || '请选择'}}</span>
<img src="./components/img/right-icon.png" alt=""> <img src="./components/img/right-icon.png" alt="">
</span> </span>
</div> </div>
</div> </div>
<div class="item">
<span class="tips"></span>
<div class="border">
<span class="label">年龄</span>
<span class="value">
<input type="number" placeholder="请输入" v-model="form.age" maxlength="4">
</span>
</div>
</div>
<div class="item"> <div class="item">
<span class="tips"></span> <span class="tips"></span>
<div class="border"> <div class="border">
@@ -91,7 +100,7 @@
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<span class="tips">*</span> <span class="tips"></span>
<div class="border"> <div class="border">
<span class="label">现住址</span> <span class="label">现住址</span>
<span class="value"> <span class="value">
@@ -106,7 +115,7 @@
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<span class="tips">*</span> <span class="tips"></span>
<div class="border"> <div class="border">
<span class="label">组</span> <span class="label">组</span>
<span class="value"> <span class="value">
@@ -115,7 +124,7 @@
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<span class="tips">*</span> <span class="tips"></span>
<div class="border"> <div class="border">
<span class="label">户</span> <span class="label">户</span>
<span class="value"> <span class="value">
@@ -132,7 +141,7 @@
<div class="text-area"> <div class="text-area">
<textarea placeholder="请输入" maxlength="30" v-model="form.currentAddress"></textarea> <textarea placeholder="请输入" maxlength="30" v-model="form.currentAddress"></textarea>
</div> --> </div> -->
<div class="item"> <!-- <div class="item">
<span class="tips"></span> <span class="tips"></span>
<div class="border"> <div class="border">
<span class="label">户籍地址</span> <span class="label">户籍地址</span>
@@ -155,12 +164,13 @@
</div> </div>
<div class="text-area"> <div class="text-area">
<textarea placeholder="请输入" maxlength="30" v-model="form.householdAddress"></textarea> <textarea placeholder="请输入" maxlength="30" v-model="form.householdAddress"></textarea>
</div> </div> -->
<div class="pad-b152"></div> <div class="pad-b152"></div>
<div class="add-btn" @click="submit"> <div class="add-btn" @click="submit">
<div>保存</div> <div>保存</div>
</div> </div>
<u-select v-model="showSelect" :list="selectList" label-name="dictName" value-name="dictValue" @confirm="confirmSelect"/> <u-select v-model="showSelect" :list="selectList" label-name="dictName" value-name="dictValue" @confirm="confirmSelect"/>
<u-picker mode="time" v-model="dateShow" @confirm="confirmTime" ></u-picker>
</div> </div>
</template> </template>
@@ -192,6 +202,7 @@ export default {
currentAddressNo: '' currentAddressNo: ''
}, },
showSelect: false, showSelect: false,
dateShow: false,
formName: '', formName: '',
selectList: [] selectList: []
} }
@@ -214,45 +225,46 @@ export default {
methods: { methods: {
submit() { submit() {
if(this.form.residentType === '') { if(this.form.residentType === '') {
return this.$u.toast('请选择居民类型') // return this.$u.toast('请选择居民类型')
} this.form.residentType ='0'
if(this.form.householdName === '') {
return this.$u.toast('请选择是否户主')
}
if(this.form.householdName != 1 && !this.form.householdIdNumber) {
return this.$u.toast('请输入户主身份证')
}
if(this.form.householdName != 1 && this.form.householdRelation === '') {
return this.$u.toast('请选择与户主关系')
} }
// if(this.form.householdName === '') {
// return this.$u.toast('请选择是否户主')
// }
// if(this.form.householdName != 1 && !this.form.householdIdNumber) {
// return this.$u.toast('请输入户主身份证')
// }
// if(this.form.householdName != 1 && this.form.householdRelation === '') {
// return this.$u.toast('请选择与户主关系')
// }
if(!this.form.name) { if(!this.form.name) {
return this.$u.toast('请输入姓名') return this.$u.toast('请输入姓名')
} }
if(!this.form.idNumber) { if(!this.form.idNumber) {
return this.$u.toast('请输入身份证号') return this.$u.toast('请输入身份证号')
} }
if(!this.form.sex) { // if(!this.form.sex) {
return this.$u.toast('请选择性别') // return this.$u.toast('请选择性别')
} // }
if(!this.form.birthDate) { // if(!this.form.birthDate) {
return this.$u.toast('请选择出生日期') // return this.$u.toast('请选择出生日期')
} // }
if(!this.form.currentAreaId) { // if(!this.form.currentAreaId) {
return this.$u.toast('请选择现住址') // return this.$u.toast('请选择现住址')
} // }
if(!/[^0]0{0,2}$/.test(this.form.currentAreaId)) { // if(!/[^0]0{0,2}$/.test(this.form.currentAreaId)) {
return this.$u.toast('现住址必须选到村级') // return this.$u.toast('现住址必须选到村级')
} // }
if(!this.form.currentAddressGroup) { // if(!this.form.currentAddressGroup) {
return this.$u.toast('请输入组') // return this.$u.toast('请输入组')
} // }
if(!this.form.currentAddressNo) { // if(!this.form.currentAddressNo) {
return this.$u.toast('请输入户') // return this.$u.toast('请输入户')
} // }
if(this.form.householdAreaId && !/[^0]0{0,2}$/.test(this.form.householdAreaId)) { // if(this.form.householdAreaId && !/[^0]0{0,2}$/.test(this.form.householdAreaId)) {
return this.$u.toast('户籍地必须选到村级') // return this.$u.toast('户籍地必须选到村级')
} // }
this.form.age = this.$calcAge(this.form.idNumber) // this.form.age = this.$calcAge(this.form.idNumber)
this.$http.post('/app/appresident/addOrUpdate', this.form).then(res => { this.$http.post('/app/appresident/addOrUpdate', this.form).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$u.toast('新增成功') this.$u.toast('新增成功')
@@ -276,6 +288,9 @@ export default {
this.formName = formName this.formName = formName
this.showSelect = true this.showSelect = true
}, },
confirmTime(e) {
this.form.birthDate = `${e.year}-${e.month}-${e.day}`
},
changeIdNumber() { changeIdNumber() {
let reg = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/; let reg = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
if (this.form.idNumber.length == 18 && !reg.test(this.form.idNumber)) { if (this.form.idNumber.length == 18 && !reg.test(this.form.idNumber)) {