Merge branch 'dev_ljj_idcard'

3 years ago · 0fc44f686c
12 changed files with 60 additions and 60 deletions
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@ -33,9 +33,9 @@ export function isURL(s) {
 }

 /**
- * 身份证
+ * 身份证或证件号
 * @param {*} s
 */
 export function isCard(s) {
-  return /^(\d{15}$)|(^\d{17}([0-9]|X)$)/.test(s);
+  return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/.test(s);
 }
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@ -170,7 +170,7 @@
        </el-form-item>

        <el-form-item
-          label="身份证号"
+          label="证件号"
          prop="idCard"
          label-width="150px"
          style="display: block"
@ -178,7 +178,7 @@
          <el-input
            class="item_width_1"
            maxlength="30"
-            placeholder="请输入身份证号"
+            placeholder="请输入身份证号或护照号"
            v-model="fmData.idCard"
            @blur="handleBlurId"
            :disabled="formType === 'edit'"
@ -444,10 +444,10 @@ export default {
    dataRule() {
      let checkIdCard = (rule, value, callback) => {
        if (value === "") {
-          callback(new Error("请输入身份证"));
+          callback(new Error("请输入证件号"));
        } else {
          if (!isCard(value)) {
-            callback(new Error("身份证号格式不正确"));
+            callback(new Error("证件号格式不正确"));
          }
          callback();
        }
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@ -131,13 +131,13 @@
            </el-input>
          </el-form-item>

-          <el-form-item label="身份证号" prop="idCard">
+          <el-form-item label="证件号" prop="idCard">
            <el-input
              v-model="fmData.idCard"
              class="resi-cell-input"
              size="small"
              clearable
-              placeholder="请输入"
+              placeholder="请输入身份证号或证件号"
            >
            </el-input>
          </el-form-item>
@ -282,7 +282,7 @@
        <el-table-column
          prop="idCard"
          align="center"
-          label="身份证号"
+          label="证件号"
          :show-overflow-tooltip="true"
        >
        </el-table-column>
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@ -183,14 +183,14 @@
        </el-form-item>

        <el-form-item
-          label="身份证号"
+          label="证件号"
          prop="idCard"
          label-width="150px"
          style="display: block"
        >
          <el-input
            class="item_width_1"
-            placeholder="请输入身份证号"
+            placeholder="请输入身份证号或护照号"
            v-model="fmData.idCard"
            :disabled="formType === 'edit'"
            @blur="handleBlurId"
@ -439,10 +439,10 @@ export default {
    dataRule() {
      let checkIdCard = (rule, value, callback) => {
        if (value === '') {
-          callback(new Error('请输入身份证'))
+          callback(new Error('请输入证件号'))
        } else {
          if (!isCard(value)) {
-            callback(new Error('身份证号格式不正确'))
+            callback(new Error('证件号格式不正确'))
          }
          callback()
        }
@ -457,7 +457,7 @@ export default {
        ],
        name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
        idCard: [
-          { required: true, message: '身份证号不能为空', trigger: 'blur' },
+          { required: true, message: '证件号不能为空', trigger: 'blur' },
          { required: true, validator: checkIdCard, trigger: 'blur' }
        ],
        inTime: [
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@ -134,7 +134,7 @@
            </el-input>
          </el-form-item>

-          <el-form-item label="身份证号" prop="idCard">
+          <el-form-item label="证件号" prop="idCard">
            <el-input
              v-model="fmData.idCard"
              class="resi-cell-input"
@ -291,7 +291,7 @@
          prop="idCard"
          align="center"
          min-width="160"
-          label="身份证号"
+          label="证件号"
        >
        </el-table-column>

--- a/src/views/modules/plugins/change/changedeath-add-or-update.vue
+++ b/src/views/modules/plugins/change/changedeath-add-or-update.vue
@ -7,8 +7,8 @@
          <el-form-item label="姓名" prop="name">
          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
      </el-form-item>
-          <el-form-item label="身份证" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
+          <el-form-item label="证件号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="身份证号或护照号"></el-input>
      </el-form-item>
          <el-form-item label="手机号" prop="mobile">
          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@ -12,13 +12,13 @@
                    placeholder="请输入姓名">
          </el-input>
        </el-form-item>
-        <el-form-item label="身份证"
+        <el-form-item label="证件号"
                      prop="idCard">
          <el-input v-model="dataForm.idCard"
                    size="small"
                    class="list_item_width_1"
                    clearable
-                    placeholder="请输入身份证">
+                    placeholder="请输入身份证号或护照号">
          </el-input>
        </el-form-item>
        <el-form-item label="手机"
@ -82,7 +82,7 @@
            <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">{{scope.row.name}}</el-button>
          </template>
        </el-table-column>
-        <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
        <el-table-column prop="gender" label="性别" header-align="center" align="center">
          <template slot-scope="scope">
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@ -109,13 +109,13 @@
                    placeholder="请输入姓名">
          </el-input>
        </el-form-item>
-        <el-form-item label="身份证"
+        <el-form-item label="证件号"
                      prop="idCard">
          <el-input v-model="dataForm.idCard"
                    size="small"
                    class="list_item_width_1"
                    clearable
-                    placeholder="请输入身份证">
+                    placeholder="请输入身份证号或护照号">
          </el-input>
        </el-form-item>
        <el-form-item label="手机"
@ -181,7 +181,7 @@
        <el-table-column prop="oldAddress" label="所属房屋" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
        <el-table-column prop="ownerName" label="户主姓名" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
        <el-table-column prop="mobile" label="手机号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="idCard" label="身份证号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
        <el-table-column prop="gender" label="性别" header-align="center" align="center" min-width="70" show-overflow-tooltip>
          <template slot-scope="scope">
            {{
--- a/src/views/modules/plugins/change/changewelfare-add-or-update.vue
+++ b/src/views/modules/plugins/change/changewelfare-add-or-update.vue
@ -10,8 +10,8 @@
          <el-form-item label="姓名" prop="name">
          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
      </el-form-item>
-          <el-form-item label="身份证" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
+          <el-form-item label="护照号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="身份证号或护照号"></el-input>
      </el-form-item>
          <el-form-item label="手机号" prop="mobile">
          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@ -12,13 +12,13 @@
                    placeholder="请输入姓名">
          </el-input>
        </el-form-item>
-        <el-form-item label="身份证"
+        <el-form-item label="护照号"
                      prop="idCard">
          <el-input v-model="dataForm.idCard"
                    size="small"
                    class="list_item_width_1"
                    clearable
-                    placeholder="请输入身份证">
+                    placeholder="请输入身份证号或护照号">
          </el-input>
        </el-form-item>
        <el-form-item label="手机"
@ -76,7 +76,7 @@
            <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">{{scope.row.name}}</el-button>
          </template>
        </el-table-column>
-        <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
        <el-table-column prop="gender" label="性别" header-align="center" align="center">
          <template slot-scope="scope">
--- a/src/views/modules/plugins/change/verify.vue
+++ b/src/views/modules/plugins/change/verify.vue
@ -134,7 +134,7 @@
            </el-input>
          </el-form-item>

-          <el-form-item label="身份证号" prop="idCard">
+          <el-form-item label="证件号" prop="idCard">
            <el-input
              v-model="fmData.idCard"
              class="resi-cell-input"
@ -236,7 +236,7 @@
          prop="idCard"
          align="center"
          width="180"
-          label="身份证号"
+          label="证件号"
        >
        </el-table-column>

--- a/src/views/modules/plugins/change/verifyForm.vue
+++ b/src/views/modules/plugins/change/verifyForm.vue
@ -15,7 +15,7 @@
          <span>{{ detailInfo.mobile }}</span>
        </el-form-item>
        <el-form-item
-          label="身份证号:"
+          label="证件号:"
          label-width="150px"
        >
          <span>{{ detailInfo.idCard }}</span>