From d33acff5eaafe9ab6dc78a01f0b00d43c73833a5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 16 五月 2024 17:41:39 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/a6-personnel-detail.vue | 67 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/src/components/view/a6-personnel-detail.vue b/src/components/view/a6-personnel-detail.vue
index b96ad20..3778dec 100644
--- a/src/components/view/a6-personnel-detail.vue
+++ b/src/components/view/a6-personnel-detail.vue
@@ -112,15 +112,16 @@
<el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'name' }" node-key="id"
:filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
@node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="false"
- :default-expanded-keys="expandedKeys">
+ :default-expanded-keys="expandedKeys"
+ :default-checked-keys="[1]">
<div class="custom-tree-node" slot-scope="{ node, data }">
<el-row style="width: 100%;">
<el-col :span="21" :class="{sort:node.level>3}">
<span><i
:class="`node_i ${data.children != undefined&&data.children.length>0 ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
- [{{ node.level-1 }}] {{ data.name }}</span>
+ {{ data.name }}</span>
</el-col>
- <el-col :span="2" style="text-align: right;" v-if="delStandardTree">
+ <el-col :span="2" style="text-align: right;" v-if="delStandardTree&&node.level>1">
<el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
</el-button>
@@ -146,7 +147,7 @@
</el-col>
</el-row>
<el-row class="standard_table" v-loading="tableLoad">
- <ValueTable ref="ValueTable" :url="$api.capacityScope.selectItemParameterList" :componentData="componentData" />
+ <ValueTable ref="ValueTable" :url="$api.department.showUserById" :componentData="componentData" />
</el-row>
</div>
<el-dialog title="鏋舵瀯鏂板" :visible.sync="addDia" width="400px">
@@ -176,6 +177,46 @@
},
data() {
return {
+ datathirdParty:[{
+ id: 1,
+ label: '涓�绾� 1',
+ children: [{
+ id: 4,
+ label: '浜岀骇 1-1',
+ children: [{
+ id: 9,
+ label: '涓夌骇 1-1-1'
+ }, {
+ id: 10,
+ label: '涓夌骇 1-1-2'
+ }]
+ }]
+ }, {
+ id: 2,
+ label: '涓�绾� 2',
+ children: [{
+ id: 5,
+ label: '浜岀骇 2-1'
+ }, {
+ id: 6,
+ label: '浜岀骇 2-2'
+ }]
+ }, {
+ id: 3,
+ label: '涓�绾� 3',
+ children: [{
+ id: 7,
+ label: '浜岀骇 3-1'
+ }, {
+ id: 8,
+ label: '浜岀骇 3-2'
+ }]
+ }],
+ defaultProps: {
+ children: 'children',
+ label: 'label'
+ },
+ addthirdParty:false,
search: null,
list: [],
selectTree: '',
@@ -192,6 +233,8 @@
addStandardProduct: false,
componentData: {
entity: {
+ name:'',
+ departId:'',
orderBy: {
field: 'id',
order: 'asc'
@@ -199,8 +242,8 @@
},
init:false,
isIndex: true,
- showSelect: true,
- select: true,
+ showSelect: false,
+ select: false,
do: [],
isPage: false,
tagField: {
@@ -215,6 +258,7 @@
this.selectTreeList()
},
methods: {
+
filterNode(value, data) {
if (!value) return true;
return data.name.indexOf(value) !== -1;
@@ -226,7 +270,8 @@
this.$refs.ValueTable.selectList()
},
refresh() {
- this.upIndex++
+ this.upIndex++;
+ this.componentData.entity.departId = this.list[0].id;
this.refreshTable()
},
handleNodeClick(val, node, el) { //鏍戠殑鍊�
@@ -240,6 +285,8 @@
}
this.selectTree = data2.replace(' - ', '')
this.addOb.fatherId = val.id;
+ this.componentData.entity.departId = val.id;
+ this.refreshTable()
},
getNodeParent(val) {
if (val.parent != null) {
@@ -274,12 +321,14 @@
this.list.forEach(a => {
a.children.forEach(b => {
b.children.forEach(c => {
- this.expandedKeys.push(c.name)
+ this.expandedKeys.push(c.id)
})
- // this.expandedKeys.push(b.label)
})
})
this.treeLoad = false
+ this.componentData.entity.departId = this.list[0].id;
+ this.selectTree = '鍏ㄩ儴'
+ this.refreshTable()
})
},
addStandardTree() {
--
Gitblit v1.9.3