|
@@ -26,7 +26,7 @@
|
|
|
<SplitArea :size="rightSplitWidth">
|
|
<SplitArea :size="rightSplitWidth">
|
|
|
<div class="container_right">
|
|
<div class="container_right">
|
|
|
<el-row >
|
|
<el-row >
|
|
|
- <el-form ref="queryFormRef" :inline="false" :model="queryFrom" label-position="left" label-width="60px">
|
|
|
|
|
|
|
+ <el-form ref="queryFormRef" :inline="false" :model="queryFrom" label-position="left" label-width="60px">
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
<el-form-item label="工号">
|
|
<el-form-item label="工号">
|
|
|
<el-input size="small" clearable placeholder="请输入工号" v-model="queryFrom.userId"></el-input>
|
|
<el-input size="small" clearable placeholder="请输入工号" v-model="queryFrom.userId"></el-input>
|
|
@@ -90,18 +90,18 @@
|
|
|
@selectionChange="selectionChange">
|
|
@selectionChange="selectionChange">
|
|
|
</kt-common-table>
|
|
</kt-common-table>
|
|
|
</div>
|
|
</div>
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
</SplitArea>
|
|
</SplitArea>
|
|
|
</Split>
|
|
</Split>
|
|
|
</el-main>
|
|
</el-main>
|
|
|
- <el-dialog :title="settingDialog.title" :visible.sync="settingDialog.visible"
|
|
|
|
|
|
|
+ <el-dialog :title="settingDialog.title" :visible.sync="settingDialog.visible"
|
|
|
:close-on-press-escape="false" :modal="true"
|
|
:close-on-press-escape="false" :modal="true"
|
|
|
- :show-close="false"
|
|
|
|
|
|
|
+ :show-close="false"
|
|
|
custom-class="settingDialog"
|
|
custom-class="settingDialog"
|
|
|
v-dialogDrag
|
|
v-dialogDrag
|
|
|
top="1vh">
|
|
top="1vh">
|
|
|
<el-row >
|
|
<el-row >
|
|
|
- <el-form ref="queryFormRef" :inline="false" :model="settingDialog.queryFrom" label-position="left" label-width="60px">
|
|
|
|
|
|
|
+ <el-form ref="queryFormRef" :inline="false" :model="settingDialog.queryFrom" label-position="left" label-width="60px">
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
<el-form-item label="工号">
|
|
<el-form-item label="工号">
|
|
|
<el-input size="small" clearable placeholder="请输入工号" v-model="settingDialog.queryFrom.userId"></el-input>
|
|
<el-input size="small" clearable placeholder="请输入工号" v-model="settingDialog.queryFrom.userId"></el-input>
|
|
@@ -180,6 +180,7 @@ export default {
|
|
|
treeData: [], //左侧树数据
|
|
treeData: [], //左侧树数据
|
|
|
currentKey: '', //选中的左侧节点
|
|
currentKey: '', //选中的左侧节点
|
|
|
pageResult: {}, //表格数据
|
|
pageResult: {}, //表格数据
|
|
|
|
|
+ currentName:"",
|
|
|
columns: [ //表格列
|
|
columns: [ //表格列
|
|
|
{ prop: "deptId", label: "部门编码", minWidth: 80, sortable: false },
|
|
{ prop: "deptId", label: "部门编码", minWidth: 80, sortable: false },
|
|
|
{ prop: "pdeptName", label: "机构名称", minWidth: 120, sortable: false },
|
|
{ prop: "pdeptName", label: "机构名称", minWidth: 120, sortable: false },
|
|
@@ -313,6 +314,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
handleNodeClick(node){ //点击左侧树节点,查询右侧列表
|
|
handleNodeClick(node){ //点击左侧树节点,查询右侧列表
|
|
|
this.currentKey = node.id;
|
|
this.currentKey = node.id;
|
|
|
|
|
+ this.currentName = node.name;
|
|
|
this.pageData = {
|
|
this.pageData = {
|
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
|
pageSize: 20,
|
|
pageSize: 20,
|
|
@@ -436,7 +438,7 @@ export default {
|
|
|
})
|
|
})
|
|
|
let data = {
|
|
let data = {
|
|
|
leaderId: this.currentKey,
|
|
leaderId: this.currentKey,
|
|
|
- leaderName: this.leaderName,
|
|
|
|
|
|
|
+ leaderName: this.currentName,
|
|
|
userIds: arr
|
|
userIds: arr
|
|
|
}
|
|
}
|
|
|
this.$api.user.setManage(data).then(res =>{
|
|
this.$api.user.setManage(data).then(res =>{
|
|
@@ -453,7 +455,6 @@ export default {
|
|
|
}).catch(e =>{
|
|
}).catch(e =>{
|
|
|
console.log(e);
|
|
console.log(e);
|
|
|
})
|
|
})
|
|
|
- // console.log(this.selection);
|
|
|
|
|
},
|
|
},
|
|
|
BatchCancellation(){ //批量取消
|
|
BatchCancellation(){ //批量取消
|
|
|
let arr = [];
|
|
let arr = [];
|