From e710fc4604840771d0ef789fb7705e8526dd9564 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 14 Oct 2022 11:53:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86$calcAge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meta/AppPartyMember/components/Add.vue    |  11 +-
 packages/meta/AppResident/residentDetail.vue  |   9 +-
 packages/work/AppHelpedResident/hrAdd.vue     |   9 +-
 packages/work/AppHelpedResident/hrDetail.vue  |   7 +-
 .../AppRecruitPartyMembers/components/Add.vue |  86 +++----
 .../AppSpecialAdjustment/components/List.vue  | 209 +++++++++---------
 .../AppSpecialDisabled/components/List.vue    | 208 +++++++++--------
 .../apps/AppSpecialDrug/components/List.vue   | 209 +++++++++---------
 .../apps/AppSpecialMental/components/List.vue | 209 +++++++++---------
 .../apps/AppSpecialPrison/components/List.vue | 209 +++++++++---------
 10 files changed, 574 insertions(+), 592 deletions(-)

diff --git a/packages/meta/AppPartyMember/components/Add.vue b/packages/meta/AppPartyMember/components/Add.vue
index 7a5ba16c..9b85855e 100644
--- a/packages/meta/AppPartyMember/components/Add.vue
+++ b/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) {
diff --git a/packages/meta/AppResident/residentDetail.vue b/packages/meta/AppResident/residentDetail.vue
index 7da7c0d4..31145917 100644
--- a/packages/meta/AppResident/residentDetail.vue
+++ b/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
       }
     }
   },
diff --git a/packages/work/AppHelpedResident/hrAdd.vue b/packages/work/AppHelpedResident/hrAdd.vue
index 60afbbe0..a80775d5 100644
--- a/packages/work/AppHelpedResident/hrAdd.vue
+++ b/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('请选择监测对象类型')
         }
       }
