From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/person-manage.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 2631919..6b6a58d 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -48,7 +48,7 @@
</div>
<div class="search">
<div class="search_thing">
- <div class="search_label">瀹㈡埛鍚嶇О锛�</div>
+ <div class="search_label">鐢ㄦ埛鍚嶏細</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.name" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
@@ -97,9 +97,9 @@
order: 'asc'
}
},
- isIndex: false,
- showSelect: true,
- select: true,
+ isIndex: true,
+ showSelect: false,
+ select: false,
do: [{
id: 'update',
font: '缂栬緫',
@@ -135,7 +135,9 @@
roleId: {
select: []
}
- }
+ },
+ requiredAdd:['account','name','state','roleId','password'],
+ requiredUp:['account','name','state','roleId']
},
entityCopy: {},
upIndex: 0,
--
Gitblit v1.9.3