diff --git a/src/views/bg/bqtakepulse/BgTakepulse.data.ts b/src/views/bg/bqtakepulse/BgTakepulse.data.ts index 35f1998..6dc25db 100644 --- a/src/views/bg/bqtakepulse/BgTakepulse.data.ts +++ b/src/views/bg/bqtakepulse/BgTakepulse.data.ts @@ -179,6 +179,22 @@ export const bgTakepulseFeedbackColumns: JVxeColumn[] = [ placeholder: '请输入${title}', defaultValue:'', }, + { + title: '计划完成目标', + key: 'planExect', + type: JVxeTypes.textarea, + width:"220px", + placeholder: '请输入${title}', + defaultValue:'', + }, + { + title: '计划完成日期', + key: 'planTime', + type: JVxeTypes.date, + width:"140px", + placeholder: '请选择${title}', + defaultValue:'', + }, { title: '实际执行情况', key: 'actualExect', @@ -268,13 +284,15 @@ export const superQuerySchema = { responDeptname: {title: '责任部门名称',order: 1,view: 'text', type: 'string',}, responPersonid: {title: '反馈人id',order: 2,view: 'text', type: 'string',}, responPersonname: {title: '反馈人姓名',order: 3,view: 'text', type: 'string',}, - actualExect: {title: '实际执行情况',order: 4,view: 'textarea', type: 'string',}, - actualTime: {title: '实际完成时间',order: 5,view: 'datetime', type: 'string',}, - actSt: {title: '调整落实措施及执行情况',order: 6,view: 'textarea', type: 'string',}, - bpmStatus: {title: '完成状态',order: 7,view: 'text', type: 'string',}, - proposerConfirm: {title: '提出人确认',order: 8,view: 'text', type: 'string',}, - bpmProcessId: {title: '流程实例id',order: 9,view: 'text', type: 'string',}, - mainId: {title: '外键',order: 11,view: 'text', type: 'string',}, + planExect: {title: '计划完成目标',order: 4,view: 'textarea', type: 'string',}, + planTime: {title: '计划完成日期',order: 5,view: 'date', type: 'string',}, + actualExect: {title: '实际执行情况',order: 6,view: 'textarea', type: 'string',}, + actualTime: {title: '实际完成时间',order: 7,view: 'datetime', type: 'string',}, + actSt: {title: '调整落实措施及执行情况',order: 8,view: 'textarea', type: 'string',}, + bpmStatus: {title: '完成状态',order: 9,view: 'text', type: 'string',}, + proposerConfirm: {title: '提出人确认',order: 10,view: 'text', type: 'string',}, + bpmProcessId: {title: '流程实例id',order: 11,view: 'text', type: 'string',}, + mainId: {title: '外键',order: 12,view: 'text', type: 'string',}, } }, }; diff --git a/src/views/bg/bqtakepulse/BgTakepulseList.vue b/src/views/bg/bqtakepulse/BgTakepulseList.vue index 7af3d29..624c0d5 100644 --- a/src/views/bg/bqtakepulse/BgTakepulseList.vue +++ b/src/views/bg/bqtakepulse/BgTakepulseList.vue @@ -112,7 +112,7 @@ :dataSource="getFeedbackTableData(record)" :loading="getFeedbackTableLoading(record)" :pagination="false" - :scroll="{ x: 1320 }" + :scroll="{ x: 1780 }" >