DZ/faw-report-library-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】权限申请流程修改页面

Browse Source
This commit is contained in:
zhoulingpo
2023-04-24 11:51:30 +08:00
parent 3d69b7266b
commit fea8f7893b
6 changed files with 74 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/modules/process.js
+1 -1
View File
@@ -12,7 +12,7 @@ export default {
// 获取审批历史
getHistory (data) {
return request({
url: '/api/lawss/activiti/get_list_by_instance',
url: '/api/get_list_by_instance',
method: 'get',
params: data
})
src/views/permissionApplication/examine.vue
+5 -2
View File
@@ -193,8 +193,11 @@ export default {
},
handleSubmit () {
if (this.$refs.operationRef.submit()) {
// 通过了校验 需要整合参数
console.log('斤斤计较')
// 通过了校验 需要整合参数 拿到原来的dataJson 再把新添加的增进去 在拼成dataJson
let submit= JSON.parse(this.processOld.submitJson)
let dataJson= JSON.parse(this.processOld.dataJson)
let submitJson= {...data , ...this.$refs.operationRef.examineForm}
this.completeProcess(dataJson,submitJson)
}
}
}
src/views/userCenter/processCenter/finishProcess.vue
+8 -3
View File
@@ -7,11 +7,16 @@
{{ rowIndex + (q.current - 1) * q.size + 1 }}
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum"
title="流程编号"></vxe-column>
<vxe-column show-overflow show-header-overflow field="prcType"
title="流程类型">
<template #default="{ row,index }">
<div>{{getPrcName(row.prcType)}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
<template #default="{ row,index }">
<div>{{getPrcName(row.prcName)}}</div>
<div>{{row.prcName}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="creatUser"
src/views/userCenter/processCenter/gencyProcess.vue
+33 -10
View File
@@ -8,10 +8,20 @@
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum"
title="流程编号"></vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
title="流程编号">
<template #default="{ row,index }" >
<div @click.native.prevent="handle(row)">{{row.prcNum}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcType"
title="流程类型">
<template #default="{ row,index }">
<div>{{getPrcName(row.prcName)}}</div>
<div>{{getPrcName(row.prcType)}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
<template #default="{ row,index }" >
<div @click.native.prevent="handle(row)">{{row.prcName}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="creatUserName"
@@ -19,7 +29,7 @@
<vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }">
<el-button @click.native.prevent="handle(scope.$index, tableData)" type="text" size="small">
<el-button @click.native.prevent="handle(row)" type="text" size="small">
办理
</el-button>
</template>
@@ -85,13 +95,26 @@ export default {
this.q.current = val;
this.loadData();
},
handle(type) {
switch (type) {
handle(row) {
switch (row.prcType) {
case '1' :
this.$router.push({
path:'',
query:''
})
if (row.taskDefinitionKey == 'aid3') {
this.$router.push({
path: '/permission/launch',
query: {
id: 'AEHJB8YNJ3',
taskIds:row.taskIds
}
})
}else{
this.$router.push({
path: '/permission/examine',
query: {
id: 'AEHJB8YNJ3',
taskIds:row.taskIds
}
})
}
}
},
},
src/views/userCenter/processCenter/monitorProcesses.vue
+14 -4
View File
@@ -8,10 +8,20 @@
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum"
title="流程编号"></vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
title="流程编号">
<template #default="{ row,index }" @click.native.prevent="view(row)">
<div>{{row.prcNum}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcType"
title="流程类型">
<template #default="{ row,index }">
<div>{{getPrcName(row.prcName)}}</div>
<div>{{getPrcName(row.prcType)}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
<template #default="{ row,index }" @click.native.prevent="view(row)">
<div>{{row.prcName}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="labelOneName"
@@ -25,7 +35,7 @@
<vxe-column show-overflow show-header-overflow field="status" title="状态"></vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }">
<el-button @click.native.prevent="view(row, tableData)" type="text" size="small">
<el-button @click.native.prevent="view(row)" type="text" size="small">
查看
</el-button>
</template>
src/views/userCenter/processCenter/sentProcess.vue
+13 -2
View File
@@ -9,10 +9,21 @@
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum"
title="流程编号"></vxe-column>
title="流程编号">
<template #default="{ row,index }">
<div @click="view(row)">{{row.prcNum}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcType"
title="流程类型">
<template #default="{ row,index }">
<div>{{getPrcName(row.prcType)}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
<template #default="{ row,index }">
<div @click="viewDetails(row)">{{getPrcName(row.prcName)}}</div>
<div @click="view(row)">{{row.prcName}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="creatUserName"