diff --git a/packages/work/AppHelpedResident/hrDetail.vue b/packages/work/AppHelpedResident/hrDetail.vue
index 0b800174..b8246e15 100644
--- a/packages/work/AppHelpedResident/hrDetail.vue
+++ b/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) => {
diff --git a/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue b/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
index db1160d8..263cc9d7 100644
--- a/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
+++ b/project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
@@ -33,7 +33,7 @@
                       :maxLength="15"
                       placeholder="请输入姓名"
                       v-model="form.name"
-                      
+
                   >
                     <template slot="append" v-if="!isEdit">
                       <ai-person-select
@@ -224,9 +224,9 @@
             </el-form-item>
             <el-form-item label="文化程度">
               <ai-select
-                v-model="form.partyStatus"
-                placeholder="请选择文化程度"
-                :selectList="dict.getDict('partyStatus')"
+                  v-model="form.partyStatus"
+                  placeholder="请选择文化程度"
+                  :selectList="dict.getDict('partyStatus')"
               ></ai-select>
             </el-form-item>
             <el-form-item label="学位职称">
@@ -238,15 +238,15 @@
             </el-form-item>
             <el-form-item label="奖励情况" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入奖励情况"/>
+                        rows="2" placeholder="请输入奖励情况"/>
             </el-form-item>
             <el-form-item label="处分情况" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入处分情况"/>
+                        rows="2" placeholder="请输入处分情况"/>
             </el-form-item>
             <el-form-item label="简历" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入简历"/>
+                        rows="2" placeholder="请输入简历"/>
             </el-form-item>
             <el-form-item label="附件" style="width: 100%;">
               <ai-uploader
@@ -294,7 +294,7 @@
 
         <ai-card title="入学积极分子的确定和教育培养">
           <template #content>
-            <el-form-item label="确定为入学积极分子时间" prop="phone" required >
+            <el-form-item label="确定为入学积极分子时间" prop="phone" required>
               <el-date-picker
                   size="small"
                   v-model="form.joinPartyTime"
@@ -308,11 +308,11 @@
             </el-form-item>
             <el-form-item label="确定为积极分子的根据和意见" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入确定为积极分子的根据和意见"/>
+                        rows="2" placeholder="请输入确定为积极分子的根据和意见"/>
             </el-form-item>
             <el-form-item label="培养教育情况及鉴定意见" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入培养教育情况及鉴定意见"/>
+                        rows="2" placeholder="请输入培养教育情况及鉴定意见"/>
             </el-form-item>
 
           </template>
@@ -323,12 +323,12 @@
           </template>
           <template #content>
             <ai-table
-              :border="true"
-              :tableData="form.starList"
-              :isShowPagination="false"
-              :col-configs="colConfigs1"
-              :stripe="false"
-              @getList="() => {}"
+                :border="true"
+                :tableData="form.starList"
+                :isShowPagination="false"
+                :col-configs="colConfigs1"
+                :stripe="false"
+                @getList="() => {}"
             >
               <el-table-column label="职位" slot="level" align="center">
                 <template slot-scope="{ row }">
@@ -365,7 +365,7 @@
         </ai-card>
         <ai-card title="发展对象的确定和考察">
           <template #content>
-            <el-form-item label="确定为发展对象时间" prop="phone" required >
+            <el-form-item label="确定为发展对象时间" prop="phone" required>
               <el-date-picker
                   size="small"
                   v-model="form.joinPartyTime"
@@ -379,41 +379,41 @@
             </el-form-item>
             <el-form-item label="政治历史的考察及结论" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="社会关系考察及结论" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="现实考察及结论" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="学的基本知识考核及考试成绩" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="综合考察结论意见" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="学内讨论是否确定为发展对象的意见" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="确定为发展对象后的谈话记录" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="支委会研究意见" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
           </template>
         </ai-card>
         <ai-card title="预备学员的接收">
           <template #content>
-            <el-form-item label="吸收入学时间" prop="phone" required >
+            <el-form-item label="吸收入学时间" prop="phone" required>
               <el-date-picker
                   size="small"
                   v-model="form.joinPartyTime"
@@ -436,29 +436,29 @@
             </el-form-item>
             <el-form-item label="吸收入学时支部大会上学员提的意见和要求及个人的态度" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="预备期间的教育情况" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="学小组对其转正的讨论意见" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="预备期间的考察情况" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="学支部对其转正的意见" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
           </template>
         </ai-card>
         <ai-card title="预备学员的教育考察和转正">
           <template #content>
-            <el-form-item label="转正时间" prop="phone" required >
+            <el-form-item label="转正时间" prop="phone" required>
               <el-date-picker
                   size="small"
                   v-model="form.joinPartyTime"
@@ -472,19 +472,19 @@
             </el-form-item>
             <el-form-item label="预备期间的教育情况" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="预备期间的考察情况" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="学小组对其转正的讨论意见" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
             <el-form-item label="学支部对其转正的意见" style="width: 100%;">
               <el-input type="textarea" v-model="form.personalProfile" clearable maxlength="500" show-word-limit
-                 rows="2" placeholder="请输入..."/>
+                        rows="2" placeholder="请输入..."/>
             </el-form-item>
           </template>
         </ai-card>
@@ -667,6 +667,8 @@
 
 <script>
 import {mapState} from "vuex";
+import {ID} from "dvcp-ui/lib/js/utils";
+
 export default {
   name: "Add",
 
@@ -676,7 +678,7 @@ export default {
     selected: Object
   },
   computed: {
-     ...mapState(["user"]),
+    ...mapState(["user"]),
     isEdit() {
       return !!this.$route.query.id;
     },
@@ -845,10 +847,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) {
@@ -997,12 +999,14 @@ export default {
   .audit-1 {
     color: #2ea222 !important;
   }
+
   ::v-deep .ai-form .el-form-item .el-form-item__content {
-    margin-left: 174px!important;
+    margin-left: 174px !important;
   }
+
   ::v-deep .ai-form .el-form-item,
   ::v-deep .el-form-item {
-    margin-bottom: 8px!important;
+    margin-bottom: 8px !important;
   }
 }
 </style>
diff --git a/project/sass/apps/AppSpecialAdjustment/components/List.vue b/project/sass/apps/AppSpecialAdjustment/components/List.vue
index 621dab5d..028eca46 100644
--- a/project/sass/apps/AppSpecialAdjustment/components/List.vue
+++ b/project/sass/apps/AppSpecialAdjustment/components/List.vue
@@ -10,25 +10,25 @@
           </template>
           <template #right>
             <el-input
-              v-model="search.name"
-              size="small"
-              placeholder="请输入姓名"
-              clearable
-              v-throttle="() => {search.current = 1, getList()}"
-              @clear="search.current = 1, search.name = '', getList()"
-              suffix-icon="iconfont iconSearch">
+                v-model="search.name"
+                size="small"
+                placeholder="请输入姓名"
+                clearable
+                v-throttle="() => {search.current = 1, getList()}"
+                @clear="search.current = 1, search.name = '', getList()"
+                suffix-icon="iconfont iconSearch">
             </el-input>
           </template>
         </ai-search-bar>
         <ai-table
-          :tableData="tableData"
-          :col-configs="colConfigs"
-          :total="total"
-          v-loading="loading"
-          style="margin-top: 16px;"
-          :current.sync="search.current"
-          :size.sync="search.size"
-          @getList="getList">
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            v-loading="loading"
+            style="margin-top: 16px;"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @getList="getList">
           <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
             <template slot-scope="{ row }">
               <div class="table-options">
@@ -45,113 +45,108 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'List',
+import {mapState} from 'vuex'
+import {ID} from "dvcp-ui/lib/js/utils";
 
-    props: {
-      instance: Function,
-      dict: Object
-    },
+export default {
+  name: 'List',
 
-    data () {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          name: ''
-        },
-        colConfigs: [
-          { prop: 'name', label: '姓名' },
-          { prop: 'idNumber', align: 'center', label: '身份证号' },
-          { prop: 'gender', align: 'center', label: '性别' },
-          { prop: 'birthday', align: 'center', label: '出生日期' }, 
-          { prop: 'age', align: 'center', label: '年龄', }, 
-          { prop: 'phone', align: 'center', label: '联系方式' }
-        ],
-        tableData: [],
-        total: 0,
-        loading: false
-      }
-    },
+  props: {
+    instance: Function,
+    dict: Object
+  },
 
-    computed: {
-      ...mapState(['user']),
+  data() {
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        name: ''
+      },
+      colConfigs: [
+        {prop: 'name', label: '姓名'},
+        {prop: 'idNumber', align: 'center', label: '身份证号'},
+        {prop: 'gender', align: 'center', label: '性别'},
+        {prop: 'birthday', align: 'center', label: '出生日期'},
+        {prop: 'age', align: 'center', label: '年龄',},
+        {prop: 'phone', align: 'center', label: '联系方式'}
+      ],
+      tableData: [],
+      total: 0,
+      loading: false
+    }
+  },
 
-      param () {
-        return {
+  computed: {
+    ...mapState(['user']),
+  },
 
+  created() {
+    this.dict.load('sex').then(() => {
+      this.getList()
+    })
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appspecialadjustment/list`, null, {
+        params: {
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records.map(v => {
+            let info = new ID(v.idNumber)
+            v.birthday = info.birthday
+            v.age = info.age
+            v.gender = info.gender
+            return v
+          })
+          this.total = res.data.total
         }
-      }
-    },
-
-    created () {
-      this.dict.load('sex').then(() => {
-        this.getList()
       })
     },
 
-    methods: {
-      getList () {
-        this.instance.post(`/app/appspecialadjustment/list`, null, {
-          params: {
-            ...this.search
-          }
-        }).then(res => {
+    toEdit(e) {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          type: 'Add',
+          id: e
+        }
+      })
+    },
+
+    toAdd() {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          type: 'Add',
+        }
+      })
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appspecialadjustment/delete?ids=${id}`).then(res => {
           if (res.code == 0) {
-            this.tableData = res.data.records.map(v => {
-              let info = this.idCardNoUtil.getIdCardInfo(v.idNumber)
-              v.birthday = info.birthday
-              v.age = this.$calcAge(v.idNumber)
-              v.gender = info.gender
-
-              return v
-            })
-            this.total = res.data.total
+            this.$message.success('删除成功！')
+            this.getList()
           }
         })
-      },
+      })
+    },
 
