diff --git a/src/views/bg/xispeak/BgXiSpeak.data.ts b/src/views/bg/xispeak/BgXiSpeak.data.ts
index 9f7b973..56b38b2 100644
--- a/src/views/bg/xispeak/BgXiSpeak.data.ts
+++ b/src/views/bg/xispeak/BgXiSpeak.data.ts
@@ -85,30 +85,30 @@ export const columns: BasicColumn[] = [
dataIndex: 'delayRiskMitigation',
},
{
- title: '完成状态(0推进中,1已完成)',
+ title: '完成状态',
align: 'center',
- dataIndex: 'completionStatus',
+ dataIndex: 'completionStatus_dictText',
},
{
- title: '落实部门id',
+ title: '落实部门',
align: 'center',
dataIndex: 'implDept_dictText',
},
- {
- title: '层深(最顶层节点层深为0)',
- align: 'center',
- dataIndex: 'treeDepth',
- },
- {
- title: '同级数据排序号',
- align: 'center',
- dataIndex: 'sortOrder',
- },
- {
- title: '流程引擎状态字段',
- align: 'center',
- dataIndex: 'bpmStatus',
- },
+ // {
+ // title: '层深(最顶层节点层深为0)',
+ // align: 'center',
+ // dataIndex: 'treeDepth',
+ // },
+ // {
+ // title: '同级数据排序号',
+ // align: 'center',
+ // dataIndex: 'sortOrder',
+ // // },
+ // {
+ // title: '流程引擎状态字段',
+ // align: 'center',
+ // dataIndex: 'bpmStatus',
+ // },
{
title: '督办次数',
align: 'center',
@@ -250,7 +250,7 @@ export const superQuerySchema = {
reportFeedbackStatus: { title: '报告反馈情况', order: 13, view: 'text', type: 'string' },
isCompletionRisk: { title: '是否存在完成风险(0不存在,1存在)', order: 14, view: 'number', type: 'number' },
delayRiskMitigation: { title: '拖期风险应对措施', order: 15, view: 'text', type: 'string' },
- completionStatus: { title: '完成状态(0推进中,1已完成)', order: 16, view: 'number', type: 'number' },
+ completionStatus: { title: '完成状态(督办中,1已完成)', order: 16, view: 'number', type: 'number' },
implDept: { title: '落实部门id', order: 17, view: 'sel_depart', type: 'string' },
treeDepth: { title: '层深(最顶层节点层深为0)', order: 18, view: 'number', type: 'number' },
sortOrder: { title: '同级数据排序号', order: 19, view: 'number', type: 'number' },
diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue
index 134e78a..a70d2af 100644
--- a/src/views/bg/xispeak/BgXiSpeakList.vue
+++ b/src/views/bg/xispeak/BgXiSpeakList.vue
@@ -488,6 +488,12 @@
onClick: handleProcessJbr.bind(null, record),
});
}
+ if (record.bpmStatus == '2') {
+ dropDownAction.push({
+ label: '再次发起经办人执行反馈流程',
+ onClick: handleProcessJbr.bind(null, record),
+ });
+ }
return dropDownAction;
}
@@ -617,7 +623,7 @@
await startProcessSchedules(params);
successCount++;
if (successCount === total) {
- await saveOrUpdateDict({ id: record.id, bpmStatus: '2', supervisionCount: nextSuperviseCount }, true);
+ await saveOrUpdateDict({ id: record.id, bpmStatus: '2', supervisionCount: nextSuperviseCount, completionStatus: 0 }, true);
createMessage.success(`成功发起 ${total} 个经办人执行反馈流程`);
reload();
}
@@ -651,7 +657,7 @@
};
await startProcessSchedules(params);
- await saveOrUpdateDict({ id: record.id, bpmStatus: '2', supervisionCount: nextSuperviseCount }, true);
+ await saveOrUpdateDict({ id: record.id, bpmStatus: '2', supervisionCount: nextSuperviseCount, completionStatus: 0 }, true);
createMessage.success('发起成功');
reload();
}
diff --git a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
index 7c57db6..86394de 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
@@ -79,7 +79,7 @@
-
+
@@ -190,6 +190,7 @@
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';
+ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import Icon from '/@/components/Icon/index';
import { bgXiSpeakFeedbackList, saveBpmForm, setProcessVariable } from '../BgXiSpeak.api';
import { usePermission } from '/@/hooks/web/usePermission';
@@ -263,7 +264,7 @@
{ title: '反馈部门名称', dataIndex: 'responDeptname', align: 'center', width: 140 },
{ title: '反馈人姓名', dataIndex: 'responPersonname', align: 'center', width: 120 },
{ title: '措施内容', dataIndex: 'method', align: 'left', width: 200 },
- { title: '完成状态', dataIndex: 'completionStatus', align: 'center', width: 100 },
+ { title: '完成状态', dataIndex: 'completionStatus_dictText', align: 'center', width: 100 },
{ title: '进展情况', dataIndex: 'progress', align: 'left', width: 200 },
{ title: '落实情况', dataIndex: 'implStatus', align: 'left', width: 200 },
{ title: '附件', dataIndex: 'id', key: 'attachments', align: 'left', width: 340 },
diff --git a/src/views/bg/xispeak/components/BgXiSpeakForm.vue b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
index b13197a..44fae12 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
@@ -97,10 +97,7 @@
-
- 推进中
- 已完成
-
+
@@ -142,6 +139,7 @@
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';
+ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { getValueType } from '/@/utils';
import { loadTreeData, saveOrUpdateDict } from '../BgXiSpeak.api';
import { Form } from 'ant-design-vue';