From cfb0177a453aac4dd032e648b4456acdec138f78 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 14 Oct 2022 13:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86idCardNoUtils,=E6=94=B9?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8ID=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conv/AppVaccination/AppVaccination.vue    |   3 +-
 .../conv/AppVaccination/addVaccination.vue    |   7 +-
 .../scorePersonal/AppScorePersonal.vue        |   4 +-
 .../tutelage/AppWristband/components/Add.vue  |   3 +-
 .../AppCodeGeneration/components/Add.vue      |   3 +-
 .../components/neighbourSetting.vue           |   6 +-
 packages/meta/AppResident/residentDetail.vue  |   6 +-
 packages/party/AppPartyScore/psList.vue       |   3 +-
 packages/work/AppHelpedResident/hrDetail.vue  |   2 +-
 packages/work/AppHelpedResident/hrList.vue    |   3 +-
 .../work/AppRiskWarning/components/Add.vue    |   7 +-
 .../corporateSeal/sealDetail.vue              |   6 +-
 .../AppPersonalSignature.vue                  |   2 +-
 .../AppSpecialAdjustment/components/Add.vue   |   3 +-
 .../components/Detail.vue                     |  10 +-
 .../AppSpecialDisabled/components/Add.vue     |   3 +-
 .../AppSpecialDisabled/components/Detail.vue  |  10 +-
 .../apps/AppSpecialDrug/components/Add.vue    |   3 +-
 .../apps/AppSpecialDrug/components/Detail.vue |  10 +-
 .../apps/AppSpecialMental/components/Add.vue  |   3 +-
 .../AppSpecialMental/components/Detail.vue    |  10 +-
 .../apps/AppSpecialPrison/components/Add.vue  |   5 +-
 .../AppSpecialPrison/components/Detail.vue    | 228 +++++++++---------
 .../apps/finance/AppLoanAudit/loanList.vue    |   3 +-
 .../xiushan/apps/loanStatement/AppLoanSta.vue |   3 +-
 .../corporateSeal/sealDetail.vue              |   6 +-
 .../AppPersonalSignature.vue                  |   3 +-
 27 files changed, 193 insertions(+), 162 deletions(-)

