BruceSun
/
SAMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 流程详情页面关闭按钮重复

rf
tony 2022-12-27 22:01:55 +08:00
parent 4b6ff48fe9
commit d6a22e8489
9 changed files with 9 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-ui/src/components/Process/PropertyPanel.vue
View File

@ -55,11 +55,6 @@ export default {
name: '',
color: null
},
roles: [
{ value: 'manager', label: '经理' },
{ value: 'personnel', label: '人事' },
{ value: 'charge', label: '主管' }
]
}
},
computed: {

4
ruoyi-ui/src/views/flowable/definition/index.vue
View File

@ -101,8 +101,8 @@
<el-table-column label="部署时间" align="center" prop="deploymentTime" width="180"/>
<el-table-column label="操作" width="250" fixed="right"class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button @click="handleLoadXml(scope.row)" icon="el-icon-edit-outline" type="text" size="small">编辑</el-button>
<el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-el-icon-s-promotion" type="text" size="small" v-if="scope.row.formId == null">配置表单</el-button>
<el-button @click="handleLoadXml(scope.row)" icon="el-icon-edit-outline" type="text" size="small">设计</el-button>
<el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-el-icon-s-promotion" type="text" size="small" v-if="scope.row.formId == null">配置主表单</el-button>
<el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-pause" type="text" size="small" v-if="scope.row.suspensionState === 1">挂起</el-button>
<el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-play" type="text" size="small" v-if="scope.row.suspensionState === 2">激活</el-button>
<el-button @click="handleDelete(scope.row)" icon="el-icon-delete" type="text" size="small" v-hasPermi="['system:deployment:remove']">删除</el-button>

24
ruoyi-ui/src/views/flowable/definition/model.vue
View File

@ -114,10 +114,6 @@ export default {
},
/** 指定流程办理人员列表 */
getDataList() {
// todo 待根据部门选择人员
// const params = {
//
// }
userList().then(res =>{
res.data.forEach(val =>{
val.userId = val.userId.toString();
@ -142,26 +138,6 @@ export default {
this.xmlOpen = true;
this.xmlData = vkBeautify.xml(xmlData);
},
// /** 获取数据类型 */
// dataType(data){
// this.users = [];
// this.groups = [];
// if (data) {
// if (data.dataType === 'dynamic') {
// if (data.userType === 'assignee') {
// this.users = [{nickName: "${INITIATOR}", userId: "${INITIATOR}"},
// {nickName: "#{approval}", userId: "#{approval}"}
// ]
// } else if (data.userType === 'candidateUsers') {
// this.users = [ {nickName: "#{approval}", userId: "#{approval}"}]
// } else {
// this.groups = [{roleName: "#{approval}", roleId: "#{approval}"}]
// }
// } else {
// this.getDataList()
// }
// }
// }
},
};
</script>

5
ruoyi-ui/src/views/flowable/task/finished/detail/index.vue
View File

@ -2,8 +2,8 @@
<div class="app-container">
<el-card class="box-card" >
<div slot="header" class="clearfix">
<span class="el-icon-document">办结任务</span>
<el-button style="float: right;" size="mini" type="primary" @click="goBack">关闭</el-button>
<span class="el-icon-document">已办任务</span>
<el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
</div>
<el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
<!--表单信息-->
@ -64,7 +64,6 @@
<flow :flowData="flowData"/>
</el-tab-pane>
</el-tabs>
<el-button style="position: absolute;right:35px;top:35px;" type="primary" @click="goBack">关闭</el-button>
</el-card>
</div>
</template>

3
ruoyi-ui/src/views/flowable/task/myProcess/detail/flowview.vue
View File

@ -41,7 +41,7 @@ export default {
container: this.$refs.flowCanvas,
height: 'calc(100vh - 200px)',
});
this.loadFlowCanvas(newVal)
this.loadFlowCanvas(newVal);
}
},
immediate: true, // 立即生效
@ -55,7 +55,6 @@ export default {
async loadFlowCanvas(flowData) {
const self = this
try {
console.log(flowData,"self.flowData")
await self.bpmnViewer.importXML(flowData.xmlData);
self.fitViewport()
if (flowData.nodeData !==undefined && flowData.nodeData.length > 0 ) {

3
ruoyi-ui/src/views/flowable/task/myProcess/detail/index.vue
View File

@ -3,7 +3,7 @@
<el-card class="box-card" >
<div slot="header" class="clearfix">
<span class="el-icon-document">已发任务</span>
<el-button style="float: right;" size="mini" type="primary" @click="goBack">关闭</el-button>
<el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
</div>
<el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
<!--表单信息-->
@ -65,7 +65,6 @@
<flow :flowData="flowData"/>
</el-tab-pane>
</el-tabs>
<el-button style="position: absolute;right:35px;top:35px;" type="primary" @click="goBack">关闭</el-button>
</el-card>
</div>
</template>

2
ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
View File

@ -3,7 +3,7 @@
<el-card class="box-card" >
<div slot="header" class="clearfix">
<span class="el-icon-document">发起任务</span>
<el-button style="float: right;" size="mini" type="primary" @click="goBack">关闭</el-button>
<el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
</div>
<el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
<!--表单信息-->

2
ruoyi-ui/src/views/flowable/task/todo/detail/flowview.vue
View File

@ -41,7 +41,7 @@ export default {
container: this.$refs.flowCanvas,
height: 'calc(100vh - 200px)',
});
this.loadFlowCanvas(newVal)
this.loadFlowCanvas(newVal);
}
},
immediate: true, // 立即生效

2
ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
View File

@ -5,7 +5,7 @@
<span class="el-icon-document">待办任务</span>
<el-tag style="margin-left:10px">发起人:{{ startUser }}</el-tag>
<el-tag>任务节点:{{ taskName }}</el-tag>
<el-button style="float: right;" size="mini" type="primary" @click="goBack">关闭</el-button>
<el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
</div>
<el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
<!--表单信息-->