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/securityUnit/data.js |  479 +++++++++++++++++++++++++----------------------------------
 1 files changed, 206 insertions(+), 273 deletions(-)

diff --git a/src/views/securityUnit/data.js b/src/views/securityUnit/data.js
index af3813f..5e8b81e 100644
--- a/src/views/securityUnit/data.js
+++ b/src/views/securityUnit/data.js
@@ -1,3 +1,30 @@
+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 cardids = (rule, value, callback) => {
+    window.yanzhengphons = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+    if (!yanzhengphons.test(value)) {
+        callback(new Error('请输入正确身份证'));
+    } else {
+        callback();
+    }
+};
+
 var DIC = [
     {
         label: '招聘中',
@@ -9,13 +36,6 @@
 ]
 
 export var column = [
-    // {
-    //     label: "id",
-    //     prop: "id",
-    //     hide: true,
-    //     editDisplay: false,
-    //     addDisplay: false
-    // },
     {
         label: "统一社会信用代码",
         prop: "creditcode",
@@ -27,45 +47,23 @@
         // editDisplay: false,
         // addDisplay: false
     },
-    // {
-    //     label: "保安id",
-    //     prop: "tenantId",
-    //     hide: true,
-    //     editDisplay: false,
-    //     addDisplay: false
-    // },//上面不显示
-    // {
-    //     label: "部门",
-    //     prop: "departmentid",
-    //     // type: "tree",
-    //     disabled: true,
-    //     dicData: [],
-    //     labelWidth: w,
-    //     span: s,
-    //     props: {
-    //         label: "title",
-    //     },
-    //     rules: [
-    //         {
-    //             required: true,
-    //             message: "请选择所属部门",
-    //             trigger: "click",
-    //         },
-    //     ],
-    // },
+
     {
         label: "企业名称",
         prop: "enterprisename",
         search: true,
-        searchSpan: 6,
+        width: 260,
+        searchSpan: 4,
         labelWidth: 160,
         // width: 130,
         overHidden: true
     },
+
     {
         label: "企业类型",
         prop: "stats",
         type: "tree",
+        hide: true,
         labelWidth: 160,
         dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
         props: {
@@ -85,134 +83,79 @@
         label: "法定代表人",
         labelWidth: 160,
         prop: "representative",
-        width: 80,
+        width: 110,
         search: true,
-        searchSpan: 6,
+        searchSpan: 4,
+        searchLabelWidth: 100
+    },
+    {
+        label: "法定代表人电话",
+        labelWidth: 160,
+        prop: "representativecell",
+        width: 120,
+        // search: true,
+        searchSpan: 4,
+        searchLabelWidth: 100,
+    },
+
+    {
+        label: "保安人数",
+        labelWidth: 160,
+        prop: "znum",
+        width: 69,
+        // search: true,
+        searchSpan: 4,
+        searchLabelWidth: 100
+    },
+    {
+        label: "派遣人数",
+        labelWidth: 160,
+        prop: "pnum",
+        width: 69,
+        // search: true,
+        searchSpan: 4,
+        searchLabelWidth: 100
+    },
+    {
+        label: "持证人数",
+        labelWidth: 160,
+        prop: "cnum",
+        width: 69,
+        // search: true,
+        searchSpan: 4,
         searchLabelWidth: 100
     },
     // {
-    //     label: "登记状态",
-    //     prop: "regstsat",
-    //     // addDisplay: true, 
-    //     // editDisplay: true,
-    //     // viewDisplay: true,
-    //     // searchSpan: 5,
-    //     // dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
-    //     // props: {
-    //     //     label: "dictValue",
-    //     //     value: "dictKey"
-    //     // },
-    //     // search: true,
-    //     // type: "select",
-    //     // // rules: [{
-    //     // //     required: true,
-    //     // //     message: "请选择学历",
-    //     // //     trigger: "blur"
-    //     // // }],
-    // },
-    {
-        label: "成立日期",
-        prop: "establishtime",
-        labelWidth: 160,
-        width: 130,
-        overHidden: true,
-        type: "date",
-        format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
-        // addDisplay: true,
-        // editDisplay: true,
-        // viewDisplay: true,
-        // searchSpan: 4,
-        // dicUrl: "/api/blade-system/dict-biz/dictionary?code=experienceType",
-        // props: {
-        //     label: "dictValue",
-        //     value: "dictKey"
-        // },
-        // search: true,
-        // type: "select",
-        // // rules: [{
-        // //     required: true,
-        // //     message: "请选择工作经验",
-        // //     trigger: "blur"
-        // // }],
-    },
-    {
-        label: "注册资本(万元人民币)",
-        prop: "registeredcapital",
-        labelWidth: 160,
-        // search: true,
-        width: 140,
-        // overHidden: true
-    },
-    {
-        label: "实缴资本(万元人民币)",
-        prop: "capital",
-        labelWidth: 160,
-        // width: 85,
-        hide: true,
-        // search: true,
-        // searchSpan: 4,
-        // overHidden: true
-    },
-    {
-        label: "组织机构代码",
-        labelWidth: 160,
-        prop: "organizationcode",
-        // width: 110,
-        // search: true,
-        // searchSpan: 4,
-    },
-    {
-        label: "工商注册号",
-        prop: "registrationnumber",
-        labelWidth: 160,
-        width: 120,
-        // search: true,
-        // searchSpan: 4,
-    },
-    {
-        label: "纳税人识别号",
-        prop: "identificationnumber",
-        labelWidth: 160,
-        width: 140,
-        // addDisplay: true,
-        // editDisplay: true,
-        // viewDisplay: true,
-        // searchSpan: 4,
-        // dicUrl: "/api/blade-system/dict-biz/dictionary?code=unitsNatureType",
-        // props: {
-        //     label: "dictValue",
-        //     value: "dictKey"
-        // },
-        // // search: true,
-        // type: "select",
-        // // rules: [{
-        // //     required: false,
-        // //     message: "请选择单位规模",
-        // //     trigger: "blur"   
-        // // }],
-    },
-    // {
-    //     label: "企业类型",
-    //     prop: "stats",
-    //     // type: "tree",
-    //     // disabled: true,
-    //     type: "tree",
-    //     // type: "select",
-    //     dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
-    //     props: {
-    //         label: "dictValue",
-    //         value: "dictKey"
-    //     },
+    //     label: "注册时间",
+    //     prop: "establishtime",
+    //     labelWidth: 160,
     //     width: 130,
-    //     rules: [
-    //         {
-    //             required: true,
-    //             message: "请选择所属部门",
-    //             trigger: "click",
-    //         },
-    //     ],
+    //     overHidden: true,
+    //     type: "date",
+    //     format: "yyyy-MM-dd",
+    //     valueFormat: "yyyy-MM-dd",
+
     // },
+    {
+        label: "注册资本",
+        prop: "registeredcapital",
+        hide: true,
+        labelWidth: 160,
+        // search: true,
+        width: 80,
+    },
+    {
+        label: "联系人",
+        prop: "contacts",
+        labelWidth: 160,
+        width: 85,
+    }, {
+        label: "联系电话",
+        prop: "contactscell",
+        labelWidth: 160,
+        width: 95,
+    },
+
     {
         label: "注册地址",
         prop: "address",
@@ -230,9 +173,24 @@
         overHidden: true
     },
     {
-        label: "所属地区",
-        prop: "region",
+        label: "所属辖区",
+        prop: "jurisdiction",
         labelWidth: 160,
+        type: "tree",
+        dicUrl: "/api//jurisdiction/lazy-trees",
+        props: {
+            label: "title",
+            value: "id"
+        },
+        // labelWidth: w,
+        // span: s,
+        rules: [
+            {
+                required: true,
+                message: "请选择所属辖区",
+                trigger: "click",
+            },
+        ],
         // width: 110,
         // search: true,
         overHidden: true
@@ -255,21 +213,6 @@
         // search: true,
         // width: 88,
     },
-    // {
-    //     label: "租户ID",
-    //     // prop: "status",
-    //     // search: true,
-    //     // searchSpan: 4,
-    //     prop: 'tenant_id',
-    //     // filter: false,
-    //     // type: 'tree',
-    //     // dicData: DIC,
-    //     // rules: [{
-    //     //     required: true,
-    //     //     message: "请选择单位规模",
-    //     //     trigger: "blur"
-    //     // }],
-    // },
 ]
 
 var w = 160
@@ -286,18 +229,19 @@
         }
     },
     {
-        label: "统一社会信用代码",
-        prop: "creditcode",
+        label: "企业名称",
+        prop: "enterprisename",
         labelWidth: w,
         span: s,
         rules: [{
             required: true,
-            message: "请输入社会信用代码",
+            message: "请输入企业名称",
             trigger: "blur"
         }]
     },
