Merge branch 'dev_xzeq_xz' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq_xz

src/components/form.vue

@@ -2122,6 +2122,30 @@ export default {
       }
       this.$emit("insertMessage", boo);
     },
+       "formLabelAlign.cyzjCyzjdm"(val) {
+      if (val == 111 && this.pageBs == "addsqfbzl") {
+        debugger
+        let obj = {
+          validator: (rule, value, callback) => {
+            // let patter = new RegExp("/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/");//验证是否身份证号
+            let patter = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/; //验证是否手机号
+            if (!patter.test(value)) {
+              return callback(new Error("请输入正确格式的证件号码！"));
+            } else {
+              callback(); //必须有此项回调，否则验证会一直不通过
+            }
+          },
+          trigger: "blur",
+          required: true,
+          message: "请输入正确格式的证件号码",
+        };
+        this.$set(this.rules, this.propFormField[0].data[5].id, obj);
+      } else if (val != 111 && this.pageBs == "addsqfbzl") {
+        // this.$set(this.rules,this.propFormField[0].data[3].id,null)
+        this.$delete(this.rules, this.propFormField[0].data[5].id);
+        debugger;
+      }
+    },
   },
   computed: {},
 };

src/views/jcyjzxt/hmd/add.vue

@@ -5,7 +5,7 @@
                 :formLabelAligns="formLabelAlign"
                 @submit="submit"
                 :propTitle="title"
-                pageBs="addsqfbzl"
+                :pageBs="pageBs"
                 ref="formCompontent"
         >
         </form-compontent>
@@ -22,6 +22,7 @@
     data() {
       return {
         title: "新增黑名单",
+        pageBs: 'addsqfbzl',
         propFormField: [
           //基本信息
           {
@@ -80,7 +81,7 @@
                 value: "",
                 placeholder: "请输入",
                 col: "2",
-                prop: "",
+                prop: "checkEmpty",
               },
               {
                 name: "出生日期估值下限:",
@@ -280,5 +281,11 @@
         this.getshuju();
       }
     },
+    // watch: {
+    //   'formLabelAlign.cyzjCyzjdm': {
+        
+    //   },
+    //   deep: true,
+    // }
   };
 </script>

src/views/userAuth/menu/addMenu.vue

@@ -109,6 +109,9 @@ export default {
       }
     },
     addSubmit(params, loading) {
+      if (!this.formLabelAlign.parentId) {
+        params.append("parentId", "0");
+      }
       submit(params).then((res) => {
         if (res.success && res.code == 200) {
           this.$alert("保存成功!", "提示", {
@@ -125,6 +128,9 @@ export default {
       });
     },
     editSubmit(params, loading) {
+      if (!this.formLabelAlign.parentId) {
+        params.append("parentId", "0");
+      }
       params.append("id", this.xxzjbh);
       submit(params).then((res) => {
         if (res.success && res.code == 200) {
@@ -164,7 +170,7 @@ export default {
       });
     },
     getTree() {
-      let self = this
+      let self = this;
       tree().then((res) => {
         if (res.success) {
           res.data.forEach((item) => {
@@ -174,11 +180,7 @@ export default {
             }
           });
           console.log(res.data);
-          self.$set(
-            self.propFormField[0].data[2],
-            "codeOptions",
-            res.data
-          );
+          self.$set(self.propFormField[0].data[2], "codeOptions", res.data);
         }
       });
     },
@@ -197,7 +199,7 @@ export default {
   },
   created() {
     this.$store.commit("user/SET_Breadcrumb", this.breadcrumbList);
-    this.getTree()
+    this.getTree();
     if (this.$route.query.xxzjbh) {
       this.Loading = this.$loading({
         lock: true,

src/views/ztyp/queryXsyp.vue

@@ -29,7 +29,7 @@ export default {
           selectData: [
             { value: "0", name: "车牌号" },
             { value: "1", name: "身份证号" },
-            { value: "2", name: "人像" },
+            // { value: "2", name: "人像" },
             { value: "3", name: "手机号码" },
           ],
           col: "3",
@@ -40,11 +40,8 @@ export default {
           type: "text",
           placeholder: "请输入",
           col: "3",
-          rules: [
-            { required: true, message: "请输入", trigger: "blur" },
-          ],
+          rules: [],
         },
-       
       ],
       form: {
         asjbh: "",
@@ -80,5 +77,66 @@ export default {
   created() {
     this.$store.commit("user/SET_Menu", this.Menu);
   },
+  watch: {
+    "form.lx": {
+      handler(newW, oldw) {
+        debugger;
+        if (newW == "0") {
+          this.formProp[1].rules = [];
+          let obj = {
+            validator: (rule, value, callback) => {
+              // let patter = new RegExp("/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/");//验证是否身份证号
+              let patter =
+                /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/; //验证是否是车牌号
+              if (!patter.test(value)) {
+                return callback(new Error("请输入正确的车牌号"));
+              } else {
+                callback(); //必须有此项回调，否则验证会一直不通过
+              }
+            },
+            trigger: "blur",
+            required: true,
+            message: "请输入正确的车牌号",
+          };
+          this.formProp[1].rules.push(obj);
+        } else if (newW == "1") {
+          this.formProp[1].rules = [];
+          let obj = {
+            validator: (rule, value, callback) => {
+              // let patter = new RegExp("/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/");//验证是否身份证号
+              let patter = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+              if (!patter.test(value)) {
+                return callback(new Error("请输入正确的身份证号"));
+              } else {
+                callback(); //必须有此项回调，否则验证会一直不通过
+              }
+            },
+            trigger: "blur",
+            required: true,
+            message: "请输入正确的身份证号",
+          };
+          this.formProp[1].rules.push(obj);
+        } else if (newW == "3") {
+          this.formProp[1].rules = [];
+          let obj = {
+            validator: (rule, value, callback) => {
+              // let patter = new RegExp("/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/");//验证是否身份证号
+              let patter = /^1[345789]\d{9}$/; //验证是否手机号
+              if (!patter.test(value)) {
+                return callback(new Error("请输入正确的手机号"));
+              } else {
+                callback(); //必须有此项回调，否则验证会一直不通过
+              }
+            },
+            trigger: "blur",
+            required: true,
+            message: "请输入正确的手机号",
+          };
+          this.formProp[1].rules.push(obj);
+        }
+      },
+    },
+    deep: true,
+  },
 };
 </script>