清理$calcAge

packages/meta/AppPartyMember/components/Add.vue

@@ -33,7 +33,7 @@
                       :maxLength="15"
                       placeholder="请输入姓名"
                       v-model="form.name"
-                      
+
                   >
                     <template slot="append" v-if="!isEdit">
                       <ai-person-select
@@ -765,16 +765,17 @@
 
 <script>
 import {mapState} from "vuex";
+import {ID} from "dvcp-ui/lib/js/utils";
+
 export default {
   name: "Add",
-
   props: {
     instance: Function,
     dict: Object,
     selected: Object
   },
   computed: {
-     ...mapState(["user"]),
+    ...mapState(["user"]),
     isEdit() {
       return !!this.$route.query.id;
     },
@@ -938,10 +939,10 @@ export default {
       this.isShowDisciplinaryForm = true;
     },
     idChange(val) {
-      let info = this.idCardNoUtil.getIdCardInfo(val)
+      let info = new ID(val)
       this.form.sex = info.sex || "";
       this.form.birthday = info.birthday || "";
-      this.form.age = this.$calcAge(val) || "";
+      this.form.age = info.age
     },
     checkName(val) {
       for (let i in this.form) {

packages/meta/AppResident/residentDetail.vue

@@ -434,6 +434,7 @@ import {mapState} from "vuex";
 import AiEditCard from "./components/AiEditCard";
 import PersonalAssets from "./components/personalAssets";
 import TagsManage from "./components/tagsManage";
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: "residentDetail",
@@ -685,10 +686,10 @@ export default {
     },
     IdCard(UUserCard) {
       if (UUserCard) {
-        this.baseInfo.age = this.$calcAge(UUserCard)
-        let {birthday, sex} = this.idCardNoUtil.getIdCardInfo(UUserCard)
-        this.baseInfo.sex = sex
-        this.baseInfo.birthday = birthday
+        const idCard = new ID(UUserCard)
+        this.baseInfo.age = idCard.age
+        this.baseInfo.sex = idCard.sex
+        this.baseInfo.birthday = idCard.birthday
       }
     }
   },

packages/work/AppHelpedResident/hrAdd.vue

@@ -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('请选择监测对象类型')
         }
       }

packages/work/AppHelpedResident/hrDetail.vue

@@ -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) => {