+
     {
-        label: "辖区",
+        label: "所属辖区",
         prop: "jurisdiction",
         // type: "tree",
         // disabled: true,
@@ -316,6 +260,12 @@
                 trigger: "click",
             },
         ],
+    },
+    {
+        label: "统一社会信用代码",
+        prop: "creditcode",
+        labelWidth: w,
+        span: s,
     },
     // {
     //     label: "机构",
@@ -348,26 +298,9 @@
             value: "dictKey"
         },
         labelWidth: w,
-        span: s,
-        rules: [
-            {
-                required: true,
-                message: "请选择企业类型",
-                trigger: "click",
-            },
-        ],
+        span: s
     },
-    {
-        label: "企业名称",
-        prop: "enterprisename",
-        labelWidth: w,
-        span: s,
-        rules: [{
-            required: true,
-            message: "请输入企业名称",
-            trigger: "blur"
-        }]
-    },
+
     {
         label: "法定代表人",
         prop: "representative",
@@ -377,6 +310,44 @@
             required: true,
             message: "请输入法定代表人",
             trigger: "blur"
+        }]
+    },
+    {
+        label: "法定代表人电话",
+        prop: "representativecell",
+        labelWidth: w,
+        span: s,
+        rules: [{
+            required: true,
+            message: "请输入法定代表人电话",
+            trigger: "blur"
+        },
+        {
+            validator: phones, trigger: ['change', 'blur']
+        },]
+    }, {
+        label: "联系人",
+        prop: "contacts",
+        labelWidth: w,
+        span: s,
+        rules: [{
+            required: true,
+            message: "请输入联系人",
+            trigger: "blur"
+        }]
+    },
+    {
+        label: "联系电话",
+        prop: "contactscell",
+        labelWidth: w,
+        span: s,
+        rules: [{
+            required: true,
+            message: "请输入联系电话",
+            trigger: "blur"
+        },
+        {
+            validator: phones, trigger: ['change', 'blur']
         }]
     },
     // {
