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/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