From 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Nov 2021 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/securityUnitChild/data.js |  332 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 278 insertions(+), 54 deletions(-)

diff --git a/src/views/securityUnitChild/data.js b/src/views/securityUnitChild/data.js
index 3c8388c..bd16da3 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,
@@ -24,25 +35,35 @@
         labelWidth: 130,
         disabled: true,
     },
-    {
-        label: "统一社会信用代码",
-        prop: "creditcode",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
+    // {
+    //     label: "统一社会信用代码",
+    //     prop: "creditcode",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
     {
         label: "法定代表人",
         prop: "representative",
         span: 11,
         labelWidth: 130,
         disabled: true,
+        rules: [{
+            required: true,
+            message: "请输入法定代表人",
+            trigger: "blur",
+        }, ],
     }, {
         label: "法定代表人电话",
         prop: "representativecell",
         span: 11,
         labelWidth: 130,
         disabled: true,
+        rules: [{
+            required: true,
+            message: "请输入法定代表人电话",
+            trigger: "blur",
+        }, ],
     },
     {
         label: "联系人",
@@ -57,48 +78,48 @@
         labelWidth: 130,
         disabled: true,
     },
-    {
-        label: "注册时间",
-        prop: "establishtime",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "注册资本",
-        prop: "registeredcapital",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "实缴资本",
-        prop: "capital",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "组织机构代码",
-        prop: "organizationcode",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "工商注册号",
-        prop: "registrationnumber",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "纳税人识别号",
-        prop: "identificationnumber",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
+    // {
+    //     label: "注册时间",
+    //     prop: "establishtime",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    // {
+    //     label: "注册资本",
+    //     prop: "registeredcapital",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    // {
+    //     label: "实缴资本",
+    //     prop: "capital",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    // {
+    //     label: "组织机构代码",
+    //     prop: "organizationcode",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    // {
+    //     label: "工商注册号",
+    //     prop: "registrationnumber",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    // {
+    //     label: "纳税人识别号",
+    //     prop: "identificationnumber",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
     {
         label: "企业类型",
         prop: "stats",
@@ -131,10 +152,12 @@
     // },
     {
         label: "所属辖区",
-        prop: "region",
+        prop: "jurisdiction",
         // multiple: true,
+        //父节点不能选
+        parent: false,
         type: "tree",
-        dicUrl: "/api/jurisdiction/lazy-tree",
+        dicUrl: "/api//jurisdiction/lazy-trees",
         props: {
             label: "title",
             value: "id",
@@ -177,7 +200,197 @@
         disabled: true,
     }
 ]
-
+export var column11 = [{
+        label: "",
+        labelWidth: 20,
+        type: 'title',
+        prop: "title",
+        span: 24,
+        styles: {
+            fontSize: '24px'
+        }
+    },
+    // {
+    //     label: "企业名称",
+    //     prop: "enterprisename",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    {
+        label: "统一社会信用代码",
+        prop: "creditcode",
+        span: 11,
+        labelWidth: 130,
+        disabled: true,
+    },
+    // {
+    //     label: "法定代表人",
+    //     prop: "representative",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    // {
+    //     label: "法定代表人电话",
+    //     prop: "representativecell",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    // {
+    //     label: "联系人",
+    //     prop: "contacts",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // }, {
+    //     label: "联系电话",
+    //     prop: "contactscell",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    {
+        label: "注册时间",
+        prop: "establishtime",
+        span: 11,
+        labelWidth: 130,
+        disabled: true,
+        type: "date",
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
+        // // 表单新增时是否禁止
+        // addDisabled: false,
+        // // 表单新增时是否可见
+        // addDisplay: true,
+        // // 表单新增时是否为查看模式
+        // addDetail: false,
+        // // 表单编辑时是否禁止
+        // editDisabled: false,
+        // // 表单编辑时是否可见
+        // editDisplay: true,
+        // // 表单编辑时是否为查看模式
+        // editDetail: false,
+        rules: [{
+            required: true,
+            message: "请选择注册时间",
+            trigger: "blur",
+        }, ],
+    },
+    {
+        label: "注册资本",
+        prop: "registeredcapital",
+        span: 11,
+        labelWidth: 130,
+        disabled: true,
+    },
+    // {
+    //     label: "实缴资本",
+    //     prop: "capital",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    {
+        label: "组织机构代码",
+        prop: "organizationcode",
+        span: 11,
+        labelWidth: 130,
+        disabled: true,
+    },
+    {
+        label: "工商注册号",
+        prop: "registrationnumber",
+        span: 11,
+        labelWidth: 130,
+        disabled: true,
+    },
+    {
+        label: "纳税人识别号",
+        prop: "identificationnumber",
+        span: 11,
+        labelWidth: 130,
+        disabled: true,
+    },
+    // {
+    //     label: "企业类型",
+    //     prop: "stats",
+    //     type: "tree",
+    //     dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+    //     props: {
+    //         label: "dictValue",
+    //         value: "dictKey"
+    //     },
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    // {
+    //     label: "注册地址",
+    //     prop: "address",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    //     // search: true,
+    // },
+    // {
+    //     label: "所属辖区",
+    //     prop: "region",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     width: 110,
+    //     overHidden: true,
+    //     disabled: true,
+    // },
+    // {
+    //     label: "所属辖区",
+    //     prop: "region",
+    //     // multiple: true,
+    //     type: "tree",
+    //     dicUrl: "/api/jurisdiction/lazy-tree",
+    //     props: {
+    //         label: "title",
+    //         value: "id",
+    //     },
+    //     span: 11,
+    //     labelWidth: 130,
+    //     width: 110,
+    //     overHidden: true,
+    //     disabled: true,
+    //     rules: [{
+    //         required: false,
+    //         message: "请选择所属辖区",
+    //         trigger: "click",
+    //     }, ],
+    // },
+    // {
+    //     label: "所属行业",
+    //     prop: "industry",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    // {
+    //     label: "登记机关",
+    //     prop: "registration",
+    //     // span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    //     span: 11,
+    // },
+    // {
+    //     label: "经营范围",
+    //     prop: "business",
+    //     span: 24,
+    //     labelWidth: 130,
+    //     width: 110,
+    //     // overHidden: true,
+    //     type: 'textarea',
+    //     showWordLimit: true,
+    //     disabled: true,
+    // }
+]
 export var column1 = [{
         label: "id",
         prop: "id",
@@ -197,6 +410,11 @@
         prop: "shareholdingratio",
         labelWidth: w,
         span: s,
+        rules: [{
+            required: true,
+            validator: validatePassNumber,
+            trigger: "blur",
+        }, ],
     },
     //  {
     //     label: "最终受益股份",
@@ -207,12 +425,18 @@
         prop: "capital",
         labelWidth: w,
         span: s,
+        rules: [{
+            required: true,
+            validator: validatePassNumber,
+            trigger: "blur",
+        }, ],
+
     }, {
         label: "出资时间",
         prop: "capitaltime",
         type: "date",
-        format: "yyyy-MM-dd hh:mm:ss",
-        valueFormat: "timestamp",
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
         labelWidth: w,
         span: s,
     }, {

--
Gitblit v1.9.3