From ef46e4b78e81418a831d4f7f21eb24d2fd4d35e1 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 25 Dec 2021 15:08:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/securityUnit/data.js |  221 +++++++++++++++++++++++++++++++------------------------
 1 files changed, 125 insertions(+), 96 deletions(-)

diff --git a/src/views/securityUnit/data.js b/src/views/securityUnit/data.js
index 5e8b81e..d7da79f 100644
--- a/src/views/securityUnit/data.js
+++ b/src/views/securityUnit/data.js
@@ -25,21 +25,18 @@
     }
 };
 
-var DIC = [
-    {
-        label: '招聘中',
-        value: 1,
-    }, {
-        label: '停止招聘',
-        value: 2,
-    }
-]
+var DIC = [{
+    label: '招聘中',
+    value: 1,
+}, {
+    label: '停止招聘',
+    value: 2,
+}]
 
-export var column = [
-    {
+export var column = [{
         label: "统一社会信用代码",
         prop: "creditcode",
-        width: 140,
+        // width: 140,
         hide: true,
 
         labelWidth: 160,
@@ -52,15 +49,15 @@
         label: "企业名称",
         prop: "enterprisename",
         search: true,
-        width: 260,
+        // width: 260,
         searchSpan: 4,
         labelWidth: 160,
-        // width: 130,
+        minWidth: 160,
         overHidden: true
     },
 
     {
-        label: "企业类型",
+        label: "企业属性",
         prop: "stats",
         type: "tree",
         hide: true,
@@ -70,20 +67,18 @@
             label: "dictValue",
             value: "dictKey"
         },
-        width: 130,
-        rules: [
-            {
-                required: true,
-                message: "请选择企业类型",
-                trigger: "click",
-            },
-        ],
+        // width: 130,
+        rules: [{
+            required: true,
+            message: "请选择企业属性",
+            trigger: "click",
+        }, ],
     },
     {
         label: "法定代表人",
         labelWidth: 160,
         prop: "representative",
-        width: 110,
+        // width: 110,
         search: true,
         searchSpan: 4,
         searchLabelWidth: 100
@@ -92,7 +87,7 @@
         label: "法定代表人电话",
         labelWidth: 160,
         prop: "representativecell",
-        width: 120,
+        // width: 120,
         // search: true,
         searchSpan: 4,
         searchLabelWidth: 100,
@@ -102,7 +97,7 @@
         label: "保安人数",
         labelWidth: 160,
         prop: "znum",
-        width: 69,
+        // width: 69,
         // search: true,
         searchSpan: 4,
         searchLabelWidth: 100
@@ -111,7 +106,7 @@
         label: "派遣人数",
         labelWidth: 160,
         prop: "pnum",
-        width: 69,
+        // width: 69,
         // search: true,
         searchSpan: 4,
         searchLabelWidth: 100
@@ -120,7 +115,7 @@
         label: "持证人数",
         labelWidth: 160,
         prop: "cnum",
-        width: 69,
+        // width: 69,
         // search: true,
         searchSpan: 4,
         searchLabelWidth: 100
@@ -142,18 +137,20 @@
         hide: true,
         labelWidth: 160,
         // search: true,
-        width: 80,
+        // width: 80,
     },
     {
         label: "联系人",
         prop: "contacts",
         labelWidth: 160,
-        width: 85,
+        // width: 85,
+        hide: true,
     }, {
         label: "联系电话",
         prop: "contactscell",
         labelWidth: 160,
-        width: 95,
+        // width: 95,
+        hide: true,
     },
 
     {
@@ -184,16 +181,41 @@
         },
         // labelWidth: w,
         // span: s,
-        rules: [
-            {
-                required: true,
-                message: "请选择所属辖区",
-                trigger: "click",
-            },
-        ],
+        rules: [{
+            required: true,
+            message: "请选择所属辖区",
+            trigger: "click",
+        }, ],
         // width: 110,
         // search: true,
         overHidden: true
+    },
+    {
+        label: "注册时间",
+        prop: "establishtime",
+        span: 12,
+        labelWidth: 130,
+        disabled: true,
+        type: "date",
+        format: "yyyy-MM-dd",
+        valueFormat: "yyyy-MM-dd",
+        // 表单新增时是否禁止
+        addDisabled: false,
+        // 表单新增时是否可见
+        addDisplay: false,
+        // 表单新增时是否为查看模式
+        addDetail: false,
+        // 表单编辑时是否禁止
+        editDisabled: false,
+        // 表单编辑时是否可见
+        editDisplay: false,
+        // 表单编辑时是否为查看模式
+        editDetail: false,
+        rules: [{
+            required: true,
+            message: "请选择注册时间",
+            trigger: "blur",
+        }, ],
     },
     {
         label: "登记机关",
@@ -215,10 +237,9 @@
     },
 ]
 
