From 61a386154bb1f5bab87d1e05de92316a53b5d6cf Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 10 Nov 2021 16:49:58 +0800
Subject: [PATCH] 冲突
---
src/views/securityGuard/data.js | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index 2359e01..385c026 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",
- }, ],
},
// {
--
Gitblit v1.9.3