From 0b79f12774e4deef6d8b60a7f9176cad689f2a47 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 30 Aug 2021 15:29:45 +0800
Subject: [PATCH] 数据验证  加去掉无用变量

---
 src/views/home/index.vue               |    2 
 src/store/modules/dict.js              |   28 ++++----
 src/views/home/column.js               |   68 ++++++++++++++++------
 src/store/getters.js                   |    4 
 src/components/cardPopup/cardPopup.vue |   41 ++++++++++++-
 5 files changed, 104 insertions(+), 39 deletions(-)

diff --git a/src/components/cardPopup/cardPopup.vue b/src/components/cardPopup/cardPopup.vue
index 3747594..c6f3647 100644
--- a/src/components/cardPopup/cardPopup.vue
+++ b/src/components/cardPopup/cardPopup.vue
@@ -126,7 +126,7 @@
     };
   },
   computed: {
-    ...mapGetters(["userInfo", "useWhere", "canDoIt", "yanzhen"]),
+    ...mapGetters(["userInfo", "useWhere"]),
   },
   watch: {
     useWhere() {
@@ -202,10 +202,10 @@
                   if (item.ptype == val) {
                     if (item.type == 0 || item.type == 2) {
                       this.changeBut(false, d);
-                      console.log(item, "有数据未审核或者审核不通过");
+                      console.log(item, "有数据未审核或者审核通过");
                     } else {
                       this.changeBut(true, d);
-                      console.log(item, "审核通过");
+                      console.log(item, "审核不通过");
                     }
                   }
                 });
