Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/views/AllPersonnelBase/AllPersonnelBase.vue

@@ -1223,6 +1223,7 @@ export default {
     justify-content: space-between;
     align-items: center;
     .btn {
+      font-size: 14px;
       height: 32px;
       padding: 8px 20px;
       border-radius: 4px;

src/views/AllPersonnelBase/dclb.vue

@@ -779,7 +779,7 @@ export default {
     }
   },
   computed: {
-    roleArr() {
+    roleArr () {
       return this.$store.state.layout.Menu;
     },
     /**
@@ -958,6 +958,7 @@ export default {
     justify-content: space-between;
     align-items: center;
     .btn {
+      font-size: 14px;
       height: 32px;
       padding: 8px 20px;
       border-radius: 4px;

src/views/AllPersonnelBase/gzlb.vue

@@ -1197,7 +1197,7 @@ export default {
     }
   },
   computed: {
-    roleArr() {
+    roleArr () {
       return this.$store.state.layout.Menu;
     },
     /**
@@ -1382,6 +1382,7 @@ export default {
     justify-content: space-between;
     align-items: center;
     .btn {
+      font-size: 14px;
       height: 32px;
       padding: 8px 20px;
       border-radius: 4px;

src/views/AllPersonnelBase/modules/xzaj.vue

@@ -347,6 +347,7 @@ export default {
       },
       rules: {
         ysxtAsjbh: [
+          { min: 22, max: 22, message: '编号长度有误！', trigger: 'change' },
           { required: true, message: "请输入案事件编号", trigger: "blur" },
         ],
         xckybh: [
@@ -377,6 +378,11 @@ export default {
         ],
         tqryGmsfhm: [
           { required: true, message: "请输入提取人身份证号", trigger: "blur" },
+          {
+            pattern: /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/,
+            message: '证件号码格式有误！',
+            trigger: 'blur'
+          }
         ],
       },
     };

src/views/AllPersonnelBase/modules/xzry.vue

@@ -476,6 +476,7 @@ export default {
       logicList: [],// 逻辑库代码
       rules: {
         ysxtAsjxgrybh: [
+          { min: 22, max: 22, message: '编号长度有误！', trigger: 'change' },
           { required: true, message: "请输入人员条码号", trigger: "blur" },
         ],
         jzrybh: [
@@ -535,6 +536,11 @@ export default {
         ],
         nyryGmsfhm: [
           { required: true, message: "请输入捺印人身份证号", trigger: "blur" },
+          {
+            pattern: /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/,
+            message: '证件号码格式有误！',
+            trigger: 'blur'
+          }
         ],
         nyryLxdh: [
           { required: true, message: "请输入捺印人联系电话", trigger: "blur" },

src/views/AllPersonnelBase/qbalk.vue

@@ -878,7 +878,7 @@ export default {
     }
   },
   computed: {
-    roleArr() {
+    roleArr () {
       return this.$store.state.layout.Menu;
     },
     /**
@@ -1092,6 +1092,7 @@ const datas1 = [
     justify-content: space-between;
     align-items: center;
     .btn {
+      font-size: 14px;
       height: 32px;
       padding: 8px 20px;
       border-radius: 4px;

src/views/drFPTX/RAList.vue

@@ -1754,6 +1754,7 @@ export default {
     justify-content: space-between;
     align-items: center;
     .btn {
+      font-size: 14px;
       height: 32px;
       padding: 8px 20px;
       border-radius: 4px;