@@ -391,51 +362,31 @@
     //     }]
     // },
     {
-        label: "成立日期",
+        label: "注册时间",
         prop: "establishtime",
         labelWidth: w,
         span: s,
         type: "date",
         format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
-        rules: [{
-            required: true,
-            message: "请输入成立日期",
-            trigger: "blur"
-        }]
+        valueFormat: "yyyy-MM-dd",
     },
     {
         label: "注册资本(万元人民币)",
         prop: "registeredcapital",
         labelWidth: w,
         span: s,
-        rules: [{
-            required: true,
-            message: "请输入注册资本",
-            trigger: "blur"
-        }]
     },
     {
         label: "实缴资本(万元人民币)",
         prop: "capital",
         labelWidth: w,
         span: s,
-        rules: [{
-            required: true,
-            message: "请输入实缴资本",
-            trigger: "blur"
-        }]
     },
     {
         label: "组织机构代码",
         prop: "organizationcode",
         labelWidth: w,
         span: s,
-        rules: [{
-            required: true,
-            message: "请输入组织机构代码",
-            trigger: "blur"
-        }]
     },
     {
         label: "工商注册号",
@@ -443,77 +394,52 @@
 
         labelWidth: w,
         span: s,
-        rules: [{
-            required: true,
-            message: "请输入工商注册号",
-            trigger: "blur"
-        }]
     },
     {
         label: "纳税人识别号",
         prop: "identificationnumber",
         labelWidth: w,
         span: s,
-        rules: [{
-            required: true,
-            message: "请输入纳税人识别号",
-            trigger: "blur"
-        }]
     },
