From f78a56ba2e2c3cf48a0809a824e306a578cefd00 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 14 Jul 2021 14:23:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/securityEquipment/car.js |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/car/data.js b/src/views/securityEquipment/car.js
similarity index 92%
rename from src/views/car/data.js
rename to src/views/securityEquipment/car.js
index cda1113..8c6d323 100644
--- a/src/views/car/data.js
+++ b/src/views/securityEquipment/car.js
@@ -19,6 +19,7 @@
     {
         label: "车牌号码",
         prop: "carNumber",
+        searchSpan: 4,
         search: true,
         rules: [{
             required: true,
@@ -29,6 +30,7 @@
     {
         label: "号码种类",
         prop: "numberType",
+        searchSpan: 4,
         rules: [{
             required: true,
             message: "请输入号码种类",
@@ -50,6 +52,7 @@
         label: "车辆型号",
         prop: "mode",
         // search: true,
+        searchSpan: 4,
         width: 110,
         overHidden: true,
         search: true,
@@ -64,7 +67,7 @@
         prop: "tenantName",
         rules: [{
             required: true,
-            message: "请输入组织机构",
+            message: "请输入保安公司",
             trigger: "blur"
         }],
         // addDisplay: true,
@@ -74,7 +77,7 @@
         // searchSpan: 5,
         dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
         props: {
-             label: "title",
+            label: "title",
             value: "id"
         },
         // search: true,
@@ -105,7 +108,8 @@
             required: true,
             message: "请输入厂商",
             trigger: "blur"
-        }]
+        }],
+        searchSpan: 4,
     },
     {
         label: "出厂日期",
@@ -128,11 +132,12 @@
         // search: true,
         width: 110,
         overHidden: true,
-        search: true,
+        // search: true,
         rules: [{
             required: true,
             message: "请输入环保标志 ,国IV",
             trigger: "blur"
-        }]
+        }],
+        searchSpan: 4,
     }
 ]

--
Gitblit v1.9.3