From 195c2e87ab1d456b1cbfd28057836c42152ce7de Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 12 Aug 2021 11:08:24 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

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

diff --git a/src/views/securityEquipment/equipments.js b/src/views/securityEquipment/equipments.js
index cad65f0..d54209a 100644
--- a/src/views/securityEquipment/equipments.js
+++ b/src/views/securityEquipment/equipments.js
@@ -62,7 +62,7 @@
     },
     {
         label: "保安公司",
-        prop: "tenantName",
+        prop: "deptId",
         rules: [{
             required: true,
             message: "请输入组织机构",
@@ -112,11 +112,11 @@
     {
         label: "出厂日期",
         prop: "dateForProduction",
-        // search: true,
         type: "date",
-        format: "yyyy-MM-dd",
-        valueFormat: "timestamp",
+        format: 'yyyy-MM-dd',
         searchSpan: 4,
+        // span:8,
+        valueFormat: 'yyyy-MM-dd',
         overHidden: true,
         rules: [{
             required: true,

--
Gitblit v1.9.3