kubbo/dvcp_v2_webapp
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_webapp into dev

Browse Source
This commit is contained in:
yanran200730
2022-03-29 09:40:02 +08:00
parent 45a1f53627 f3e003dfd6
commit 8f0f4e7106
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/jianping/AppHelpedResident/hrAdd.vue
View File

@@ -22,9 +22,9 @@
<el-form-item label="个人照片" prop="photo">
<ai-avatar :instance="instance" v-model="form.photo"/>
</el-form-item>
<el-form-item label="出生日期" prop="birthday">
<el-form-item label="出生日期" prop="birthDate">
<el-date-picker disabled value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"
v-model="form.birthday" type="date" placeholder="选择日期"/>
v-model="form.birthDate" type="date" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="年龄" prop="age">
<el-input disabled v-model="form.age" placeholder="请输入年龄" type="number"/>
@@ -252,8 +252,8 @@ export default {
})
},
handleIdNumberAutocomplete(v) {
let {birthday, sex} = this.idCardNoUtil.getIdCardInfo(v)
this.form = {...this.form, birthday, sex, age: this.$calcAge(v)}
let {birthday:birthDate, sex} = this.idCardNoUtil.getIdCardInfo(v)
this.form = {...this.form, birthDate, sex, age: this.$calcAge(v)}
},
submit() {
this.$refs.ruleForm.validate(v => {

6
packages/jianping/AppHelpedResident/hrDetail.vue
View File

@@ -36,7 +36,7 @@
<div flex class="half wrap fill">
<el-form-item label="身份证号" prop="name">{{ detail.idNumber }}</el-form-item>
<el-form-item label="性别" prop="sex">{{ dict.getLabel('sex', detail.sex) }}</el-form-item>
<el-form-item label="出生日期" prop="birthday">{{ detail.birthday }}</el-form-item>
<el-form-item label="出生日期">{{ detail.birthDate }}</el-form-item>
<el-form-item label="年龄" prop="age">{{ detail.age }}</el-form-item>
<el-form-item label="文化程度">{{ dict.getLabel('fpEducation', detail.education) }}</el-form-item>
<el-form-item label="民族">{{ dict.getLabel('fpNation', detail.nation) }}</el-form-item>
@@ -311,8 +311,8 @@ export default {
}).catch(() => 0)
},
handleRelieve(pass) {
let {id} = this.detail
this.$confirm(`是否${!pass ? '(申请)' : ''}解除监测对象`).then(() => {
let {id} = this.detail, msg = pass == 0 ? `是否继续监测对象` : `是否${isNaN(pass) ? '(申请)' : ''}解除监测对象`
this.$confirm(msg).then(() => {
this.instance.post("/app/apppreventionreturntopoverty/relieve", null, {
params: {pass, id}
}).then(res => {

2
packages/jianping/AppHelpedResident/hrList.vue
View File

@@ -63,7 +63,7 @@
url="/app/apppreventionreturntopoverty/downloadTemplate"
importUrl="/app/apppreventionreturntopoverty/import"
@onSuccess="page.current=1,search={},getTableData()"/>
<ai-download url="/app/apppreventionreturntopoverty/export" :params="{...search,ids:ids.toString()}"
<ai-download url="/app/apppreventionreturntopoverty/export" :params="{...search,ids}"
:instance="instance" fileName="监测对象导出文件"/>
</template>
</ai-search-bar>