ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 联调流程中心

Browse Source
This commit is contained in:
lideqin
2023-12-07 19:42:08 +08:00
parent db4ab4aab9
commit 0d1b162b5e
5 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/workCenter.js
+1 -1
View File
@@ -158,7 +158,7 @@ const enStandardStartUseGetDataDraft = (params) => getAction('/process/es/enable
// 流程中心 // 流程中心
// 已发-强制撤回 // 已发-强制撤回
const compulsoryWithdrawal = (params) => postAction('', params) const compulsoryWithdrawal = (params) => postAction('/workCenter/delete', params)
/* 标准法规入库/变更流程 */ /* 标准法规入库/变更流程 */
// 发起 // 发起
src/views/workCenter/processCenter/table/DoneList.vue
+11 -11
View File
@@ -13,15 +13,15 @@
<!-- 流程编号 --> <!-- 流程编号 -->
<a-col :span="6"> <a-col :span="6">
<a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.prcNum"></a-input> <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.id"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 流程类型 todo：流程类型是字典还是什么后端还没确定 --> <!-- 流程类型 -->
<a-col :span="6"> <a-col :span="6">
<a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag <j-dict-select-tag
:placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')" :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')"
dict-code="esp_project_status" dict-code="prc_type"
v-model="queryParam.prcType"> v-model="queryParam.prcType">
</j-dict-select-tag> </j-dict-select-tag>
</a-form-item> </a-form-item>
@@ -81,56 +81,56 @@ export default {
title: this.$t('workCenter.processCenter.processNumber'), title: this.$t('workCenter.processCenter.processNumber'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processNumber', dataIndex: 'id',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 流程类型 { // 流程类型
title: this.$t('workCenter.processCenter.processType'), title: this.$t('workCenter.processCenter.processType'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processType_dictText', dataIndex: 'prcType_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 流程名称 { // 流程名称
title: this.$t('processName'), title: this.$t('processName'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processName', dataIndex: 'prcName',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 发起人 { // 发起人
title: this.$t('workCenter.processCenter.initiator'), title: this.$t('workCenter.processCenter.initiator'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'initiator', dataIndex: 'createUserId_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 当前处理人 { // 当前处理人
title: this.$t('workCenter.processCenter.currentProcessor'), title: this.$t('workCenter.processCenter.currentProcessor'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'currentProcessor', dataIndex: 'handleUserId_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 接收任务时间 { // 接收任务时间
title: this.$t('workCenter.processCenter.receivingTaskTime'), title: this.$t('workCenter.processCenter.receivingTaskTime'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'receivingTaskTime', dataIndex: 'receivedTaskTime',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 完成时间 { // 完成时间
title: this.$t('workCenter.processCenter.finishTime'), title: this.$t('workCenter.processCenter.finishTime'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'finishTime', dataIndex: 'endTime',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 流程状态 { // 流程状态
title: this.$t('workCenter.processCenter.processState'), title: this.$t('workCenter.processCenter.processState'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processState_dictText', dataIndex: 'prcStatus_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ {
src/views/workCenter/processCenter/table/MonitorList.vue
+14 -14
View File
@@ -13,15 +13,15 @@
<!-- 流程编号 --> <!-- 流程编号 -->
<a-col :span="6"> <a-col :span="6">
<a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.prcNum"></a-input> <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.id"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 流程类型 todo：流程类型是字典还是什么后端还没确定 --> <!-- 流程类型 -->
<a-col :span="6"> <a-col :span="6">
<a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag <j-dict-select-tag
:placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')" :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')"
dict-code="esp_project_status" dict-code="prc_type"
v-model="queryParam.prcType"> v-model="queryParam.prcType">
</j-dict-select-tag> </j-dict-select-tag>
</a-form-item> </a-form-item>
@@ -85,63 +85,63 @@ export default {
title: this.$t('workCenter.processCenter.processNumber'), title: this.$t('workCenter.processCenter.processNumber'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processNumber', dataIndex: 'id',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 流程类型 { // 流程类型
title: this.$t('workCenter.processCenter.processType'), title: this.$t('workCenter.processCenter.processType'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processType_dictText', dataIndex: 'prcType_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 流程名称 { // 流程名称
title: this.$t('processName'), title: this.$t('processName'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processName', dataIndex: 'prcName',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 发起人 { // 发起人
title: this.$t('workCenter.processCenter.initiator'), title: this.$t('workCenter.processCenter.initiator'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'initiator', dataIndex: 'createUserId_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 当前处理人 { // 当前处理人
title: this.$t('workCenter.processCenter.currentProcessor'), title: this.$t('workCenter.processCenter.currentProcessor'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'currentProcessor', dataIndex: 'handleUserId_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 接收任务时间 { // 接收任务时间
title: this.$t('workCenter.processCenter.receivingTaskTime'), title: this.$t('workCenter.processCenter.receivingTaskTime'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'receivingTaskTime', dataIndex: 'receivedTaskTime',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 完成时间 { // 完成时间
title: this.$t('workCenter.processCenter.finishTime'), title: this.$t('workCenter.processCenter.finishTime'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'finishTime', dataIndex: 'endTime',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 流程耗时(小时) { // 流程耗时(小时)
title: this.$t('workCenter.processCenter.processTime'), title: this.$t('workCenter.processCenter.processTime'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processTime', dataIndex: 'overTime',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 流程状态 { // 流程状态
title: this.$t('workCenter.processCenter.processState'), title: this.$t('workCenter.processCenter.processState'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processState_dictText', dataIndex: 'prcStatus_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ {
@@ -153,7 +153,7 @@ export default {
} }
], ],
url: { url: {
list: '/process/center/monitorTaskList' list: '/workCenter/getAllList'
} }
} }
}, },
@@ -176,7 +176,7 @@ export default {
// 强制撤回 // 强制撤回
handleWithdrawal (record) { handleWithdrawal (record) {
const params = {} const params = {}
params.processId = this.currentTurnTo.id params.processInstanceId = record.processInstanceId
compulsoryWithdrawal(params).then(res => { compulsoryWithdrawal(params).then(res => {
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message)
src/views/workCenter/processCenter/table/SentList.vue
+15 -15
View File
@@ -13,27 +13,27 @@
<!-- 流程编号 --> <!-- 流程编号 -->
<a-col :span="6"> <a-col :span="6">
<a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.prcNum"></a-input> <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.id"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 流程类型 todo：流程类型是字典还是什么后端还没确定 --> <!-- 流程类型 -->
<a-col :span="6"> <a-col :span="6">
<a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag <j-dict-select-tag
:placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')" :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')"
dict-code="esp_project_status" dict-code="prc_type"
v-model="queryParam.prcType"> v-model="queryParam.prcType">
</j-dict-select-tag> </j-dict-select-tag>
</a-form-item> </a-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus"> <template v-if="toggleSearchStatus">
<!-- 流程状态 todo：流程状态是字典还是什么后端还没确定 --> <!-- 流程状态 -->
<a-col :span="6"> <a-col :span="6">
<a-form-item :label="$t('workCenter.processCenter.processState')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="$t('workCenter.processCenter.processState')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag <j-dict-select-tag
:placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processState')" :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processState')"
dict-code="esp_project_status" dict-code="prc_status"
v-model="queryParam.prcState"> v-model="queryParam.prcStatus">
</j-dict-select-tag> </j-dict-select-tag>
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -101,56 +101,56 @@ export default {
title: this.$t('workCenter.processCenter.processNumber'), title: this.$t('workCenter.processCenter.processNumber'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processNumber', dataIndex: 'id',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 流程类型 { // 流程类型
title: this.$t('workCenter.processCenter.processType'), title: this.$t('workCenter.processCenter.processType'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processType_dictText', dataIndex: 'prcType_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 流程名称 { // 流程名称
title: this.$t('processName'), title: this.$t('processName'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processName', dataIndex: 'prcName',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 发起人 { // 发起人
title: this.$t('workCenter.processCenter.initiator'), title: this.$t('workCenter.processCenter.initiator'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'initiator', dataIndex: 'createUserId_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 当前处理人 { // 当前处理人
title: this.$t('workCenter.processCenter.currentProcessor'), title: this.$t('workCenter.processCenter.currentProcessor'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'currentProcessor', dataIndex: 'handleUserId_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 接收任务时间 { // 接收任务时间
title: this.$t('workCenter.processCenter.receivingTaskTime'), title: this.$t('workCenter.processCenter.receivingTaskTime'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'receivingTaskTime', dataIndex: 'receivedTaskTime',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 完成时间 { // 完成时间
title: this.$t('workCenter.processCenter.finishTime'), title: this.$t('workCenter.processCenter.finishTime'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'finishTime', dataIndex: 'endTime',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ // 流程状态 { // 流程状态
title: this.$t('workCenter.processCenter.processState'), title: this.$t('workCenter.processCenter.processState'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'processState_dictText', dataIndex: 'prcStatus_dictText',
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ {
@@ -186,7 +186,7 @@ export default {
// 强制撤回 // 强制撤回
handleWithdrawal (record) { handleWithdrawal (record) {
const params = {} const params = {}
params.processId = this.currentTurnTo.id params.processInstanceId = record.processInstanceId
compulsoryWithdrawal(params).then(res => { compulsoryWithdrawal(params).then(res => {
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message)
src/views/workCenter/processCenter/table/TodoList.vue
+2 -2
View File
@@ -13,10 +13,10 @@
<!-- 流程编号 --> <!-- 流程编号 -->
<a-col :span="6"> <a-col :span="6">
<a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.prcNum"></a-input> <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.id"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 流程类型 todo：流程类型是字典还是什么后端还没确定 --> <!-- 流程类型 -->
<a-col :span="6"> <a-col :span="6">
<a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag <j-dict-select-tag