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/gun.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/securityEquipment/gun.js b/src/views/securityEquipment/gun.js
index 3ad2692..c3dceef 100644
--- a/src/views/securityEquipment/gun.js
+++ b/src/views/securityEquipment/gun.js
@@ -70,7 +70,7 @@
},
{
label: "保安公司",
- prop: "tenantName",
+ prop: "deptId",
labelWidth: 160,
rules: [{
required: true,
@@ -112,7 +112,7 @@
// search: true,
type: "date",
format: "yyyy-MM-dd",
- valueFormat: "timestamp",
+ valueFormat: "yyyy-MM-dd",
// width: 110,
// overHidden: true,
// search: true,
@@ -129,7 +129,7 @@
// search: true,
type: "date",
format: "yyyy-MM-dd",
- valueFormat: "timestamp",
+ valueFormat: "yyyy-MM-dd",
searchSpan: 4,
overHidden: true,
rules: [{
--
Gitblit v1.9.3