From f1f15a05b85b77712f9e3c4ff9042f1f7e24bdb1 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 21 Oct 2021 16:24:42 +0800
Subject: [PATCH] +

---
 src/views/securityEquipment/equipments.js |   17 ++++++++++++++++-
 src/views/securityUnitChild/index.vue     |   11 +++++++----
 src/views/securityUnitChild/data.js       |   26 ++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/views/securityEquipment/equipments.js b/src/views/securityEquipment/equipments.js
index 7933891..54debc3 100644
--- a/src/views/securityEquipment/equipments.js
+++ b/src/views/securityEquipment/equipments.js
@@ -6,6 +6,16 @@
     value: 2,
 }]
 
+
+const validatePassNumber = (rule, value, callback) => {
+    var test = /^[0-9]*$/gm;
+    if (!test.test(value)) {
+        callback(new Error("请输入数字"));
+    } else {
+        callback();
+    }
+};
+
 export var column = [{
     label: "id",
     prop: "id",
@@ -42,7 +52,12 @@
         required: true,
         message: "请输入数量",
         trigger: "blur"
-    }],
+    }, {
+        required: true,
+        validator: validatePassNumber,
+        trigger: "blur",
+    },
+    ],
     // search: true,
     width: 70,
 },
diff --git a/src/views/securityUnitChild/data.js b/src/views/securityUnitChild/data.js
index c511a74..78f2ee9 100644
--- a/src/views/securityUnitChild/data.js
+++ b/src/views/securityUnitChild/data.js
@@ -7,6 +7,17 @@
 }]
 var w = 160,
     s = 12;
+
+const validatePassNumber = (rule, value, callback) => {
+    var test = /^[0-9]*$/gm;
+    if (!test.test(value)) {
+        callback(new Error("请输入数字"));
+    } else {
+        callback();
+    }
+};
+
+
 export var column = [{
     label: "",
     labelWidth: 20,
@@ -389,6 +400,13 @@
     prop: "shareholdingratio",
     labelWidth: w,
     span: s,
+    rules: [
+        {
+            required: true,
+            validator: validatePassNumber,
+            trigger: "blur",
+        },
+    ],
 },
 //  {
 //     label: "最终受益股份",
@@ -399,6 +417,14 @@
     prop: "capital",
     labelWidth: w,
     span: s,
+    rules: [
+        {
+            required: true,
+            validator: validatePassNumber,
+            trigger: "blur",
+        },
+    ],
+
 }, {
     label: "出资时间",
     prop: "capitaltime",
diff --git a/src/views/securityUnitChild/index.vue b/src/views/securityUnitChild/index.vue
index 160c21d..af44146 100644
--- a/src/views/securityUnitChild/index.vue
+++ b/src/views/securityUnitChild/index.vue
@@ -678,7 +678,7 @@
       //   var form = this.data[0];
       //   delete form.id;
       //   for (var k = 0; k < 13; k++) {
-      form["creditcode"] = this.creditcode;
+      form["deptId"] = this.departmentid;
       adddata1(form).then(
         () => {
           this.onLoad1(this.page1);
@@ -708,7 +708,9 @@
     rowUpdate1(row, index, done, loading) {
       delete row.shareholdingratio;
       delete row.tenantId;
+
       console.log(row);
+      row["deptId"] = this.departmentid;
       update1(row).then(
         () => {
           this.onLoad1(this.page1);
@@ -774,7 +776,7 @@
     onLoad1(page, params = {}) {
       this.loading1 = true;
       console.log(page, params, 3435434);
-      params["creditcode"] = this.creditcode;
+      params["deptId"] = this.departmentid;
       getdataOnce1(
         page.currentPage,
         page.pageSize,
@@ -824,7 +826,7 @@
       //   var form = this.data[0];
       //   delete form.id;
       //   for (var k = 0; k < 13; k++) {
-      form["creditcode"] = this.creditcode;
+      form["deptId"] = this.departmentid;
       adddata2(form).then(
         () => {
           this.onLoad2(this.page1);
@@ -854,6 +856,7 @@
     rowUpdate2(row, index, done, loading) {
       console.log(row);
       delete row.shareholdingratio;
+      row["deptId"] = this.departmentid;
       update2(row).then(
         () => {
           this.onLoad2(this.page2);
@@ -920,7 +923,7 @@
       this.loading2 = true;
       // console.log(page);
       // getdata2(
-      params["creditcode"] = this.creditcode;
+      params["deptId"] = this.departmentid;
       getdataOnce2(
         page.currentPage,
         page.pageSize,

--
Gitblit v1.9.3