diff --git a/src/views/bg/bqtakepulse/BgTakepulse.data.ts b/src/views/bg/bqtakepulse/BgTakepulse.data.ts index ab8da79..ca16076 100644 --- a/src/views/bg/bqtakepulse/BgTakepulse.data.ts +++ b/src/views/bg/bqtakepulse/BgTakepulse.data.ts @@ -6,28 +6,23 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types' import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ - { - title: '密级', - align:"center", - dataIndex: 'secretLevel_dictText' - }, - { - title: '年份', - align:"center", - dataIndex: 'year_dictText' - }, + { + title: '年份', + align:"center", + dataIndex: 'year_dictText' + }, { title: '序号', align:"center", dataIndex: 'number' }, { - title: '会议类型:行政线、技术线', + title: '会议类型', align:"center", dataIndex: 'taskType_dictText' }, { - title: '类别:党的建设等其他', + title: '类别', align:"center", dataIndex: 'type' }, @@ -71,7 +66,7 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'isAdopt', customRender:({text}) => { - return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + return render.renderSwitch(text, [{text:'是',value:'1'},{text:'否',value:'0'}]) }, }, { @@ -79,6 +74,15 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'measure' }, + { + title: '要求完成日期', + align:"center", + dataIndex: 'deadline', + customRender:({text}) =>{ + text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text); + return text; + }, + }, { title: '措施数量', align:"center", @@ -89,25 +93,16 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'achievement' }, - { - title: '要求完成日期', - align:"center", - dataIndex: 'deadline', - customRender:({text}) =>{ - text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text); - return text; - }, - }, { title: '备注', align:"center", dataIndex: 'remark' }, - { - title: '执行情况', - align:"center", - dataIndex: 'actualExect' - }, + // { + // title: '执行情况', + // align:"center", + // dataIndex: 'actualExect' + // }, { title: '实际完成时间', align:"center", @@ -123,11 +118,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'bpmStatus_dictText' }, - { - title: '调整落实措施及执行情况', - align:"center", - dataIndex: 'actSt' - }, + // { + // title: '调整落实措施及执行情况', + // align:"center", + // dataIndex: 'actSt' + // }, { title: '督办次数', align:"center", @@ -136,21 +131,13 @@ export const columns: BasicColumn[] = [ { title: '紧急程度', align:"center", - dataIndex: 'urgencyLevel' + dataIndex: 'urgencyLevel_dictText' }, - { - title: '是否需要所办领导审批', + { + title: '密级', align:"center", - dataIndex: 'isNeedAppro', - customRender:({text}) => { - return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) - }, - }, - { - title: '所办领导', - align:"center", - dataIndex: 'supDeptleaderid_dictText' - }, + dataIndex: 'secretLevel_dictText' + }, ]; //子表表格配置 diff --git a/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue b/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue index f8ba410..a508f90 100644 --- a/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue +++ b/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue @@ -125,9 +125,9 @@ - - - + + +