mirror of
https://github.com/flipped-aurora/gin-vue-admin.git
synced 2026-09-21 20:35:16 +00:00
增加自审批节点,修改待办查询bug,修改角色查询bug
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
<div class="panelBody">
|
||||
<DefaultDetail :model="model" :onChange="onChange" :readOnly="readOnly" />
|
||||
<div class="panelRow">
|
||||
<div>选择角色:</div>
|
||||
<div>选择审批人类别:</div>
|
||||
<el-select
|
||||
style="width: 90%; font-size: 12px"
|
||||
placeholder="请选择角色(与用户互斥)"
|
||||
@@ -19,6 +19,7 @@
|
||||
>
|
||||
<el-option key="user" value="user" :label="'用户'" />
|
||||
<el-option key="authority" value="authority" :label="'角色'" />
|
||||
<el-option key="self" value="self" :label="'发起人本人'" />
|
||||
</el-select>
|
||||
</div>
|
||||
<div v-if="model.assignType == 'user'" class="panelRow">
|
||||
|
||||
@@ -130,6 +130,17 @@ export default {
|
||||
},
|
||||
saveImg() {
|
||||
console.log(this.$refs["wfd"].graph.saveImg());
|
||||
},
|
||||
fmtAuthority(authorityList,list){
|
||||
authorityList.map(item => {
|
||||
list.push({
|
||||
id: item.authorityId,
|
||||
name: item.authorityName
|
||||
});
|
||||
if(item.children){
|
||||
this.fmtAuthority(item.children,list)
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
@@ -140,14 +151,8 @@ export default {
|
||||
});
|
||||
}
|
||||
const authorityRes = await getAuthorityList({ page: 1, pageSize: 9999999 });
|
||||
console.log(authorityRes)
|
||||
if (authorityRes.code == 0) {
|
||||
authorityRes.data.list.map(item => {
|
||||
this.authorities.push({
|
||||
id: item.authorityId,
|
||||
name: item.authorityName
|
||||
});
|
||||
});
|
||||
this.fmtAuthority(authorityRes.data.list,this.authorities)
|
||||
}
|
||||
if(this.$route.query.id){
|
||||
const res = await findWorkflowProcess({ id: this.$route.query.id });
|
||||
|
||||
@@ -14,8 +14,9 @@
|
||||
</div>
|
||||
<WorkflowInfo
|
||||
v-if="done"
|
||||
:wf="this.node"
|
||||
:wf="node"
|
||||
:business="business"
|
||||
:move="move"
|
||||
:workflowMoveID="$route.query.workflowMoveID"
|
||||
/>
|
||||
</div>
|
||||
@@ -29,7 +30,8 @@ export default {
|
||||
done:false,
|
||||
business:null,
|
||||
node:null,
|
||||
moves:[]
|
||||
moves:[],
|
||||
move:null
|
||||
}
|
||||
},
|
||||
computed:{
|
||||
@@ -74,6 +76,7 @@ export default {
|
||||
this.business = res.data.business
|
||||
this.workflow = res.data.move.workflowProcess
|
||||
this.node = res.data.move.workflowNode
|
||||
this.move = res.data.move
|
||||
this.moves = res.data.moves
|
||||
this.createDone()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user