-      toEdit (e) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            type: 'Add',
-            id: e
-          }
-        })
-      },
-
-      toAdd() {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            type: 'Add',
-          }
-        })
-      },
-
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appspecialadjustment/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      toDetail (id) {
-        this.$emit('change', {
-          type: 'Detail',
-          params: {
-            id: id || ''
-          }
-        })
-      }
+    toDetail(id) {
+      this.$emit('change', {
+        type: 'Detail',
+        params: {
+          id: id || ''
+        }
+      })
     }
   }
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/project/sass/apps/AppSpecialDisabled/components/List.vue b/project/sass/apps/AppSpecialDisabled/components/List.vue
index b367accc..b47392cd 100644
--- a/project/sass/apps/AppSpecialDisabled/components/List.vue
+++ b/project/sass/apps/AppSpecialDisabled/components/List.vue
@@ -10,25 +10,25 @@
           </template>
           <template #right>
             <el-input
-              v-model="search.name"
-              size="small"
-              placeholder="请输入姓名"
-              clearable
-              v-throttle="() => {search.current = 1, getList()}"
-              @clear="search.current = 1, search.name = '', getList()"
-              suffix-icon="iconfont iconSearch">
+                v-model="search.name"
+                size="small"
+                placeholder="请输入姓名"
+                clearable
+                v-throttle="() => {search.current = 1, getList()}"
+                @clear="search.current = 1, search.name = '', getList()"
+                suffix-icon="iconfont iconSearch">
             </el-input>
           </template>
         </ai-search-bar>
         <ai-table
