From 52ef0adada3ec9c158bcdec69d0604d37228ee9f Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 01:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a6-personnel-detail.vue | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/src/components/view/a6-personnel-detail.vue b/src/components/view/a6-personnel-detail.vue
index 30724f3..109eedf 100644
--- a/src/components/view/a6-personnel-detail.vue
+++ b/src/components/view/a6-personnel-detail.vue
@@ -142,7 +142,7 @@
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.name"
@keyup.enter.native="refreshTable()" @clear="refreshTable"></el-input>
</div>
- <div class="search_label">
+ <div class="search_label" v-if="upUserDepardLimsIdPower">
<el-button type="primary" size="small" @click="selectUserDia = true">娣诲姞</el-button>
</div>
</div>
@@ -150,7 +150,7 @@
</el-col>
</el-row>
<el-row class="standard_table" v-loading="tableLoad">
- <ValueTable ref="ValueTable" :url="$api.user.selectUserList" :componentData="componentData" />
+ <ValueTable ref="ValueTable" :url="$api.user.selectUserList" :componentData="componentData" :delUrl="$api.user.delUserDepardLimsId"/>
</el-row>
</div>
<el-dialog title="鏋舵瀯鏂板" :visible.sync="addDia" width="400px">
@@ -171,7 +171,7 @@
</el-dialog>
<el-dialog title="閫夋嫨鐢ㄦ埛" :visible.sync="selectUserDia" width="70%">
<div class="body" style="height: 60vh;" v-if="selectUserDia">
- <ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2" />
+ <ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2"/>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="selectUserDia = false">鍙� 娑�</el-button>
@@ -221,7 +221,12 @@
isIndex: true,
showSelect: false,
select: false,
- do: [],
+ do: [{
+ id: 'delete',
+ font: '鍒犻櫎',
+ type: 'text',
+ method: 'doDiy'
+ }],
tagField: {
state: {
select: [{
@@ -241,7 +246,6 @@
selectUserDia: false,
componentData2: {
entity: {
- isCustom: 0,
orderBy: {
field: 'id',
order: 'asc'
@@ -249,7 +253,7 @@
},
isIndex: true,
showSelect: true,
- select: false,
+ select: true,
do: [],
tagField: {
state: {
@@ -265,6 +269,7 @@
}
},
selectField: {},
+ upUserDepardLimsIdPower: true
},
defaultCheckedKeys:[]
}
@@ -384,6 +389,8 @@
let add = false
let addStandardProduct = false
let delStandardTree = false
+ let upUserDepardLimsId = false
+ let del = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'addDepartmentLims') {
add = true
@@ -394,10 +401,20 @@
if (power[i].menuMethod == 'delDepartmentLims') {
delStandardTree = true
}
+ if (power[i].menuMethod == 'upUserDepardLimsId') {
+ upUserDepardLimsId = true
+ }
+ if(power[i].menuMethod=='delUserDepardLimsId'){
+ del = true
+ }
+ }
+ if(!del){
+ this.componentData.do.splice(0, 1)
}
this.addPower = add
this.addStandardProduct = addStandardProduct
this.delStandardTree = delStandardTree
+ this.upUserDepardLimsIdPower = upUserDepardLimsId
},
selectUser() {
let selects = this.$refs.ValueTable2.multipleSelection
@@ -405,11 +422,21 @@
this.$message.error('鏈�夋嫨鏁版嵁')
return
}
- delete selects['orderBy']
- delete selects['updateUser']
- delete selects['updateTime']
- this.user = selects
+ var ids = []
+ selects.forEach(a=>{
+ ids.push(a.id)
+ })
this.selectUserDia = false
+ this.$axios.post(this.$api.user.upUserDepardLimsId,{
+ ids: JSON.stringify(ids),
+ id: this.componentData.entity.departLimsId
+ }).then(res=>{
+ if (res.code === 201) {
+ return
+ }
+ this.$message.success('娣诲姞鎴愬姛')
+ this.refreshTable()
+ })
}
}
}
--
Gitblit v1.9.3