-var w = 160
-    , s = 12;
-export var column0 = [
-    {
+var w = 160,
+    s = 12;
+export var column0 = [{
         label: "",
         labelWidth: 20,
         type: 'title',
@@ -253,13 +274,11 @@
         },
         labelWidth: w,
         span: s,
-        rules: [
-            {
-                required: true,
-                message: "请选择所属辖区",
-                trigger: "click",
-            },
-        ],
+        rules: [{
+            required: true,
+            message: "请选择所属辖区",
+            trigger: "click",
+        }, ],
     },
     {
         label: "统一社会信用代码",
@@ -318,13 +337,15 @@
         labelWidth: w,
         span: s,
         rules: [{
-            required: true,
-            message: "请输入法定代表人电话",
-            trigger: "blur"
-        },
-        {
-            validator: phones, trigger: ['change', 'blur']
-        },]
+                required: true,
+                message: "请输入法定代表人电话",
+                trigger: "blur"
+            },
+            {
+                validator: phones,
+                trigger: ['change', 'blur']
+            },
+        ]
     }, {
         label: "联系人",
         prop: "contacts",
@@ -342,13 +363,15 @@
         labelWidth: w,
         span: s,
         rules: [{
-            required: true,
-            message: "请输入联系电话",
-            trigger: "blur"
-        },
-        {
-            validator: phones, trigger: ['change', 'blur']
-        }]
+                required: true,
+                message: "请输入联系电话",
+                trigger: "blur"
+            },
+            {
+                validator: phones,
+                trigger: ['change', 'blur']
+            }
+        ]
     },
     // {
     //     label: "企业类型",
@@ -451,8 +474,7 @@
     }
 ]
 
-export var column1 = [
-    {
+export var column1 = [{
         label: "",
         labelWidth: 20,
         type: 'title',
@@ -549,31 +571,34 @@
         labelWidth: w,
         span: s,
         rules: [{
-            required: true,
-            message: "请输入身份证",
-            trigger: "blur"
-        },
-        {
-            validator: cardids, trigger: ['change', 'blur']
-        }]
+                required: true,
+                message: "请输入身份证",
+                trigger: "blur"
+            },
+            {
+                validator: cardids,
+                trigger: ['change', 'blur']
+            }
+        ]
     }, {
         label: "联系电话",
         prop: "cell",
         labelWidth: w,
         span: s,
         rules: [{
-            required: true,
-            message: "请输入联系电话",
-            trigger: "blur"
-        },
-        {
-            validator: phones, trigger: ['change', 'blur']
-        }]
+                required: true,
+                message: "请输入联系电话",
+                trigger: "blur"
+            },
+            {
+                validator: phones,
+                trigger: ['change', 'blur']
+            }
+        ]
     },
 ]
 
-export var column2 = [
-    {
+export var column2 = [{
         label: "",
         labelWidth: 20,
         type: 'title',
@@ -640,26 +665,30 @@
         labelWidth: w,
         span: s,
         rules: [{
-            required: true,
-            message: "请输入身份证",
-            trigger: "blur"
-        },
-        {
-            validator: cardids, trigger: ['change', 'blur']
-        }]
+                required: true,
+                message: "请输入身份证",
+                trigger: "blur"
+            },
+            {
+                validator: cardids,
+                trigger: ['change', 'blur']
+            }
+        ]
     }, {
         label: "联系电话",
         prop: "cell2",
         labelWidth: w,
         span: s,
         rules: [{
-            required: true,
-            message: "请输入联系电话",
-            trigger: "blur"
-        },
-        {
-            validator: phones, trigger: ['change', 'blur']
-        }]
+                required: true,
+                message: "请输入联系电话",
+                trigger: "blur"
+            },
+            {
+                validator: phones,
+                trigger: ['change', 'blur']
+            }
+        ]
     }
     // , {
     //     label: "持股比例(%)",
@@ -667,4 +696,4 @@
     //     labelWidth: w,
     //     span: s
     // }
-]
+]
\ No newline at end of file

--
Gitblit v1.9.3