-          :tableData="tableData"
-          :col-configs="colConfigs"
-          :total="total"
-          v-loading="loading"
-          style="margin-top: 16px;"
-          :current.sync="search.current"
-          :size.sync="search.size"
-          @getList="getList">
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            v-loading="loading"
+            style="margin-top: 16px;"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @getList="getList">
           <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
             <template slot-scope="{ row }">
               <div class="table-options">
@@ -45,113 +45,109 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'List',
+import {mapState} from 'vuex'
+import {ID} from "dvcp-ui/lib/js/utils";
 
-    props: {
-      instance: Function,
-      dict: Object
-    },
+export default {
+  name: 'List',
 
-    data () {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          name: ''
-        },
-        colConfigs: [
-          { prop: 'name', label: '姓名' },
-          { prop: 'idNumber', align: 'center', label: '身份证号' },
-          { prop: 'gender', align: 'center', label: '性别' },
-          { prop: 'birthday', align: 'center', label: '出生日期' }, 
-          { prop: 'age', align: 'center', label: '年龄', }, 
-          { prop: 'phone', align: 'center', label: '联系方式' }
-        ],
-        tableData: [],
-        total: 0,
-        loading: false
-      }
-    },
+  props: {
+    instance: Function,
+    dict: Object
+  },
 
-    computed: {
-      ...mapState(['user']),
+  data() {
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        name: ''
+      },
+      colConfigs: [
+        {prop: 'name', label: '姓名'},
+        {prop: 'idNumber', align: 'center', label: '身份证号'},
+        {prop: 'gender', align: 'center', label: '性别'},
+        {prop: 'birthday', align: 'center', label: '出生日期'},
+        {prop: 'age', align: 'center', label: '年龄',},
+        {prop: 'phone', align: 'center', label: '联系方式'}
+      ],
+      tableData: [],
+      total: 0,
+      loading: false
+    }
+  },
 
