|
|
|
@ -71,56 +71,58 @@
|
|
|
|
|
|
|
|
|
|
|
|
<!--审批正常流程-->
|
|
|
|
<!--审批正常流程-->
|
|
|
|
<el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
|
|
|
|
<el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
|
|
|
|
<el-row :gutter="20">
|
|
|
|
<div v-if="checkSendUser">
|
|
|
|
<!--部门数据-->
|
|
|
|
<el-row :gutter="20">
|
|
|
|
<el-col :span="4" :xs="24">
|
|
|
|
<!--部门数据-->
|
|
|
|
<h6>部门列表</h6>
|
|
|
|
<el-col :span="4" :xs="24">
|
|
|
|
<div class="head-container">
|
|
|
|
<h6>部门列表</h6>
|
|
|
|
<el-input
|
|
|
|
<div class="head-container">
|
|
|
|
v-model="deptName"
|
|
|
|
<el-input
|
|
|
|
placeholder="请输入部门名称"
|
|
|
|
v-model="deptName"
|
|
|
|
clearable
|
|
|
|
placeholder="请输入部门名称"
|
|
|
|
size="small"
|
|
|
|
clearable
|
|
|
|
prefix-icon="el-icon-search"
|
|
|
|
size="small"
|
|
|
|
style="margin-bottom: 20px"
|
|
|
|
prefix-icon="el-icon-search"
|
|
|
|
/>
|
|
|
|
style="margin-bottom: 20px"
|
|
|
|
</div>
|
|
|
|
/>
|
|
|
|
<div class="head-container">
|
|
|
|
</div>
|
|
|
|
<el-tree
|
|
|
|
<div class="head-container">
|
|
|
|
:data="deptOptions"
|
|
|
|
<el-tree
|
|
|
|
:props="defaultProps"
|
|
|
|
:data="deptOptions"
|
|
|
|
:expand-on-click-node="false"
|
|
|
|
:props="defaultProps"
|
|
|
|
:filter-node-method="filterNode"
|
|
|
|
:expand-on-click-node="false"
|
|
|
|
ref="tree"
|
|
|
|
:filter-node-method="filterNode"
|
|
|
|
default-expand-all
|
|
|
|
ref="tree"
|
|
|
|
@node-click="handleNodeClick"
|
|
|
|
default-expand-all
|
|
|
|
/>
|
|
|
|
@node-click="handleNodeClick"
|
|
|
|
</div>
|
|
|
|
/>
|
|
|
|
</el-col>
|
|
|
|
</div>
|
|
|
|
<el-col :span="12" :xs="24">
|
|
|
|
</el-col>
|
|
|
|
<h6>待选人员</h6>
|
|
|
|
<el-col :span="12" :xs="24">
|
|
|
|
<el-table
|
|
|
|
<h6>待选人员</h6>
|
|
|
|
ref="singleTable"
|
|
|
|
<el-table
|
|
|
|
:data="userList"
|
|
|
|
ref="singleTable"
|
|
|
|
border
|
|
|
|
:data="userList"
|
|
|
|
style="width: 100%"
|
|
|
|
border
|
|
|
|
@selection-change="handleSelectionChange">
|
|
|
|
style="width: 100%"
|
|
|
|
<el-table-column type="selection" width="50" align="center" />
|
|
|
|
@selection-change="handleSelectionChange">
|
|
|
|
<el-table-column label="用户名" align="center" prop="nickName" />
|
|
|
|
<el-table-column type="selection" width="50" align="center" />
|
|
|
|
<el-table-column label="部门" align="center" prop="dept.deptName" />
|
|
|
|
<el-table-column label="用户名" align="center" prop="nickName" />
|
|
|
|
</el-table>
|
|
|
|
<el-table-column label="部门" align="center" prop="dept.deptName" />
|
|
|
|
</el-col>
|
|
|
|
</el-table>
|
|
|
|
<el-col :span="8" :xs="24">
|
|
|
|
</el-col>
|
|
|
|
<h6>已选人员</h6>
|
|
|
|
<el-col :span="8" :xs="24">
|
|
|
|
<el-tag
|
|
|
|
<h6>已选人员</h6>
|
|
|
|
v-for="tag in userData"
|
|
|
|
<el-tag
|
|
|
|
:key="tag.nickName"
|
|
|
|
v-for="tag in userData"
|
|
|
|
closable
|
|
|
|
:key="tag.nickName"
|
|
|
|
@close="handleClose(tag)">
|
|
|
|
closable
|
|
|
|
{{tag.nickName}} {{tag.dept.deptName}}
|
|
|
|
@close="handleClose(tag)">
|
|
|
|
</el-tag>
|
|
|
|
{{tag.nickName}} {{tag.dept.deptName}}
|
|
|
|
</el-col>
|
|
|
|
</el-tag>
|
|
|
|
</el-row>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
|
<el-input style="width: 50%;margin-right: 34%" type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见"/>
|
|
|
|
<el-input style="width: 50%;margin-right: 34%" type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见"/>
|
|
|
|
<el-button @click="completeOpen = false">取 消</el-button>
|
|
|
|
<el-button @click="completeOpen = false">取 消</el-button>
|
|
|
|
@ -241,6 +243,7 @@ export default {
|
|
|
|
rejectOpen: false,
|
|
|
|
rejectOpen: false,
|
|
|
|
rejectTitle: null,
|
|
|
|
rejectTitle: null,
|
|
|
|
userData:[],
|
|
|
|
userData:[],
|
|
|
|
|
|
|
|
checkSendUser: false // 是否展示选择人员模块
|
|
|
|
};
|
|
|
|
};
|
|
|
|
},
|
|
|
|
},
|
|
|
|
created() {
|
|
|
|
created() {
|
|
|
|
@ -396,23 +399,25 @@ export default {
|
|
|
|
getNextFlowNode(params).then(res => {
|
|
|
|
getNextFlowNode(params).then(res => {
|
|
|
|
const data = res.data;
|
|
|
|
const data = res.data;
|
|
|
|
if (data) {
|
|
|
|
if (data) {
|
|
|
|
if (data.type === 'assignee') {
|
|
|
|
this.checkSendUser = true
|
|
|
|
|
|
|
|
if (data.type === 'assignee') { // 指定人员
|
|
|
|
this.userDataList = res.data.userList;
|
|
|
|
this.userDataList = res.data.userList;
|
|
|
|
} else if (data.type === 'candidateUsers') {
|
|
|
|
} else if (data.type === 'candidateUsers') { // 指定人员(多个)
|
|
|
|
this.userDataList = res.data.userList;
|
|
|
|
this.userDataList = res.data.userList;
|
|
|
|
this.taskForm.multiple = true;
|
|
|
|
this.taskForm.multiple = true;
|
|
|
|
} else if (data.type === 'candidateGroups') {
|
|
|
|
} else if (data.type === 'candidateGroups') { // 指定组(所属角色接收任务)
|
|
|
|
res.data.roleList.forEach(role => {
|
|
|
|
res.data.roleList.forEach(role => {
|
|
|
|
role.userId = role.roleId;
|
|
|
|
role.userId = role.roleId;
|
|
|
|
role.nickName = role.roleName;
|
|
|
|
role.nickName = role.roleName;
|
|
|
|
})
|
|
|
|
})
|
|
|
|
this.userDataList = res.data.roleList;
|
|
|
|
this.userDataList = res.data.roleList;
|
|
|
|
this.taskForm.multiple = false;
|
|
|
|
this.taskForm.multiple = false;
|
|
|
|
} else if (data.type === 'multiInstance') {
|
|
|
|
} else if (data.type === 'multiInstance') { // 会签?
|
|
|
|
this.userDataList = res.data.userList;
|
|
|
|
this.userDataList = res.data.userList;
|
|
|
|
this.taskForm.multiple = true;
|
|
|
|
this.taskForm.multiple = true;
|
|
|
|
|
|
|
|
}else if (data.type === 'fixed') { // 已经固定人员接收下一任务
|
|
|
|
|
|
|
|
this.checkSendUser = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.taskForm.sendUserShow = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
tony
3 years ago