From 3da442cd47a206d0edffb4606d07c305f9d54cd9 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 16 Nov 2021 10:11:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/securityGuard/data.js | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index 2359e01..1310066 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -547,7 +547,7 @@
prop: "cardid",
search: true,
searchLabelWidth: 90,
- searchSpan: 5,
+ searchSpan: 4,
minWidth: 140,
display: false
},
@@ -617,7 +617,7 @@
search: true,
searchLabelWidth: 90,
minWidth: 105,
- searchSpan: 4,
+ searchSpan: 3,
addDisplay: false,
editDisplay: false,
// hide: true,
@@ -705,6 +705,8 @@
slot: true,
search: true,
// searchValue: 7,
+ editDisplay: false,
+ addDisplay: false,
searchSpan: 3,
width: 69,
dicData: [{
@@ -716,11 +718,6 @@
value: 7,
}
],
- rules: [{
- required: true,
- message: "请选择",
- trigger: "blur",
- }, ],
},
// {
@@ -764,4 +761,4 @@
trigger: "blur"
}]
},
-]
\ No newline at end of file
+]
--
Gitblit v1.9.3