From f5d88e4f31bec1d77721c0795afde3f3a571e9aa Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 11 Aug 2021 15:55:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/securityEquipment/car.js |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/securityEquipment/car.js b/src/views/securityEquipment/car.js
index 5a25dc3..4807633 100644
--- a/src/views/securityEquipment/car.js
+++ b/src/views/securityEquipment/car.js
@@ -9,13 +9,13 @@
 ]
 
 export var column = [
-    {
-        label: "id",
-        prop: "id",
-        hide: true,
-        editDisplay: false,
-        addDisplay: false
-    },
+    // {
+    //     label: "id",
+    //     prop: "id",
+    //     hide: true,
+    //     editDisplay: false,
+    //     addDisplay: false
+    // },
     {
         label: "车牌号码",
         prop: "carNumber",
@@ -64,7 +64,7 @@
     },
     {
         label: "保安公司",
-        prop: "tenantName",
+        prop: "deptId",
         rules: [{
             required: true,
             message: "请输入保安公司",
@@ -117,7 +117,7 @@
         // search: true,
         type: "date",
         format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
+        valueFormat: "yyyy-MM-dd",
         searchSpan: 4,
         overHidden: true,
         rules: [{

--
Gitblit v1.9.3