-      param () {
-        return {
+  computed: {
+    ...mapState(['user']),
+  },
 
+  created() {
+    this.dict.load('sex').then(() => {
+      this.getList()
+    })
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appspecialdisabled/list`, null, {
+        params: {
+          ...this.search
         }
-      }
-    },
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records.map(v => {
+            let info = new ID(v.idNumber)
+            v.birthday = info.birthday
+            v.age = info.age
+            v.gender = info.gender
 
-    created () {
-      this.dict.load('sex').then(() => {
-        this.getList()
+            return v
+          })
+          this.total = res.data.total
+        }
       })
     },
 
-    methods: {
-      getList () {
-        this.instance.post(`/app/appspecialdisabled/list`, null, {
-          params: {
-            ...this.search
-          }
-        }).then(res => {
+    toEdit(e) {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          type: 'Add',
+          id: e
+        }
+      })
+    },
+
+    toAdd() {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          type: 'Add',
+        }
+      })
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appspecialadjustment/delete?ids=${id}`).then(res => {
           if (res.code == 0) {
-            this.tableData = res.data.records.map(v => {
-              let info = this.idCardNoUtil.getIdCardInfo(v.idNumber)
-              v.birthday = info.birthday
-              v.age = this.$calcAge(v.idNumber)
-              v.gender = info.gender
-
-              return v
-            })
-            this.total = res.data.total
+            this.$message.success('删除成功！')
+            this.getList()
           }
         })
-      },
+      })
+    },
 
-      toEdit (e) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            type: 'Add',
-            id: e
-          }
-        })
-      },
-
-      toAdd() {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            type: 'Add',
-          }
-        })
-      },
-
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appspecialadjustment/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      toDetail (id) {
-        this.$emit('change', {
-          type: 'Detail',
-          params: {
-            id: id || ''
-          }
-        })
-      }
+    toDetail(id) {
+      this.$emit('change', {
+        type: 'Detail',
+        params: {
+          id: id || ''
+        }
+      })
     }
   }
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/project/sass/apps/AppSpecialDrug/components/List.vue b/project/sass/apps/AppSpecialDrug/components/List.vue
index 2b6e7623..6ba3681f 100644
--- a/project/sass/apps/AppSpecialDrug/components/List.vue
+++ b/project/sass/apps/AppSpecialDrug/components/List.vue
@@ -10,25 +10,25 @@
           </template>
           <template #right>
             <el-input
-              v-model="search.name"
-              size="small"
-              placeholder="请输入姓名"
-              clearable
-              v-throttle="() => {search.current = 1, getList()}"
-              @clear="search.current = 1, search.name = '', getList()"
-              suffix-icon="iconfont iconSearch">
+                v-model="search.name"
+                size="small"
+                placeholder="请输入姓名"
+                clearable
+                v-throttle="() => {search.current = 1, getList()}"
+                @clear="search.current = 1, search.name = '', getList()"
+                suffix-icon="iconfont iconSearch">
             </el-input>
           </template>
         </ai-search-bar>
         <ai-table
-          :tableData="tableData"
-          :col-configs="colConfigs"
-          :total="total"
-          v-loading="loading"
-          style="margin-top: 16px;"
-          :current.sync="search.current"
-          :size.sync="search.size"
-          @getList="getList">
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            v-loading="loading"
+            style="margin-top: 16px;"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @getList="getList">
           <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
             <template slot-scope="{ row }">
               <div class="table-options">
@@ -45,113 +45,108 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'List',
+import {mapState} from 'vuex'
+import {ID} from "dvcp-ui/lib/js/utils";
 
-    props: {
-      instance: Function,
-      dict: Object
-    },
+export default {
+  name: 'List',
 
-    data () {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          name: ''
-        },
-        colConfigs: [
-          { prop: 'name', label: '姓名' },
-          { prop: 'idNumber', align: 'center', label: '身份证号' },
-          { prop: 'gender', align: 'center', label: '性别' },
-          { prop: 'birthday', align: 'center', label: '出生日期' }, 
-          { prop: 'age', align: 'center', label: '年龄', }, 
-          { prop: 'phone', align: 'center', label: '联系方式' }
-        ],
-        tableData: [],
-        total: 0,
-        loading: false
-      }
-    },
+  props: {
+    instance: Function,
+    dict: Object
+  },
 
