diff --git a/src/views/bg/bgpartymatter/BgPartymatter.data.ts b/src/views/bg/bgpartymatter/BgPartymatter.data.ts index c772671..9ef2e50 100644 --- a/src/views/bg/bgpartymatter/BgPartymatter.data.ts +++ b/src/views/bg/bgpartymatter/BgPartymatter.data.ts @@ -5,6 +5,11 @@ import { render } from '/@/utils/common/renderUtils'; import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ + { + title: '督办次数', + align:"center", + dataIndex: 'superviseCount' + }, { title: '年份', align:"center", @@ -59,11 +64,6 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'bpmStatus' }, - { - title: '督办次数', - align:"center", - dataIndex: 'superviseCount' - }, { title: '要求完成日期', align:"center", @@ -83,15 +83,20 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'isNeedAppro', customRender:({text}) => { - return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + return render.renderSwitch(text, [{text:'是',value:'1'},{text:'否',value:'0'}]) }, }, + { + title: '所办领导', + align:"center", + dataIndex: 'supDeptleaderid_dictText' + }, { title: '是否抄送所领导', align:"center", dataIndex: 'isNeedSuoleader', customRender:({text}) => { - return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + return render.renderSwitch(text, [{text:'是',value:'1'},{text:'否',value:'0'}]) }, }, { @@ -160,6 +165,7 @@ export const superQuerySchema = { deadline: {title: '要求完成日期',order: 10,view: 'date', type: 'string',}, urgencyLevel: {title: '紧急程度',order: 11,view: 'text', type: 'string',}, isNeedAppro: {title: '是否需要所办领导审批',order: 12,view: 'switch', type: 'string',}, - isNeedSuoleader: {title: '是否抄送所领导',order: 13,view: 'switch', type: 'string',}, - suoleaderid: {title: '抄送所领导',order: 14,view: 'sel_user', type: 'string',}, + supDeptleaderid: {title: '所办领导',order: 13,view: 'sel_user', type: 'string',}, + isNeedSuoleader: {title: '是否抄送所领导',order: 14,view: 'switch', type: 'string',}, + suoleaderid: {title: '抄送所领导',order: 15,view: 'sel_user', type: 'string',}, }; diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue index 0d4e187..54d417d 100644 --- a/src/views/bg/bgpartymatter/BgPartymatterList.vue +++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue @@ -69,9 +69,6 @@ import { columns, superQuerySchema } from './BgPartymatter.data'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './BgPartymatter.api'; - const FLOW_CODE = 'dev_task_task_001'; - const BUSINESS_TABLE_NAME = 'bg_partymatter'; - const FORM_URL = 'bgpartymatter/components/BgPartymatterForm'; const [registerBpmModal, { openModal: bpmPicModal }] = useModal(); const formRef = ref(); @@ -240,18 +237,27 @@ intervalType: options.intervalType, startCount: options.startCount, taskTask: { - flowCode: FLOW_CODE, + //重复督办字段 triggerType: options.triggerType, + startTime: options.intervalStartTime, + //流程相关字段 + flowCode: 'dev_task_task_001', + formUrl: 'bgpartymatter/components/BgPartymatterForm', + flowName: '党委会决议事项', + // jsonData: { deptid: 'xxx', deptname: 'xxxx1' }, + jsonData: record, + //台账相关字段 + businessTablename: 'bg_partymatter', businessId: record.id, - businessTablename: BUSINESS_TABLE_NAME, + // deptLeaderId: 'sdw01', + title: record.title, content: record.content, urgencyLevel: record.urgencyLevel, deptId: record.responDeptid, + deptLeaderId: record.responDeptid, requireFinishDate: formatDate(record.deadline, 'YYYY-MM-DD'), - startTime: options.intervalStartTime, deadline: formatDate(record.deadline, 'YYYY-MM-DD HH:mm:ss'), - formUrl: FORM_URL, }, }; @@ -262,7 +268,7 @@ async function handlePreviewPic(record) { bpmPicModal(true, { - flowCode: FLOW_CODE, + flowCode: 'dev_task_task_001', dataId: record.id, }); } diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue index 07cf6c6..13d67ba 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue @@ -74,6 +74,11 @@ + + + + +