From e59a71579f6afd21c76f9d45c3b3f09c28d03c41 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 14:37:22 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a6-personnel-detail.vue | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/components/view/a6-personnel-detail.vue b/src/components/view/a6-personnel-detail.vue
index 16b4eb7..21598f0 100644
--- a/src/components/view/a6-personnel-detail.vue
+++ b/src/components/view/a6-personnel-detail.vue
@@ -67,7 +67,7 @@
background-color: #fff;
height: 100%;
display: flex;
- align-items: center;
+ align-items: right;
justify-content: end;
}
@@ -170,6 +170,13 @@
</span>
</el-dialog>
<el-dialog title="閫夋嫨鐢ㄦ埛" :visible.sync="selectUserDia" width="70%">
+ <div class="search" style="margin-bottom: 9px;">
+ <div class="search_thing">
+ <div class="search_label">鐢ㄦ埛鍚嶏細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData2.entity.name" @keyup.enter.native="$refs.ValueTable2.selectList()"></el-input></div>
+ </div>
+ </div>
<div class="body" style="height: 60vh;" v-if="selectUserDia">
<ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2"/>
</div>
@@ -245,6 +252,7 @@
expandedKeys: [],
selectUserDia: false,
componentData2: {
+ name: null,
entity: {
orderBy: {
field: 'id',
--
Gitblit v1.9.3