@@ -227,9 +227,11 @@
       var caridid = this.$store.getters.userInfo.Id;
       selectIn(this.apiName[2], caridid, this.type).then((res) => {
         var d = res.data.data;
+        // console.log(d, "d");
         for (var k in d) {
           this.obj0[k.toLowerCase()] = d[k];
         }
+        // console.log(this.obj0, "obj0");
       });
     },
     tip0() {
@@ -287,6 +289,39 @@
       // }
       // console.log(this.tipover(1, this.data0));
       // return;
+
+      //验证数据
+      var commin = true;
+      var a = this.data0;
+      for (var k in a) {
+        if (k == "representativecell" || k == "contactscell") {
+          //电话验证
+          if (!yanzhengphons.test(a[k])) {
+            commin = false;
+            break;
+          }
+        } else if (k == "creditcode" || k == "registeredcapital") {
+          //数字验证
+          if (!yanzhengnumbers.test(a[k])) {
+            commin = false;
+            break;
+          }
+        } else {
+          //空值验证
+          if (a[k] == "") {
+            commin = false;
+            break;
+          }
+        }
+      }
+      if (!commin) {
+        this.$message({
+          message: "请检查输入数据是否正确!",
+          type: "warning",
+        });
+        return;
+      }
+
       add(this.apiName[0], this.data0).then(() => {
         this.qx();
         this.$message({
diff --git a/src/store/getters.js b/src/store/getters.js
index 762feae..b3b2609 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -28,7 +28,7 @@
   ApprovalShow: state => state.dict.ApprovalShow,
   useWhere: state => state.dict.useWhere,
   handle: state => state.dict.handle,
-  canDoIt: state => state.dict.canDoIt,
-  yanzhen: state => state.dict.yanzhen,
+  // canDoIt: state => state.dict.canDoIt,
+  // yanzhen: state => state.dict.yanzhen,
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index cf1a72a..10eeb34 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -8,7 +8,7 @@
     ApprovalShow: false,
     useWhere: 'close',
     handle: true,
-    canDoIt: [],
+    // canDoIt: [],
     // yanzhen: true,
   },
   actions: {
@@ -42,19 +42,19 @@
     changehandle: (state, data) => {
       state.handle = data
     },
-    setcanDoIt: (state, data) => {
-      state.canDoIt = data;
-      console.log(state.canDoIt, 'state.canDoIt')
-    },
-    changecanDoIt: (state, data) => {
-      // console.log(data)
-      for (var k in state.canDoIt) {
-        if (state.canDoIt[k].type == data.ptype) {
-          state.canDoIt[k].opens = data.o;
-          // state.canDoIt[k].opens = true;
-        }
-      }
-    },
+    // setcanDoIt: (state, data) => {
+    //   state.canDoIt = data;
+    //   console.log(state.canDoIt, 'state.canDoIt')
+    // },
+    // changecanDoIt: (state, data) => {
+    //   // console.log(data)
+    //   for (var k in state.canDoIt) {
+    //     if (state.canDoIt[k].type == data.ptype) {
+    //       state.canDoIt[k].opens = data.o;
+    //       // state.canDoIt[k].opens = true;
+    //     }
+    //   }
+    // },
     // changeyanzhen: (state, data) => {
     //   state.yanzhen = data
     // },
diff --git a/src/views/home/column.js b/src/views/home/column.js
index 30d8726..a0054cf 100644
--- a/src/views/home/column.js
+++ b/src/views/home/column.js
@@ -1,17 +1,23 @@
 // import store from "@/store/index";
 
 
-// var validatePass = (rule, value, callback) => {
-//     var reg = /^[0-9]+.?[0-9]*$/;
-//     if (!reg.test(value)) {
-//         store.commit('changeyanzhen', false);
-//         callback(new Error('请输入数字'));
-//     } else {
-//         store.commit('changeyanzhen', true);
-//         callback();
-//     }
-// };
+var numbers = (rule, value, callback) => {
+    window.yanzhengnumbers = /^[0-9]+.?[0-9]*$/;
+    if (!yanzhengnumbers.test(value)) {
+        callback(new Error('请输入数字'));
+    } else {
+        callback();
+    }
+};
 
+var phones = (rule, value, callback) => {
+    window.yanzhengphons = /^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/;
+    if (!yanzhengphons.test(value)) {
+        callback(new Error('请输入正确电话'));
+    } else {
+        callback();
+    }
+};
 
 var column = [
     {
@@ -38,9 +44,9 @@
                 message: "请输入社会信用代码",
                 trigger: "blur",
             },
-            // {
-            //     validator: validatePass, trigger: 'change'
-            // },
+            {
+                validator: numbers, trigger: ['change', 'blur']
+            },
         ],
     },
 
@@ -81,9 +87,9 @@
                 message: "法定代表人电话",
                 trigger: "blur",
             },
-            // {
-            //     validator: validatePass, trigger: 'change'
-            // },
+            {
+                validator: phones, trigger: ['change', 'blur']
+            },
         ],
     },
     {
@@ -110,9 +116,9 @@
                 message: "联系人电话",
                 trigger: "blur",
             },
-            // {
-            //     validator: validatePass, trigger: 'change'
-            // },
+            {
+                validator: phones, trigger: ['change', 'blur']
+            },
         ],
     },
     {
@@ -147,6 +153,13 @@
         type: "date",
         format: "yyyy-MM-dd",
         valueFormat: "yyyy-MM-dd",
+        rules: [
+            {
+                required: true,
+                message: "请输入发证时间",
+                trigger: "blur",
+            },
+        ],
     },
     {
         label: "注册时间",
@@ -156,6 +169,13 @@
         type: "date",
         format: "yyyy-MM-dd",
         valueFormat: "yyyy-MM-dd",
+        rules: [
+            {
+                required: true,
+                message: "请输入注册时间",
+                trigger: "blur",
+            },
+        ],
     },
     {
         label: "注册资本(万元人民币)",
@@ -168,6 +188,9 @@
                 message: "请输入注册资本",
                 trigger: "blur",
             },
+            {
+                validator: numbers, trigger: ['change', 'blur']
+            }
         ],
     },
     {
@@ -234,6 +257,13 @@
         },
         labelWidth: 160,
         span: 12,
+        rules: [
+            {
+                required: true,
+                message: "请输入发证时间",
+                trigger: "blur",
+            },
+        ],
     },
     {
         label: "登记机关",
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 59e060e..d0af6ec 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -74,7 +74,7 @@
     };
   },
   computed: {
-    ...mapGetters(["userInfo", "ApprovalShow", "useWhere", "canDoIt"]),
+    ...mapGetters(["userInfo", "ApprovalShow", "useWhere"]),
   },
   created() {
     this.cc();

--
Gitblit v1.9.3