-    computed: {
-      ...mapState(['user']),
+  data() {
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        name: ''
+      },
+      colConfigs: [
+        {prop: 'name', label: '姓名'},
+        {prop: 'idNumber', align: 'center', label: '身份证号'},
+        {prop: 'gender', align: 'center', label: '性别'},
+        {prop: 'birthday', align: 'center', label: '出生日期'},
+        {prop: 'age', align: 'center', label: '年龄',},
+        {prop: 'phone', align: 'center', label: '联系方式'}
+      ],
+      tableData: [],
+      total: 0,
+      loading: false
+    }
+  },
 
-      param () {
-        return {
+  computed: {
+    ...mapState(['user']),
+  },
 
+  created() {
+    this.dict.load('sex').then(() => {
+      this.getList()
+    })
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appspecialdrug/list`, null, {
+        params: {
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records.map(v => {
+            let info = new ID(v.idNumber)
+            v.birthday = info.birthday
+            v.age = info.age
+            v.gender = info.gender
+            return v
+          })
+          this.total = res.data.total
         }
-      }
-    },
-
-    created () {
-      this.dict.load('sex').then(() => {
-        this.getList()
       })
     },
 
-    methods: {
-      getList () {
-        this.instance.post(`/app/appspecialdrug/list`, null, {
-          params: {
-            ...this.search
-          }
-        }).then(res => {
+    toEdit(e) {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          type: 'Add',
+          id: e
+        }
+      })
+    },
+
+    toAdd() {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          type: 'Add',
+        }
+      })
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appspecialprison/delete?ids=${id}`).then(res => {
           if (res.code == 0) {
-            this.tableData = res.data.records.map(v => {
-              let info = this.idCardNoUtil.getIdCardInfo(v.idNumber)
-              v.birthday = info.birthday
-              v.age = this.$calcAge(v.idNumber)
-              v.gender = info.gender
-
-              return v
-            })
-            this.total = res.data.total
+            this.$message.success('删除成功！')
+            this.getList()
           }
         })
-      },
+      })
+    },
 
-      toEdit (e) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            type: 'Add',
-            id: e
-          }
-        })
-      },
-
-      toAdd() {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            type: 'Add',
-          }
-        })
-      },
-
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appspecialprison/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      toDetail (id) {
-        this.$emit('change', {
-          type: 'Detail',
-          params: {
-            id: id || ''
-          }
-        })
-      }
+    toDetail(id) {
+      this.$emit('change', {
+        type: 'Detail',
+        params: {
+          id: id || ''
+        }
+      })
     }
   }
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/project/sass/apps/AppSpecialMental/components/List.vue b/project/sass/apps/AppSpecialMental/components/List.vue
index 044c85d9..6f72d05c 100644
--- a/project/sass/apps/AppSpecialMental/components/List.vue
+++ b/project/sass/apps/AppSpecialMental/components/List.vue
@@ -10,25 +10,25 @@
           </template>
           <template #right>
             <el-input
-              v-model="search.name"
-              size="small"
-              placeholder="请输入姓名"
-              clearable
-              v-throttle="() => {search.current = 1, getList()}"
-              @clear="search.current = 1, search.name = '', getList()"
-              suffix-icon="iconfont iconSearch">
+                v-model="search.name"
+                size="small"
+                placeholder="请输入姓名"
+                clearable
+                v-throttle="() => {search.current = 1, getList()}"
+                @clear="search.current = 1, search.name = '', getList()"
+                suffix-icon="iconfont iconSearch">
             </el-input>
           </template>
         </ai-search-bar>
         <ai-table
-          :tableData="tableData"
-          :col-configs="colConfigs"
-          :total="total"
-          v-loading="loading"
-          style="margin-top: 16px;"
-          :current.sync="search.current"
-          :size.sync="search.size"
-          @getList="getList">
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            v-loading="loading"
+            style="margin-top: 16px;"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @getList="getList">
           <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
             <template slot-scope="{ row }">
               <div class="table-options">
@@ -45,113 +45,108 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'List',
+import {mapState} from 'vuex'
+import {ID} from "dvcp-ui/lib/js/utils"
 