-    {
-        label: "企业类型",
-        prop: "enterprises",
-        labelWidth: w,
-        span: s,
-        rules: [{
-            required: true,
-            message: "请输入企业类型",
-            trigger: "blur"
-        }]
-    },
+    // {
+    //     label: "企业类型",
+    //     prop: "enterprises",
+    //     labelWidth: w,
+    //     span: s,
+    //     rules: [{
+    //         required: true,
+    //         message: "请输入企业类型",
+    //         trigger: "blur"
+    //     }]
+    // },
     {
         label: "注册地址",
         prop: "address",
         labelWidth: w,
         span: s,
-        rules: [{
-            required: true,
-            message: "请输入注册地址",
-            trigger: "blur"
-        }]
     },
     {
         label: "经营范围",
         prop: "business",
         labelWidth: w,
         span: s,
-        rules: [{
-            required: true,
-            message: "请输入经营范围",
-            trigger: "blur"
-        }]
     },
-    {
-        label: "所属地区",
-        prop: "region",
-        labelWidth: w,
-        span: s,
-        rules: [{
-            required: true,
-            message: "请输入所属地区",
-            trigger: "blur"
-        }]
-    },
+    // {
+    //     label: "所属地区",
+    //     prop: "region",
+    //     labelWidth: w,
+    //     span: s,
+    //     rules: [{
+    //         required: true,
+    //         message: "请输入所属地区",
+    //         trigger: "blur"
+    //     }]
+    // },
     {
         label: "登记机关",
         prop: "registration",
         labelWidth: w,
         span: s,
-        rules: [{
-            required: true,
-            message: "请输入登记机关",
-            trigger: "blur"
-        }]
         // overHidden: true,
     },
 
@@ -522,11 +448,6 @@
         prop: "industry",
         labelWidth: w,
         span: s,
-        rules: [{
-            required: true,
-            message: "请输入所属行业",
-            trigger: "blur"
-        }]
     }
 ]
 
@@ -598,7 +519,7 @@
     //     prop: "beneficial",
     //     labelWidth: w,
     //     span: s
-    // }, 
+    // },
     {
         label: "出资金额",
         prop: "capital2",
@@ -614,12 +535,12 @@
         prop: "capitaltime",
         type: "date",
         format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
+        valueFormat: "yyyy-MM-dd",
         labelWidth: w,
         span: s,
         rules: [{
             required: true,
-            message: "请输入法定代表人",
+            message: "请输入出资时间",
             trigger: "blur"
         }]
     }, {
@@ -631,6 +552,9 @@
             required: true,
             message: "请输入身份证",
             trigger: "blur"
+        },
+        {
+            validator: cardids, trigger: ['change', 'blur']
         }]
     }, {
         label: "联系电话",
@@ -641,6 +565,9 @@
             required: true,
             message: "请输入联系电话",
             trigger: "blur"
+        },
+        {
+            validator: phones, trigger: ['change', 'blur']
         }]
     },
 ]
@@ -716,6 +643,9 @@
             required: true,
             message: "请输入身份证",
             trigger: "blur"
+        },
+        {
+            validator: cardids, trigger: ['change', 'blur']
         }]
     }, {
         label: "联系电话",
@@ -726,6 +656,9 @@
             required: true,
             message: "请输入联系电话",
             trigger: "blur"
+        },
+        {
+            validator: phones, trigger: ['change', 'blur']
         }]
     }
     // , {

--
Gitblit v1.9.3