diff --git a/packages/conv/AppVaccination/AppVaccination.vue b/packages/conv/AppVaccination/AppVaccination.vue
index 255b333d..a98c02b0 100644
--- a/packages/conv/AppVaccination/AppVaccination.vue
+++ b/packages/conv/AppVaccination/AppVaccination.vue
@@ -62,6 +62,7 @@
 <script>
 import {mapState} from "vuex";
 import AddVaccination from "./addVaccination";
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: "AppVaccination",
@@ -108,7 +109,7 @@ export default {
         {label: "出生日期", prop: "birthday", align: 'center'},
         {
           label: "身份证号", width: "160px", align: 'center',
-          render: (h, {row}) => h('span', null, this.idCardNoUtil.hideId(row.idNumber))
+          render: (h, {row}) => h('span', null, ID.hideId(row.idNumber))
         },
         {label: "所属地区", prop: "areaName", align: 'center'},
         {label: "住址", prop: "address", width: "200px", align: 'center'},
diff --git a/packages/conv/AppVaccination/addVaccination.vue b/packages/conv/AppVaccination/addVaccination.vue
index 26d42b17..3c4cfa2d 100644
--- a/packages/conv/AppVaccination/addVaccination.vue
+++ b/packages/conv/AppVaccination/addVaccination.vue
@@ -82,6 +82,7 @@
 
 <script>
 import {mapState} from "vuex";
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: "addVaccination",
@@ -183,9 +184,9 @@ export default {
       this.form = {...this.form, name, idNumber, phone, areaId, address}
     },
     getInfoByIdNumber(code) {
-      if (this.idCardNoUtil.checkIdCardNo(code)) {
-        let info = this.idCardNoUtil.getIdCardInfo(code)
-        this.form.sex = this.dict.getValue('sex', info.gender)
+      if (ID.check(code)) {
+        let info = new ID(code)
+        this.form.sex = info.sex
         this.form.birthday = info.birthday
         this.$forceUpdate()
       }
diff --git a/packages/conv/creditScore/scorePersonal/AppScorePersonal.vue b/packages/conv/creditScore/scorePersonal/AppScorePersonal.vue
index 6c44f2fe..dc07190d 100644
--- a/packages/conv/creditScore/scorePersonal/AppScorePersonal.vue
+++ b/packages/conv/creditScore/scorePersonal/AppScorePersonal.vue
@@ -97,6 +97,7 @@
 <script>
 import {mapState} from 'vuex';
 import detail from './detail'
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: 'AppScorePersonal',
@@ -263,8 +264,7 @@ export default {
     formRules() {
       let IdNumberPass = (rule, value, callback) => {
         if (value) {
-          console.log(this.idCardNoUtil);
-          if (this.idCardNoUtil.checkIdCardNo(value)) {
+          if (ID.check(value)) {
             callback();
           } else {
             callback(new Error("身份证号格式错误"));
diff --git a/packages/device/tutelage/AppWristband/components/Add.vue b/packages/device/tutelage/AppWristband/components/Add.vue
index 26d74c90..1685bd01 100644
--- a/packages/device/tutelage/AppWristband/components/Add.vue
+++ b/packages/device/tutelage/AppWristband/components/Add.vue
@@ -119,6 +119,7 @@
 
 <script>
   import { mapState } from 'vuex'
+  import {ID} from "dvcp-ui/lib/js/utils";
   export default {
     name: 'Add',
 
@@ -132,7 +133,7 @@
       const validatorId = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请输入身份证号'))
-        } else if (!this.idCardNoUtil.checkIdCardNo(value)) {
+        } else if (!ID.check(value)) {
           callback(new Error('身份证号格式错误'))
         } else {
           callback()
diff --git a/packages/extra/AppCodeGeneration/components/Add.vue b/packages/extra/AppCodeGeneration/components/Add.vue
index 5fe3905c..22ad8df4 100644
--- a/packages/extra/AppCodeGeneration/components/Add.vue
+++ b/packages/extra/AppCodeGeneration/components/Add.vue
@@ -163,6 +163,7 @@
 
 <script>
 import {mapState} from 'vuex'
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: 'Add',
@@ -242,7 +243,7 @@ export default {
         }
       })
 
-      const idNumberInfo = this.idCardNoUtil.getIdCardInfo(e.idNumber)
+      const idNumberInfo = new ID(e.idNumber)
       this.$set(this.formData, 'birthDate', idNumberInfo.birthday)
       this.formData.photo = e.photo ? [{
         url: e.photo
diff --git a/packages/meta/AppPartyMember/components/neighbourSetting.vue b/packages/meta/AppPartyMember/components/neighbourSetting.vue
index 90740316..c3e1bce7 100644
--- a/packages/meta/AppPartyMember/components/neighbourSetting.vue
+++ b/packages/meta/AppPartyMember/components/neighbourSetting.vue
@@ -43,7 +43,7 @@
               <el-row type="flex" justify="space-between" @click.native="handleSelectResident(row)" class="toggle"
                       :class="{selected:findResident(row.id)>-1}">
                 <span v-text="row.name"/>
-                <span v-text="idCardNoUtil.hideId(row.idNumber)"/>
+                <span v-text="ID.hideId(row.idNumber)"/>
               </el-row>
             </template>
           </el-table-column>
@@ -57,7 +57,7 @@
             </template>
             <template slot-scope="{row,$index}">
               <el-row type="flex" align="middle" justify="space-between">
-                <div v-text="[row.residentName, idCardNoUtil.hideId(row.idNumber)].join(' ')"/>
+                <div v-text="[row.residentName, ID.hideId(row.idNumber)].join(' ')"/>
                 <el-button type="text" @click="form.residentList.splice($index,1)">删除</el-button>
               </el-row>
             </template>
@@ -70,6 +70,7 @@
 
 <script>
 import {mapState} from "vuex";
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: "neighbourSetting",
@@ -92,6 +93,7 @@ export default {
   },
   data() {
     return {
+      ID,
       search: {residentName: "", ids: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
diff --git a/packages/meta/AppResident/residentDetail.vue b/packages/meta/AppResident/residentDetail.vue
index 31145917..08c77c8e 100644
--- a/packages/meta/AppResident/residentDetail.vue
+++ b/packages/meta/AppResident/residentDetail.vue
@@ -448,7 +448,7 @@ export default {
   data() {
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
-        if (this.idCardNoUtil.checkIdCardNo(value)) {
+        if (ID.check(value)) {
           callback();
         } else {
           callback(new Error("身份证号格式错误"));
@@ -568,7 +568,7 @@ export default {
         {label: "姓名", prop: "name"},
         {label: "性别", prop: "sex", dict: "sex", align: 'center'},
         {label: "年龄", prop: "age", align: 'center'},
-        {label: "身份证号", render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber))},
+        {label: "身份证号", render: (h, {row}) => h('p', ID.hideId(row.idNumber))},
         {slot: "options"}
       ]
     }
@@ -653,7 +653,7 @@ export default {
     },
     showFamily(row) {
       this.familyInfo = row;
-      let {birthday} = this.idCardNoUtil.getIdCardInfo(this.familyInfo.idNumber)
+      let {birthday} = ID.getIdCardInfo(this.familyInfo.idNumber)
       this.familyInfo.birthday = birthday
       if (this.familyInfo.photo) {
         this.familyInfo.imgUrl = this.familyInfo.photo.split(";")[0];
diff --git a/packages/party/AppPartyScore/psList.vue b/packages/party/AppPartyScore/psList.vue
index 8e1899a9..a181b82e 100644
--- a/packages/party/AppPartyScore/psList.vue
+++ b/packages/party/AppPartyScore/psList.vue
@@ -34,6 +34,7 @@
 
 <script>
 import {mapState} from "vuex";
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: "psList",
@@ -60,7 +61,7 @@ export default {
         },
         {label: '类型', prop: 'residentType', align: 'center', dict: "residentType"},
         {label: '姓名', prop: 'name', align: 'center'},
-        {label: '身份证号', render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber)), width: 165},
+        {label: '身份证号', render: (h, {row}) => h('p', ID.hideId(row.idNumber)), width: 165},
         {label: '联系电话', prop: 'phone', align: 'center', width: 120}
       ]
     }
diff --git a/packages/work/AppHelpedResident/hrDetail.vue b/packages/work/AppHelpedResident/hrDetail.vue
index b8246e15..e9243de8 100644
--- a/packages/work/AppHelpedResident/hrDetail.vue
+++ b/packages/work/AppHelpedResident/hrDetail.vue
@@ -522,7 +522,7 @@ export default {
         {
           label: "证件号",
           render: (h, {row}) =>
-              h("p", null, this.idCardNoUtil.hideId(row.idNumber)),
+              h("p", null, ID.hideId(row.idNumber)),
         },
         {slot: "options"},
       ];
diff --git a/packages/work/AppHelpedResident/hrList.vue b/packages/work/AppHelpedResident/hrList.vue
index 21ed92e3..2e111a94 100644
--- a/packages/work/AppHelpedResident/hrList.vue
+++ b/packages/work/AppHelpedResident/hrList.vue
@@ -77,6 +77,7 @@
 
 <script>
 import {mapState} from "vuex";
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: "hrList",
@@ -92,7 +93,7 @@ export default {
         {type: 'selection'},
         {label: "姓名", prop: "name", align: "center"},
         {label: "性别", prop: "sex", dict: 'sex', align: "center"},
-        {label: "证件号", render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber))},
+        {label: "证件号", render: (h, {row}) => h('p', ID.hideId(row.idNumber))},
         {label: "年龄", prop: "age", align: "center"},
         {label: "民族", prop: "nation", align: "center", dict: "fpNation"},
         {label: "文化程度", prop: "education", align: "center", dict: "fpEducation"},
diff --git a/packages/work/AppRiskWarning/components/Add.vue b/packages/work/AppRiskWarning/components/Add.vue
index 5de663f9..0a6c4ed9 100644
--- a/packages/work/AppRiskWarning/components/Add.vue
+++ b/packages/work/AppRiskWarning/components/Add.vue
@@ -57,6 +57,7 @@
 
 <script>
   import { mapState } from 'vuex'
+  import {ID} from "dvcp-ui/lib/js/utils";
   export default {
     name: 'Add',
 
@@ -70,7 +71,7 @@
       const validatorId = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请输入身份证号'))
-        } else if (!this.idCardNoUtil.checkIdCardNo(value)) {
+        } else if (!ID.check(value)) {
           callback(new Error('身份证号格式错误'))
         } else {
           callback()
@@ -80,10 +81,10 @@
       const validatorPhone = function (rule, value, callback) {
         if (value === '') {
           callback(new Error('请输入联系方式'))
-        } 
+        }
         // else if (!/^1\d{10}$/.test(value)) {
         //   callback(new Error('手机号格式错误'))
-        // } 
+        // }
         else {
           callback()
         }
diff --git a/packages/work/processManagement/corporateSeal/sealDetail.vue b/packages/work/processManagement/corporateSeal/sealDetail.vue
index 36d36da6..b6c19574 100644
--- a/packages/work/processManagement/corporateSeal/sealDetail.vue
+++ b/packages/work/processManagement/corporateSeal/sealDetail.vue
@@ -95,6 +95,8 @@
 </template>
 
 <script>
+import {ID} from "dvcp-ui/lib/js/utils";
+
 export default {
   name: "sealDetail",
   inject: ['seal'],
@@ -135,11 +137,11 @@ export default {
         ],
         legalIdNumber: [
           {required: true, message: "请填写法人身份证号码"},
-          {validator: (r, v, cb) => cb(this.idCardNoUtil.checkIdCardNo(v) ? undefined : "身份证号码格式有误")}
+          {validator: (r, v, cb) => cb(ID.check(v) ? undefined : "身份证号码格式有误")}
         ],
         agentIdNumber: [
           {required: true, message: "请填写代理人身份证号码"},
-          {validator: (r, v, cb) => cb(this.idCardNoUtil.checkIdCardNo(v) ? undefined : "身份证号码格式有误")}
+          {validator: (r, v, cb) => cb(ID.check(v) ? undefined : "身份证号码格式有误")}
         ],
       }
     }
diff --git a/packages/work/processManagement/personalSignature/AppPersonalSignature.vue b/packages/work/processManagement/personalSignature/AppPersonalSignature.vue
index 26532308..e84f74b7 100644
--- a/packages/work/processManagement/personalSignature/AppPersonalSignature.vue
+++ b/packages/work/processManagement/personalSignature/AppPersonalSignature.vue
@@ -95,7 +95,7 @@ export default {
         ],
         idNumber: [
           {required: true, message: "请填写身份证号码"},
-          {validator: (r, v, cb) => cb(this.idCardNoUtil.checkIdCardNo(v) ? undefined : "身份证号码格式有误")}
+          {validator: (r, v, cb) => cb(ID.check(v) ? undefined : "身份证号码格式有误")}
         ],
       }
     }
diff --git a/project/sass/apps/AppSpecialAdjustment/components/Add.vue b/project/sass/apps/AppSpecialAdjustment/components/Add.vue
index 6eae6d02..316d91de 100644
--- a/project/sass/apps/AppSpecialAdjustment/components/Add.vue
+++ b/project/sass/apps/AppSpecialAdjustment/components/Add.vue
@@ -113,6 +113,7 @@
 
 <script>
 import { mapState } from 'vuex'
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: 'Add',
@@ -137,7 +138,7 @@ export default {
 
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
-        if (this.idCardNoUtil.checkIdCardNo(value)) {
+        if (ID.check(value)) {
           callback();
         } else {
           callback(new Error('身份证号格式错误'))
diff --git a/project/sass/apps/AppSpecialAdjustment/components/Detail.vue b/project/sass/apps/AppSpecialAdjustment/components/Detail.vue
index 7f39e949..8fc37e71 100644
--- a/project/sass/apps/AppSpecialAdjustment/components/Detail.vue
+++ b/project/sass/apps/AppSpecialAdjustment/components/Detail.vue
@@ -52,6 +52,8 @@
 </template>
 
 <script>
+  import {ID} from "dvcp-ui/lib/js/utils";
+
   export default {
     name: 'Detail',
 
@@ -60,21 +62,22 @@
       dict: Object,
       params: Object
     },
-
+    computed:{
+      idNumberInfo:v=>new ID(v.info.idNumber)
+    },
     data () {
       return {
         currIndex: 0,
         tabTitle: ['人员信息', '走访记录'],
         info: {},
         list: [],
-        idNumberInfo: {}
       }
     },
 
     created () {
       if (this.params && this.params.id) {
         this.id = this.params.id
-      
+
         this.dict.load('appSpecialSituation', 'appSpecialPlacement', 'appSpecialDenger', 'appSpecialCrime',
             'appSpecialControl', 'appSpecialDebug', 'appSpecialDrug', 'appSpecialChangeType', 'appSpecialCure', 'appSpecialDengerLevel',
             'appSpecialDisableLevel', 'appSpecialDisableType', 'appSpecialHealth', 'appSpecialMarriage', 'appSpecialTypeFive','isReflection','yesOrNo').then(() => {
@@ -91,7 +94,6 @@
         this.instance.post(`/app/appspecialadjustment/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
-            this.idNumberInfo = this.idCardNoUtil.getIdCardInfo(res.data.idNumber)
           }
         })
       },
diff --git a/project/sass/apps/AppSpecialDisabled/components/Add.vue b/project/sass/apps/AppSpecialDisabled/components/Add.vue
index 2232baca..51d4f614 100644
--- a/project/sass/apps/AppSpecialDisabled/components/Add.vue
+++ b/project/sass/apps/AppSpecialDisabled/components/Add.vue
@@ -113,6 +113,7 @@
 
 <script>
 import { mapState } from 'vuex'
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: 'Add',
@@ -137,7 +138,7 @@ export default {
 
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
-        if (this.idCardNoUtil.checkIdCardNo(value)) {
+        if (ID.check(value)) {
           callback();
         } else {
           callback(new Error('身份证号格式错误'))
diff --git a/project/sass/apps/AppSpecialDisabled/components/Detail.vue b/project/sass/apps/AppSpecialDisabled/components/Detail.vue
index 378ae6ba..e9db12db 100644
--- a/project/sass/apps/AppSpecialDisabled/components/Detail.vue
+++ b/project/sass/apps/AppSpecialDisabled/components/Detail.vue
@@ -51,6 +51,8 @@
 </template>
 
 <script>
+  import {ID} from "dvcp-ui/lib/js/utils";
+
   export default {
     name: 'Detail',
 
@@ -66,14 +68,13 @@
         tabTitle: ['人员信息', '走访记录'],
         info: {},
         list: [],
-        idNumberInfo: {}
       }
     },
 
     created () {
       if (this.params && this.params.id) {
         this.id = this.params.id
-      
+
         this.dict.load('appSpecialSituation', 'appSpecialPlacement', 'appSpecialDenger', 'appSpecialCrime',
             'appSpecialControl', 'appSpecialDebug', 'appSpecialDrug', 'appSpecialChangeType', 'appSpecialCure', 'appSpecialDengerLevel',
             'appSpecialDisableLevel', 'appSpecialDisableType', 'appSpecialHealth', 'appSpecialMarriage', 'appSpecialTypeFive','isReflection','yesOrNo').then(() => {
@@ -84,13 +85,14 @@
         })
       }
     },
-
+    computed:{
+      idNumberInfo:v=>new ID(v.info.idNumber)
+    },
     methods: {
       getInfo (id) {
         this.instance.post(`/app/appspecialdisabled/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
-            this.idNumberInfo = this.idCardNoUtil.getIdCardInfo(res.data.idNumber)
           }
         })
       },
diff --git a/project/sass/apps/AppSpecialDrug/components/Add.vue b/project/sass/apps/AppSpecialDrug/components/Add.vue
index 19a5f571..87c6e995 100644
--- a/project/sass/apps/AppSpecialDrug/components/Add.vue
+++ b/project/sass/apps/AppSpecialDrug/components/Add.vue
@@ -113,6 +113,7 @@
 
 <script>
 import { mapState } from 'vuex'
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: 'Add',
@@ -150,7 +151,7 @@ export default {
 
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
-        if (this.idCardNoUtil.checkIdCardNo(value)) {
+        if (ID.check(value)) {
           callback();
         } else {
           callback(new Error('身份证号格式错误'))
diff --git a/project/sass/apps/AppSpecialDrug/components/Detail.vue b/project/sass/apps/AppSpecialDrug/components/Detail.vue
index 3963ae98..152e147b 100644
--- a/project/sass/apps/AppSpecialDrug/components/Detail.vue
+++ b/project/sass/apps/AppSpecialDrug/components/Detail.vue
@@ -53,6 +53,8 @@
 </template>
 
 <script>
+  import {ID} from "dvcp-ui/lib/js/utils";
+
   export default {
     name: 'Detail',
 
@@ -68,14 +70,13 @@
         tabTitle: ['人员信息', '走访记录'],
         info: {},
         list: [],
-        idNumberInfo: {}
       }
     },
 
     created () {
       if (this.params && this.params.id) {
         this.id = this.params.id
-      
+
         this.dict.load('appSpecialSituation', 'appSpecialPlacement', 'appSpecialDenger', 'appSpecialCrime',
             'appSpecialControl', 'appSpecialDebug', 'appSpecialDrug', 'appSpecialChangeType', 'appSpecialCure', 'appSpecialDengerLevel',
             'appSpecialDisableLevel', 'appSpecialDisableType', 'appSpecialHealth', 'appSpecialMarriage', 'appSpecialTypeFive','isReflection','yesOrNo').then(() => {
@@ -86,13 +87,14 @@
         })
       }
     },
-
+    computed:{
+      idNumberInfo:v=>new ID(v.info.idNumber)
+    },
     methods: {
       getInfo (id) {
         this.instance.post(`/app/appspecialdrug/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
-            this.idNumberInfo = this.idCardNoUtil.getIdCardInfo(res.data.idNumber)
           }
         })
       },
diff --git a/project/sass/apps/AppSpecialMental/components/Add.vue b/project/sass/apps/AppSpecialMental/components/Add.vue
index af06e2f7..6499d273 100644
--- a/project/sass/apps/AppSpecialMental/components/Add.vue
+++ b/project/sass/apps/AppSpecialMental/components/Add.vue
@@ -113,6 +113,7 @@
 
 <script>
 import { mapState } from 'vuex'
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: 'Add',
@@ -150,7 +151,7 @@ export default {
 
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
-        if (this.idCardNoUtil.checkIdCardNo(value)) {
+        if (ID.check(value)) {
           callback();
         } else {
           callback(new Error('身份证号格式错误'))
diff --git a/project/sass/apps/AppSpecialMental/components/Detail.vue b/project/sass/apps/AppSpecialMental/components/Detail.vue
index 10b24d06..46fdcf67 100644
--- a/project/sass/apps/AppSpecialMental/components/Detail.vue
+++ b/project/sass/apps/AppSpecialMental/components/Detail.vue
@@ -52,6 +52,8 @@
 </template>
 
 <script>
+  import {ID} from "dvcp-ui/lib/js/utils";
+
   export default {
     name: 'Detail',
 
@@ -67,14 +69,13 @@
         tabTitle: ['人员信息', '走访记录'],
         info: {},
         list: [],
-        idNumberInfo: {}
       }
     },
 
     created () {
       if (this.params && this.params.id) {
         this.id = this.params.id
-      
+
         this.dict.load('appSpecialSituation', 'appSpecialPlacement', 'appSpecialDenger', 'appSpecialCrime',
             'appSpecialControl', 'appSpecialDebug', 'appSpecialDrug', 'appSpecialChangeType', 'appSpecialCure', 'appSpecialDengerLevel',
             'appSpecialDisableLevel', 'appSpecialDisableType', 'appSpecialHealth', 'appSpecialMarriage', 'appSpecialTypeFive','isReflection','yesOrNo').then(() => {
@@ -85,13 +86,14 @@
         })
       }
     },
-
+    computed:{
+      idNumberInfo:v=>new ID(v.info.idNumber)
+    },
     methods: {
       getInfo (id) {
         this.instance.post(`/app/appspecialmental/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
-            this.idNumberInfo = this.idCardNoUtil.getIdCardInfo(res.data.idNumber)
           }
         })
       },
diff --git a/project/sass/apps/AppSpecialPrison/components/Add.vue b/project/sass/apps/AppSpecialPrison/components/Add.vue
index 7a1ebd95..a373e15c 100644
--- a/project/sass/apps/AppSpecialPrison/components/Add.vue
+++ b/project/sass/apps/AppSpecialPrison/components/Add.vue
@@ -113,6 +113,7 @@
 
 <script>
 import { mapState } from 'vuex'
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: 'Add',
@@ -134,10 +135,10 @@ export default {
         }
       }
     }
-    
+
     let IdNumberPass = (rule, value, callback) => {
       if (value) {
-        if (this.idCardNoUtil.checkIdCardNo(value)) {
+        if (ID.check(value)) {
           callback();
         } else {
           callback(new Error('身份证号格式错误'))
diff --git a/project/sass/apps/AppSpecialPrison/components/Detail.vue b/project/sass/apps/AppSpecialPrison/components/Detail.vue
index a271301e..b36648ec 100644
--- a/project/sass/apps/AppSpecialPrison/components/Detail.vue
+++ b/project/sass/apps/AppSpecialPrison/components/Detail.vue
@@ -1,4 +1,4 @@
- <template>
+<template>
   <ai-detail class="AppSpecial" isHasSidebar>
     <template slot="title">
       <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(true)">
@@ -55,145 +55,147 @@
 </template>
 
 <script>
-  export default {
-    name: 'Detail',
+import {ID} from "dvcp-ui/lib/js/utils";
 
-    props: {
-      instance: Function,
-      dict: Object,
-      params: Object
+export default {
+  name: 'Detail',
+
+  props: {
+    instance: Function,
+    dict: Object,
+    params: Object
+  },
+  computed: {
+    idNumberInfo: v => new ID(v.info.idNumber)
+  },
+  data() {
+    return {
+      currIndex: 0,
+      tabTitle: ['人员信息', '走访记录'],
+      info: {},
+      list: [],
+    }
+  },
+
+  created() {
+    if (this.params && this.params.id) {
+      this.id = this.params.id
+
+      this.dict.load('appSpecialSituation', 'appSpecialPlacement', 'appSpecialDenger', 'appSpecialCrime',
+          'appSpecialControl', 'appSpecialDebug', 'appSpecialDrug', 'appSpecialChangeType', 'appSpecialCure', 'appSpecialDengerLevel',
+          'appSpecialDisableLevel', 'appSpecialDisableType', 'appSpecialHealth', 'appSpecialMarriage', 'appSpecialTypeFive', 'isReflection', 'yesOrNo').then(() => {
+        this.getInfo(this.params.id)
+      })
+      this.dict.load('visitCondolenceReality').then(() => {
+        this.getList()
+      })
+    }
+  },
+
+  methods: {
+    getInfo(id) {
+      this.instance.post(`/app/appspecialprison/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+        }
+      })
     },
 
-    data () {
-      return {
-        currIndex: 0,
-        tabTitle: ['人员信息', '走访记录'],
-        info: {},
-        list: [],
-        idNumberInfo: {}
-      }
+    getList() {
+      this.instance.post(`/app/appvisitvondolence/list`, null, {
+        params: {
+          applicationId: 4,
+          size: 1000
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.list = res.data.records
+        }
+      })
     },
 
-    created () {
-      if (this.params && this.params.id) {
-        this.id = this.params.id
-      
-        this.dict.load('appSpecialSituation', 'appSpecialPlacement', 'appSpecialDenger', 'appSpecialCrime',
-            'appSpecialControl', 'appSpecialDebug', 'appSpecialDrug', 'appSpecialChangeType', 'appSpecialCure', 'appSpecialDengerLevel',
-            'appSpecialDisableLevel', 'appSpecialDisableType', 'appSpecialHealth', 'appSpecialMarriage', 'appSpecialTypeFive','isReflection','yesOrNo').then(() => {
-          this.getInfo(this.params.id)
-        })
-        this.dict.load('visitCondolenceReality').then(() => {
-          this.getList()
-        })
-      }
-    },
-
-    methods: {
-      getInfo (id) {
-        this.instance.post(`/app/appspecialprison/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-            this.idNumberInfo = this.idCardNoUtil.getIdCardInfo(res.data.idNumber)
-          }
-        })
-      },
-
-      getList () {
-        this.instance.post(`/app/appvisitvondolence/list`, null, {
-          params: {
-            applicationId: 4,
-            size: 1000
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.list = res.data.records
-          }
-        })
-      },
-
-      cancel (isRefresh) {
-        this.$emit('change', {
-          type: 'List',
-          isRefresh: !!isRefresh
-        })
-      }
+    cancel(isRefresh) {
+      this.$emit('change', {
+        type: 'List',
+        isRefresh: !!isRefresh
+      })
     }
   }
+}
 </script>
 
 <style scoped lang="scss">
-  .AppSpecial {
-    .visit-list {
-      .visit-item {
-        padding: 10px 0;
-        border-bottom: 1px solid #eee;
+.AppSpecial {
+  .visit-list {
+    .visit-item {
+      padding: 10px 0;
+      border-bottom: 1px solid #eee;
 
-        &:first-child {
-          padding-top: 0;
+      &:first-child {
+        padding-top: 0;
+      }
+
+      &:last-child {
+        border-bottom: none;
+      }
+
+      .visit-status {
+        display: flex;
+        align-items: center;
+        font-size: 14px;
+
+        span {
+          color: #333;
         }
 
-        &:last-child {
-          border-bottom: none;
+        i {
+          color: #999;
+          font-style: normal;
         }
+      }
 
-        .visit-status {
-          display: flex;
-          align-items: center;
+      & > p {
+        line-height: 1.4;
+        margin-bottom: 4px;
+        text-align: justify;
+        color: #666;
+        font-size: 16px;
+      }
+
+      .visit-item__top {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 10px;
+
+        span {
           font-size: 14px;
-
-          span {
-            color: #333;
-          }
-
-          i {
-            color: #999;
-            font-style: normal;
-          }
+          color: #999;
         }
 
-        & > p {
-          line-height: 1.4;
-          margin-bottom: 4px;
-          text-align: justify;
-          color: #666;
-          font-size: 16px;
-        }
-
-        .visit-item__top {
+        .left {
           display: flex;
           align-items: center;
-          justify-content: space-between;
-          margin-bottom: 10px;
 
-          span {
+          img, .avatar {
+            width: 40px;
+            height: 40px;
+            line-height: 40px;
+            text-align: center;
+            margin-right: 10px;
+            border-radius: 50%;
             font-size: 14px;
-            color: #999;
+            color: #fff;
+            background: #26f;
           }
 
-          .left {
-            display: flex;
-            align-items: center;
-
-            img, .avatar {
-              width: 40px;
-              height: 40px;
-              line-height: 40px;
-              text-align: center;
-              margin-right: 10px;
-              border-radius: 50%;
-              font-size: 14px;
-              color: #fff;
-              background: #26f;
-            }
-
-            h2 {
-              font-size: 16px;
-              font-weight: 500;
-            }
+          h2 {
+            font-size: 16px;
+            font-weight: 500;
           }
         }
       }
     }
   }
+}
 </style>
diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
index 7639dcab..bef1ae24 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
@@ -58,6 +58,7 @@
 <script>
 import {mapState} from "vuex";
 import LoanSta from "./loanSta";
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: "loanList",
@@ -130,7 +131,7 @@ export default {
         ]
       } else {//金融产品
         ops = [
-          {label: "身份证号", render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber)), width: 160},
+          {label: "身份证号", render: (h, {row}) => h('p', ID.hideId(row.idNumber)), width: 160},
           {label: "贷款金额(万)", prop: "loanAmount"},
           {label: "贷款机构", prop: "organizationName"},
           {label: "机构类型", prop: "organizationType", dict: "financialOrganizationType"},
diff --git a/project/xiushan/apps/loanStatement/AppLoanSta.vue b/project/xiushan/apps/loanStatement/AppLoanSta.vue
index dfff4053..0b4792c1 100644
--- a/project/xiushan/apps/loanStatement/AppLoanSta.vue
+++ b/project/xiushan/apps/loanStatement/AppLoanSta.vue
@@ -34,6 +34,7 @@
 
 <script>
 import {mapState} from "vuex";
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: "AppLoanSta",
@@ -55,7 +56,7 @@ export default {
         {label: "产品名称", width: '200', prop: "productName"},
         {label: "联系人", width: '100', prop: "name"},
         {label: "联系方式", width: '140', prop: "phone"},
-        {label: "身份证号", render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber)), width: 160},
+        {label: "身份证号", render: (h, {row}) => h('p', ID.hideId(row.idNumber)), width: 160},
         {label: "企业主体", width: '200', prop: "enterpriseName"},
         {label: "贷款金额(万)", width: '120', prop: "loanAmount"},
         {label: "申请时间", prop: "createTime", width: 160},
diff --git a/project/xiushan/apps/processManagement/corporateSeal/sealDetail.vue b/project/xiushan/apps/processManagement/corporateSeal/sealDetail.vue
index 36d36da6..b6c19574 100644
--- a/project/xiushan/apps/processManagement/corporateSeal/sealDetail.vue
+++ b/project/xiushan/apps/processManagement/corporateSeal/sealDetail.vue
@@ -95,6 +95,8 @@
 </template>
 
 <script>
+import {ID} from "dvcp-ui/lib/js/utils";
+
 export default {
   name: "sealDetail",
   inject: ['seal'],
@@ -135,11 +137,11 @@ export default {
         ],
         legalIdNumber: [
           {required: true, message: "请填写法人身份证号码"},
-          {validator: (r, v, cb) => cb(this.idCardNoUtil.checkIdCardNo(v) ? undefined : "身份证号码格式有误")}
+          {validator: (r, v, cb) => cb(ID.check(v) ? undefined : "身份证号码格式有误")}
         ],
         agentIdNumber: [
           {required: true, message: "请填写代理人身份证号码"},
-          {validator: (r, v, cb) => cb(this.idCardNoUtil.checkIdCardNo(v) ? undefined : "身份证号码格式有误")}
+          {validator: (r, v, cb) => cb(ID.check(v) ? undefined : "身份证号码格式有误")}
         ],
       }
     }
diff --git a/project/xiushan/apps/processManagement/personalSignature/AppPersonalSignature.vue b/project/xiushan/apps/processManagement/personalSignature/AppPersonalSignature.vue
index 26532308..b6a7dfaf 100644
--- a/project/xiushan/apps/processManagement/personalSignature/AppPersonalSignature.vue
+++ b/project/xiushan/apps/processManagement/personalSignature/AppPersonalSignature.vue
@@ -57,6 +57,7 @@
 <script>
 import {mapState} from "vuex";
 import DrawInPhone from "./drawInPhone";
+import {ID} from "dvcp-ui/lib/js/utils";
 
 export default {
   name: "AppPersonalSignature",
@@ -95,7 +96,7 @@ export default {
         ],
         idNumber: [
           {required: true, message: "请填写身份证号码"},
-          {validator: (r, v, cb) => cb(this.idCardNoUtil.checkIdCardNo(v) ? undefined : "身份证号码格式有误")}
+          {validator: (r, v, cb) => cb(ID.check(v) ? undefined : "身份证号码格式有误")}
         ],
       }
     }