From e926916dc724ff9d57ff201fb7509d55ad1983e7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 22 Aug 2021 10:32:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/securityEquipment/equipments.js |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/views/securityEquipment/equipments.js b/src/views/securityEquipment/equipments.js
index d54209a..147536b 100644
--- a/src/views/securityEquipment/equipments.js
+++ b/src/views/securityEquipment/equipments.js
@@ -61,13 +61,26 @@
         // search: true,
     },
     {
-        label: "保安公司",
+        label: "数量",
+        prop: "num",
+        rules: [{
+            required: true,
+            message: "请输入数量",
+            trigger: "blur"
+        }]
+        // search: true,
+    },
+    {
+        label: "所属保安公司",
         prop: "deptId",
+        searchSpan: 4,
+        searchLabelWidth: 110,
         rules: [{
             required: true,
             message: "请输入组织机构",
             trigger: "blur"
         }],
+        search: true,
         overHidden: true,
         // addDisplay: true,
         // editDisplay: true,

--
Gitblit v1.9.3