From 1344317356b0407f4aff867865ba72248871ac1f Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 14:16:17 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/view/a6-personnel-detail.vue | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/components/view/a6-personnel-detail.vue b/src/components/view/a6-personnel-detail.vue
index 03c27c1..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;
}
@@ -160,7 +160,7 @@
<span class="required-span">* </span>鏋舵瀯鍚嶇О锛�
</el-col>
<el-col :span="16" :offset="1">
- <el-input v-model="addOb.name" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small"></el-input>
+ <el-input v-model="addOb.name" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small" @keyup.enter.native="addStandardTree"></el-input>
</el-col>
</el-row>
</div>
@@ -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',
@@ -271,6 +279,7 @@
selectField: {},
upUserDepardLimsIdPower: true
},
+ currentCompaniesList: []
}
},
mounted() {
@@ -304,11 +313,12 @@
}
this.selectTree = data2.replace(' - ', '')
this.addOb.fatherId = val.id;
- this.componentData.entity.departLimsId = val.id;
+ this.componentData.entity.departLimsId = val.id+',';
this.refreshTable()
},
getNodeParent(val) {
if (val.parent != null) {
+ this.currentCompaniesList[val.level-1] = val.data.id
this.selectTree += ' - ' + val.label
this.getNodeParent(val.parent)
}
@@ -423,10 +433,14 @@
selects.forEach(a=>{
ids.push(a.id)
})
+ let str = ''
+ this.currentCompaniesList.forEach(a=>{
+ str+=(a+',')
+ })
this.selectUserDia = false
this.$axios.post(this.$api.user.upUserDepardLimsId,{
ids: JSON.stringify(ids),
- id: this.componentData.entity.departLimsId
+ id: str
}).then(res=>{
if (res.code === 201) {
return
--
Gitblit v1.9.3