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

清理$calcAge

Browse Source
This commit is contained in:
aixianling
2022-10-14 11:53:24 +08:00
parent 54f1356756
commit e710fc4604
10 changed files with 574 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/work/AppHelpedResident/hrAdd.vue
View File

@@ -328,6 +328,7 @@
<script>
import {mapState} from "vuex";
import {ID} from "dvcp-ui/lib/js/utils";
export default {
name: "hrAdd",
@@ -453,12 +454,12 @@ export default {
if (v.length == 20) {
idNumber = v.substring(0, 18)
}
let {birthday: birthDate, sex} = this.idCardNoUtil.getIdCardInfo(idNumber)
this.form = {...this.form, birthDate, sex, age: this.$calcAge(idNumber)}
let {birthday: birthDate, sex, age} = new ID(idNumber)
this.form = {...this.form, birthDate, sex, age}
},
submit() {
if(this.form.houseType == 1) {
if(!this.form.objectType) {
if (this.form.houseType == 1) {
if (!this.form.objectType) {
return this.$message.error('请选择监测对象类型')
}
}

7
packages/work/AppHelpedResident/hrDetail.vue
View File

@@ -42,7 +42,7 @@
<el-form-item label="证件号">{{ detail.idNumber }}</el-form-item>
<el-form-item label="性别" prop="sex">{{ dict.getLabel("sex", detail.sex) }}</el-form-item>
<el-form-item label="出生日期">{{ detail.birthDate }}</el-form-item>
<el-form-item label="家庭人口数">{{ detail.familyCount}}</el-form-item>
<el-form-item label="家庭人口数">{{ detail.familyCount }}</el-form-item>
<!-- <el-form-item label="年龄" prop="age">{{ detail.age}}</el-form-item> -->
<el-form-item label="民族">{{ dict.getLabel("fpNation", detail.nation) }}</el-form-item>
<el-form-item label="文化程度">{{ dict.getLabel("fpEducation", detail.education) }}</el-form-item>
@@ -497,6 +497,7 @@
import {mapState} from "vuex";
import HrMeasure from "./detail/hrMeasure";
import HrLog from "./detail/hrLog";
import {ID} from "dvcp-ui/lib/js/utils";
export default {
name: "hrDetail",
@@ -677,8 +678,8 @@ export default {
})
},
handleIdNumberAutocomplete(v) {
let {birthday: birthDate, sex} = this.idCardNoUtil.getIdCardInfo(v);
this.form = {...this.form, birthDate, sex, age: this.$calcAge(v)};
let {birthday: birthDate, sex, age} = new ID(v);
this.form = {...this.form, birthDate, sex, age};
},
onConfirm() {
this.$refs.ruleForm.validate((v) => {