diff --git a/src/views/dq/inspectTask/DqInspectTask.data.ts b/src/views/dq/inspectTask/DqInspectTask.data.ts index 9dda870..3d54ca2 100644 --- a/src/views/dq/inspectTask/DqInspectTask.data.ts +++ b/src/views/dq/inspectTask/DqInspectTask.data.ts @@ -6,106 +6,106 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types' import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ - { + { title: '具体问题', - align:"center", + align: 'center', dataIndex: 'problemId', customRender: ({ text, record }) => record.problemId_dictText || text, - }, - { + }, + { title: '密级', - align:"center", - dataIndex: 'secretLevel_dictText' - }, - { + align: 'center', + dataIndex: 'secretLevel_dictText', + }, + { title: '整改措施', - align:"center", - dataIndex: 'improveMeasure' - }, - { + align: 'center', + dataIndex: 'improveMeasure', + }, + { title: '完成时限', - align:"center", + align: 'center', dataIndex: 'deadline', - customRender:({text}) =>{ - text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text); + customRender: ({ text }) => { + text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text; return text; }, - }, - { + }, + { title: '目标节点', - align:"center", - dataIndex: 'targetNode' - }, - { - title: '措施责任领导', - align:"center", - dataIndex: 'measureResLeader_dictText' - }, - { + align: 'center', + dataIndex: 'targetNode', + }, + { title: '措施责任部门', - align:"center", - dataIndex: 'measureResDept_dictText' - }, - { + align: 'center', + dataIndex: 'measureResDept_dictText', + }, + { + title: '措施责任领导', + align: 'center', + dataIndex: 'measureResLeader_dictText', + }, + { title: '整改交付成果', - align:"center", - dataIndex: 'rectificationEvidence' - }, - { + align: 'center', + dataIndex: 'rectificationEvidence', + }, + { title: '成效评价标准', - align:"center", - dataIndex: 'evaluationCriterion' - }, - { + align: 'center', + dataIndex: 'evaluationCriterion', + }, + { title: '是否需要党群领导审批', - align:"center", - dataIndex: 'isNeedAppro_dictText' - }, - { + align: 'center', + dataIndex: 'isNeedAppro_dictText', + }, + { title: '党群领导', - align:"center", - dataIndex: 'supDeptleaderid_dictText' - }, - { + align: 'center', + dataIndex: 'supDeptleaderid_dictText', + }, + { title: '检查情况', - align:"center", - dataIndex: 'inspectionStatus' - }, - { + align: 'center', + dataIndex: 'inspectionStatus', + }, + { title: '监督意见', - align:"center", - dataIndex: 'supervisoryOpinion' - }, - { + align: 'center', + dataIndex: 'supervisoryOpinion', + }, + { title: '措施数量', - align:"center", - dataIndex: 'measureCount' - }, - { + align: 'center', + dataIndex: 'measureCount', + }, + { title: '流程实例ID', - align:"center", - dataIndex: 'bpmProcessId' - }, - { + align: 'center', + dataIndex: 'bpmProcessId', + }, + { title: '流程状态', - align:"center", - dataIndex: 'bpmStatus_dictText' - }, - { + align: 'center', + dataIndex: 'bpmStatus_dictText', + }, + { title: '整改状态', - align:"center", - dataIndex: 'taskStatus' - }, - { + align: 'center', + dataIndex: 'taskStatus', + }, + { title: '督办次数', - align:"center", - dataIndex: 'superviseCount' - }, - { + align: 'center', + dataIndex: 'superviseCount', + }, + { title: '排序', - align:"center", - dataIndex: 'sortNo' - }, + align: 'center', + dataIndex: 'sortNo', + }, ]; //子表表格配置 @@ -231,21 +231,36 @@ export const ledgerColumns: BasicColumn[] = [ dataIndex: 'specificName', customCell: mergeCell('_specificRowSpan'), }, + { + title: '整改措施', + align:"center", + dataIndex: 'improveMeasure' + }, { title: '巡视建议', align:"center", dataIndex: 'inspectAdvice' }, + { + title: '分管所领导', + align:"center", + dataIndex: 'chargeLeaderId_dictText' + }, + { + title: '措施责任部门', + align:"center", + dataIndex: 'measureResDept_dictText' + }, + { + title: '措施责任领导', + align:"center", + dataIndex: 'measureResDept_dictText' + }, { title: '密级', align:"center", dataIndex: 'secretLevel_dictText' }, - { - title: '整改措施', - align:"center", - dataIndex: 'improveMeasure' - }, { title: '完成时限', align:"center", @@ -260,16 +275,6 @@ export const ledgerColumns: BasicColumn[] = [ align:"center", dataIndex: 'targetNode' }, - { - title: '措施责任领导', - align:"center", - dataIndex: 'measureResLeader_dictText' - }, - { - title: '措施责任部门', - align:"center", - dataIndex: 'measureResDept_dictText' - }, { title: '整改交付成果', align:"center", diff --git a/src/views/dq/inspectTask/DqInspectTaskList.vue b/src/views/dq/inspectTask/DqInspectTaskList.vue index dd29afa..c25b1fb 100644 --- a/src/views/dq/inspectTask/DqInspectTaskList.vue +++ b/src/views/dq/inspectTask/DqInspectTaskList.vue @@ -2,21 +2,24 @@