-    props: {
-      instance: Function,
-      dict: Object
-    },
+export default {
+  name: 'List',
 
-    data () {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          name: ''
-        },
-        colConfigs: [
-          { prop: 'name', label: '姓名' },
-          { prop: 'idNumber', align: 'center', label: '身份证号' },
-          { prop: 'gender', align: 'center', label: '性别' },
-          { prop: 'birthday', align: 'center', label: '出生日期' }, 
-          { prop: 'age', align: 'center', label: '年龄', }, 
-          { prop: 'phone', align: 'center', label: '联系方式' }
-        ],
-        tableData: [],
-        total: 0,
-        loading: false
-      }
-    },
+  props: {
+    instance: Function,
+    dict: Object
+  },
 
-    computed: {
-      ...mapState(['user']),
+  data() {
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        name: ''
+      },
+      colConfigs: [
+        {prop: 'name', label: '姓名'},
+        {prop: 'idNumber', align: 'center', label: '身份证号'},
+        {prop: 'gender', align: 'center', label: '性别'},
+        {prop: 'birthday', align: 'center', label: '出生日期'},
+        {prop: 'age', align: 'center', label: '年龄',},
+        {prop: 'phone', align: 'center', label: '联系方式'}
+      ],
+      tableData: [],
+      total: 0,
+      loading: false
+    }
+  },
 
-      param () {
-        return {
+  computed: {
+    ...mapState(['user']),
+  },
 
+  created() {
+    this.dict.load('sex').then(() => {
+      this.getList()
+    })
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appspecialmental/list`, null, {
+        params: {
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records.map(v => {
+            let info = new ID(v.idNumber)
+            v.birthday = info.birthday
+            v.age = info.age
+            v.gender = info.gender
+            return v
+          })
+          this.total = res.data.total
         }
-      }
-    },
-
-    created () {
-      this.dict.load('sex').then(() => {
-        this.getList()
       })
     },
 
-    methods: {
-      getList () {
-        this.instance.post(`/app/appspecialmental/list`, null, {
-          params: {
-            ...this.search
-          }
-        }).then(res => {
+    toEdit(e) {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          type: 'Add',
+          id: e
+        }
+      })
+    },
+
+    toAdd() {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          type: 'Add',
+        }
+      })
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appspecialmental/delete?ids=${id}`).then(res => {
           if (res.code == 0) {
-            this.tableData = res.data.records.map(v => {
-              let info = this.idCardNoUtil.getIdCardInfo(v.idNumber)
-              v.birthday = info.birthday
-              v.age = this.$calcAge(v.idNumber)
-              v.gender = info.gender
-
-              return v
-            })
-            this.total = res.data.total
+            this.$message.success('删除成功！')
+            this.getList()
           }
         })
-      },
+      })
+    },
 
-      toEdit (e) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            type: 'Add',
-            id: e
-          }
-        })
-      },
-
-      toAdd() {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            type: 'Add',
-          }
-        })
-      },
-
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appspecialmental/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      toDetail (id) {
-        this.$emit('change', {
-          type: 'Detail',
-          params: {
-            id: id || ''
-          }
-        })
-      }
+    toDetail(id) {
+      this.$emit('change', {
+        type: 'Detail',
+        params: {
+          id: id || ''
+        }
+      })
     }
   }
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/project/sass/apps/AppSpecialPrison/components/List.vue b/project/sass/apps/AppSpecialPrison/components/List.vue
index b8c1f96a..3d09fd30 100644
--- a/project/sass/apps/AppSpecialPrison/components/List.vue
+++ b/project/sass/apps/AppSpecialPrison/components/List.vue
@@ -10,25 +10,25 @@
           </template>
           <template #right>
             <el-input
-              v-model="search.name"
-              size="small"
-              placeholder="请输入姓名"
-              clearable
-              v-throttle="() => {search.current = 1, getList()}"
-              @clear="search.current = 1, search.name = '', getList()"
-              suffix-icon="iconfont iconSearch">
+                v-model="search.name"
+                size="small"
+                placeholder="请输入姓名"
+                clearable
+                v-throttle="() => {search.current = 1, getList()}"
+                @clear="search.current = 1, search.name = '', getList()"
+                suffix-icon="iconfont iconSearch">
             </el-input>
           </template>
         </ai-search-bar>
         <ai-table
