From c8e279927a36c755fd78769cfa8e489568192aa4 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 28 Aug 2021 16:31:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/securityEquipment/equipments.js |   71 +++++++++--------------------------
 1 files changed, 19 insertions(+), 52 deletions(-)

diff --git a/src/views/securityEquipment/equipments.js b/src/views/securityEquipment/equipments.js
index 55e58a7..af74a6c 100644
--- a/src/views/securityEquipment/equipments.js
+++ b/src/views/securityEquipment/equipments.js
@@ -1,15 +1,12 @@
-var DIC = [
-    {
-        label: '招聘中',
-        value: 1,
-    }, {
-        label: '停止招聘',
-        value: 2,
-    }
-]
+var DIC = [{
+    label: '招聘中',
+    value: 1,
+}, {
+    label: '停止招聘',
+    value: 2,
+}]
 
-export var column = [
-    {
+export var column = [{
         label: "id",
         prop: "id",
         hide: true,
@@ -29,36 +26,14 @@
         }]
     },
     {
-        label: "编号",
-        prop: "number",
-        searchSpan: 4,
-        rules: [{
-            required: true,
-            message: "请输入编号",
-            trigger: "blur"
-        }],
-        search: true,
-    },//上面不显示 
-    {
-        label: "规格",
-        prop: "specifications",
-        rules: [{
-            required: true,
-            message: "请输入规格",
-            trigger: "blur"
-        }]
-        // search: true,
-    },
-    {
         label: "型号",
         prop: "mode",
-        width: 70,
         rules: [{
-            required: true,
-            message: "请输入型号",
-            trigger: "blur"
-        }]
-        // search: true,
+                required: true,
+                message: "请输入型号",
+                trigger: "blur"
+            }]
+            // search: true,
     },
     {
         label: "数量",
@@ -67,38 +42,30 @@
             required: true,
             message: "请输入数量",
             trigger: "blur"
-        }]
+        }],
         // search: true,
+        width: 70,
     },
     {
         label: "所属保安公司",
         prop: "deptId",
-        searchSpan: 4,
+        searchSpan: 6,
         searchLabelWidth: 110,
         rules: [{
             required: true,
-            message: "请输入组织机构",
+            message: "请输入所属保安公司",
             trigger: "blur"
         }],
         hide: false,
         search: true,
         overHidden: true,
-        // addDisplay: true,
-        // editDisplay: true,
-        // viewDisplay: true,
-        // searchSpan: 4,
         dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
         props: {
             label: "title",
             value: "id"
         },
-        // search: true,
         type: "select",
-        // rules: [{
-        //     required: true,
-        //     message: "请选择学历",
-        //     trigger: "blur"
-        // }],
+        width: 250,
     },
     {
         label: "负责人",
@@ -138,4 +105,4 @@
             trigger: "blur"
         }]
     }
-]
+]
\ No newline at end of file

--
Gitblit v1.9.3