diff --git a/src/views/dq/inspectTask/DqInspectTask.data.ts b/src/views/dq/inspectTask/DqInspectTask.data.ts index 3d54ca2..c8337ef 100644 --- a/src/views/dq/inspectTask/DqInspectTask.data.ts +++ b/src/views/dq/inspectTask/DqInspectTask.data.ts @@ -172,7 +172,7 @@ export const dqInspectProgressColumns: JVxeColumn[] = [ // 高级查询数据 export const superQuerySchema = { - problemId: {title: '具体问题ID',order: 0,view: 'text', type: 'string',}, + problemId: {title: '具体问题',order: 0,view: 'text', type: 'string',}, secretLevel: {title: '密级',order: 1,view: 'list', type: 'string',dictCode: 'secret_level',}, improveMeasure: {title: '整改措施',order: 2,view: 'text', type: 'string',}, deadline: {title: '完成时限',order: 3,view: 'date', type: 'string',}, @@ -186,7 +186,7 @@ export const superQuerySchema = { inspectionStatus: {title: '检查情况',order: 11,view: 'text', type: 'string',}, supervisoryOpinion: {title: '监督意见',order: 12,view: 'text', type: 'string',}, measureCount: {title: '措施数量',order: 13,view: 'number', type: 'number',}, - bpmProcessId: {title: '流程实例ID',order: 14,view: 'text', type: 'string',}, + bpmProcessId: {title: '流程实例',order: 14,view: 'text', type: 'string',}, bpmStatus: {title: '流程状态',order: 15,view: 'list', type: 'string',dictCode: 'super_status',}, taskStatus: {title: '整改状态',order: 16,view: 'text', type: 'string',}, superviseCount: {title: '督办次数',order: 17,view: 'text', type: 'string',}, @@ -196,9 +196,9 @@ export const superQuerySchema = { title: '工作进展反馈', view: 'table', fields: { - feedbackDeptId: {title: '反馈部门ID',order: 0,view: 'text', type: 'string',}, + feedbackDeptId: {title: '反馈部门',order: 0,view: 'text', type: 'string',}, feedbackDeptName: {title: '反馈部门名称',order: 1,view: 'text', type: 'string',}, - feedbackPersonId: {title: '反馈人ID',order: 2,view: 'text', type: 'string',}, + feedbackPersonId: {title: '反馈人',order: 2,view: 'text', type: 'string',}, feedbackPersonName: {title: '反馈人姓名',order: 3,view: 'text', type: 'string',}, actualTime: {title: '实际完成时间',order: 4,view: 'datetime', type: 'string',}, workProgress: {title: '工作进展',order: 5,view: 'text', type: 'string',}, @@ -254,7 +254,7 @@ export const ledgerColumns: BasicColumn[] = [ { title: '措施责任领导', align:"center", - dataIndex: 'measureResDept_dictText' + dataIndex: 'measureResLeader_dictText' }, { title: '密级', diff --git a/src/views/dq/inspectTask/DqInspectTaskList.vue b/src/views/dq/inspectTask/DqInspectTaskList.vue index 5e3c6a2..a3e10f9 100644 --- a/src/views/dq/inspectTask/DqInspectTaskList.vue +++ b/src/views/dq/inspectTask/DqInspectTaskList.vue @@ -6,7 +6,7 @@ - + @@ -150,7 +150,6 @@ import { downloadFile } from '/@/utils/common/renderUtils'; import { useMessage } from '/@/hooks/web/useMessage'; import Icon from '/@/components/Icon/index'; - import JInput from '/@/components/Form/src/jeecg/components/JInput.vue'; import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue'; import DeptRoleUserSelectDropDown from '/@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue'; import { PARTY_COMMITTEE_DEPT_ID, CHARGE_LEADER_ROLE_ID } from '/@/constant/supervision'; @@ -386,12 +385,12 @@ */ function getFlowMenuList(record) { const list: any[] = []; - // if ((record.bpmStatus == '1' || !record.bpmStatus) && record.completedStage === 0) { - list.push({ text: '发起巡视整改流程', icon: 'ant-design:play-circle-outlined', event: 'process', onClick: handleProcess.bind(null, record) }); - // } - // if (record.bpmStatus && record.bpmStatus !== '1' && record.completedStage === 2) { - list.push({ text: '发起销号流程', icon: 'ant-design:stop-outlined', event: 'deleteProcess', onClick: handleDeleteProcess.bind(null, record) }); - // } + if ((record.bpmStatus == '1' || !record.bpmStatus) && record.completedStage === 0) { + list.push({ text: '发起巡视整改流程', icon: 'ant-design:play-circle-outlined', event: 'process', onClick: handleProcess.bind(null, record) }); + } + if (record.bpmStatus && record.bpmStatus !== '1' && record.completedStage === 2) { + list.push({ text: '发起销号流程', icon: 'ant-design:stop-outlined', event: 'deleteProcess', onClick: handleDeleteProcess.bind(null, record) }); + } list.push({ text: '查询督办流程', icon: 'ant-design:search-outlined', @@ -399,26 +398,26 @@ divider: true, onClick: handleQueryProcess.bind(null, record), }); - // if (!record.bpmStatus || record.bpmStatus == '1') { - // list.push({ - // text: '调整为未发起巡视整改流程状态', - // icon: 'ant-design:rollback-outlined', - // event: 'adj0', - // onClick: () => adjustCompletedStage(record, 0), - // }); - // list.push({ - // text: '调整为未发起销号流程状态', - // icon: 'ant-design:check-circle-outlined', - // event: 'adj2', - // onClick: () => adjustCompletedStage(record, 2), - // }); - // list.push({ - // text: '调整为已完成销号流程状态', - // icon: 'ant-design:check-circle-outlined', - // event: 'adj4', - // onClick: () => adjustCompletedStage(record, 4), - // }); - //} + if (!record.bpmStatus || record.bpmStatus == '1') { + list.push({ + text: '调整为未发起巡视整改流程状态', + icon: 'ant-design:rollback-outlined', + event: 'adj0', + onClick: () => adjustCompletedStage(record, 0), + }); + list.push({ + text: '调整为未发起销号流程状态', + icon: 'ant-design:check-circle-outlined', + event: 'adj2', + onClick: () => adjustCompletedStage(record, 2), + }); + list.push({ + text: '调整为已完成销号流程状态', + icon: 'ant-design:check-circle-outlined', + event: 'adj4', + onClick: () => adjustCompletedStage(record, 4), + }); + } return list; } diff --git a/src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue b/src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue index 431f8b5..7a4a18e 100644 --- a/src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue +++ b/src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue @@ -6,6 +6,7 @@ 立即发起 重复发起 +
立即发起：仅发起一次；重复发起：按周期重复发起