-          :tableData="tableData"
-          :col-configs="colConfigs"
-          :total="total"
-          v-loading="loading"
-          style="margin-top: 16px;"
-          :current.sync="search.current"
-          :size.sync="search.size"
-          @getList="getList">
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            v-loading="loading"
+            style="margin-top: 16px;"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @getList="getList">
           <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
             <template slot-scope="{ row }">
               <div class="table-options">
@@ -45,113 +45,106 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'List',
+import {mapState} from 'vuex'
+import {ID} from "dvcp-ui/lib/js/utils";
 
-    props: {
-      instance: Function,
-      dict: Object
-    },
+export default {
+  name: 'List',
 
-    data () {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          name: ''
-        },
-        colConfigs: [
-          { prop: 'name', label: '姓名' },
-          { prop: 'idNumber', align: 'center', label: '身份证号' },
-          { prop: 'gender', align: 'center', label: '性别' },
-          { prop: 'birthday', align: 'center', label: '出生日期' },
-          { prop: 'age', align: 'center', label: '年龄', },
-          { prop: 'phone', align: 'center', label: '联系方式' }
-        ],
-        tableData: [],
-        total: 0,
-        loading: false
-      }
-    },
+  props: {
+    instance: Function,
+    dict: Object
+  },
 
-    computed: {
-      ...mapState(['user']),
-
-      param () {
-        return {
+  data() {
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        name: ''
+      },
+      colConfigs: [
+        {prop: 'name', label: '姓名'},
+        {prop: 'idNumber', align: 'center', label: '身份证号'},
+        {prop: 'gender', align: 'center', label: '性别'},
+        {prop: 'birthday', align: 'center', label: '出生日期'},
+        {prop: 'age', align: 'center', label: '年龄',},
+        {prop: 'phone', align: 'center', label: '联系方式'}
+      ],
+      tableData: [],
+      total: 0,
+      loading: false
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  created() {
+    this.dict.load('sex').then(() => {
+      this.getList()
+    })
+  },
 
+  methods: {
+    getList() {
+      this.instance.post(`/app/appspecialprison/list`, null, {
+        params: {
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records.map(v => {
+            let info = new ID(v.idNumber)
+            v.birthday = info.birthday
+            v.age = info.age
+            v.gender = info.gender
+            return v
+          })
+          this.total = res.data.total
         }
-      }
-    },
-
-    created () {
-      this.dict.load('sex').then(() => {
-        this.getList()
       })
     },
 
-    methods: {
-      getList () {
-        this.instance.post(`/app/appspecialprison/list`, null, {
-          params: {
-            ...this.search
-          }
-        }).then(res => {
+    toEdit(e) {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          type: 'Add',
+          id: e
+        }
+      })
+    },
+
+    toAdd() {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          type: 'Add',
+        }
+      })
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appspecialprison/delete?ids=${id}`).then(res => {
           if (res.code == 0) {
-            this.tableData = res.data.records.map(v => {
-              let info = this.idCardNoUtil.getIdCardInfo(v.idNumber)
-              v.birthday = info.birthday
-              v.age = this.$calcAge(v.idNumber)
-              v.gender = info.gender
-
-              return v
-            })
-            this.total = res.data.total
+            this.$message.success('删除成功！')
+            this.getList()
           }
         })
-      },
+      })
+    },
 
-      toEdit (e) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            type: 'Add',
-            id: e
-          }
-        })
-      },
-
-      toAdd() {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            type: 'Add',
-          }
-        })
-      },
-
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appspecialprison/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      toDetail (id) {
-        this.$emit('change', {
-          type: 'Detail',
-          params: {
-            id: id || ''
-          }
-        })
-      }
+    toDetail(id) {
+      this.$emit('change', {
+        type: 'Detail',
+        params: {
+          id: id || ''
+        }
+      })
     }
   }
+}
 </script>
 
 <style scoped lang="scss">