diff --git a/src/views/projectBoard/liangShaiKanBan/liangShaiKanBan.data.ts b/src/views/projectBoard/liangShaiKanBan/liangShaiKanBan.data.ts index ee324e9..ae07887 100644 --- a/src/views/projectBoard/liangShaiKanBan/liangShaiKanBan.data.ts +++ b/src/views/projectBoard/liangShaiKanBan/liangShaiKanBan.data.ts @@ -1,12 +1,13 @@ import { FormSchema } from '@/components/Form'; import { BasicColumn } from '@/components/Table'; import { getDutyWorkplaceList } from '@/views/informationSub/countStatistics/countStatistics.api'; + async function getDutyWorkplaceOptions() { - let dutyWorkplaceOption = await getDutyWorkplaceList(); + const dutyWorkplaceOption = await getDutyWorkplaceList(); - let uniqueList = [...new Set(dutyWorkplaceOption)]; + const uniqueList = [...new Set(dutyWorkplaceOption)]; - let res = uniqueList.map((item) => { + const res = uniqueList.map((item) => { return { label: item, value: item, @@ -17,23 +18,26 @@ async function getDutyWorkplaceOptions() { return res; } export const huizongcolumns: BasicColumn[] = [ - { title: '改革所属项目', dataIndex: 'reformName', format: 'dict|reformTasks', - resizable: true + resizable: true, }, { title: '任务牵头处室', dataIndex: 'superLeader', format: 'dict|superLeader', - resizable: true + resizable: true, }, { title: '项目总数', dataIndex: 'projectNum', }, + { + title: '项目申报阶段数量', + dataIndex: 'declareNum', + }, { title: '项目立项阶段(联审)', dataIndex: 'reviewNum', @@ -46,10 +50,6 @@ export const huizongcolumns: BasicColumn[] = [ title: '项目立项阶段(立项)', dataIndex: 'approvalNum', }, - { - title: '项目立项阶段数量', - dataIndex: 'proposalNum', - }, { title: '项目采购阶段数量', dataIndex: 'purchaseNum', @@ -62,7 +62,6 @@ export const huizongcolumns: BasicColumn[] = [ title: '项目验收阶段数量', dataIndex: 'acceptanceNum', }, - ]; export const liangshaicolumns: BasicColumn[] = [ @@ -70,13 +69,13 @@ export const liangshaicolumns: BasicColumn[] = [ title: '改革所属项目', dataIndex: 'reformName', format: 'dict|reformTasks', - resizable: true + resizable: true, }, { title: '任务牵头处室', dataIndex: 'superLeader', format: 'dict|superLeader', - resizable: true + resizable: true, }, { title: '项目名称', @@ -90,45 +89,72 @@ export const liangshaicolumns: BasicColumn[] = [ title: '申报阶段', dataIndex: 'declareStage', format: 'dict|CompletionStatus', - + filters: [ + { text: '已完成', value: '已完成' }, + { text: '进行中', value: '进行中' }, + { text: '未完成', value: '未完成' }, + ], }, { title: '立项阶段(联审)', dataIndex: 'reviewStage', format: 'dict|CompletionStatus', - + filters: [ + { text: '已完成', value: '已完成' }, + { text: '进行中', value: '进行中' }, + { text: '未完成', value: '未完成' }, + ], }, { title: '立项阶段(核验)', dataIndex: 'verifyStage', format: 'dict|CompletionStatus', - + filters: [ + { text: '已完成', value: '已完成' }, + { text: '进行中', value: '进行中' }, + { text: '未完成', value: '未完成' }, + ], }, { title: '立项阶段(立项)', dataIndex: 'approvalStage', format: 'dict|CompletionStatus', - + filters: [ + { text: '已完成', value: '已完成' }, + { text: '进行中', value: '进行中' }, + { text: '未完成', value: '未完成' }, + ], }, { title: '采购阶段', dataIndex: 'purchaseStage', format: 'dict|CompletionStatus', - + filters: [ + { text: '已完成', value: '已完成' }, + { text: '进行中', value: '进行中' }, + { text: '未完成', value: '未完成' }, + ], }, { title: '建设阶段', dataIndex: 'buildStage', format: 'dict|CompletionStatus', - + filters: [ + { text: '已完成', value: '已完成' }, + { text: '进行中', value: '进行中' }, + { text: '未完成', value: '未完成' }, + ], }, { title: '验收阶段', dataIndex: 'acceptanceStage', format: 'dict|CompletionStatus', - + filters: [ + { text: '已完成', value: '已完成' }, + { text: '进行中', value: '进行中' }, + { text: '未完成', value: '未完成' }, + ], }, - ]; export const searchFormSchema: FormSchema[] = [ @@ -136,7 +162,7 @@ export const searchFormSchema: FormSchema[] = [ label: '项目名称', field: 'projectName', component: 'Input', - labelWidth: 'auto' + labelWidth: 'auto', //colProps: { span: 6 }, }, { @@ -147,31 +173,31 @@ export const searchFormSchema: FormSchema[] = [ componentProps: { options: [ { - label: "市本级", - value: "市本级" + label: '市本级', + value: '市本级', }, { - label: "吴兴区", - value: "吴兴区" + label: '吴兴区', + value: '吴兴区', }, { - label: "南浔区", - value: "南浔区" + label: '南浔区', + value: '南浔区', }, { - label: "德清县", - value: "德清县" + label: '德清县', + value: '德清县', }, { - label: "长兴县", - value: "长兴县" + label: '长兴县', + value: '长兴县', }, { - label: "安吉县", - value: "安吉县" + label: '安吉县', + value: '安吉县', }, - ] - } + ], + }, //colProps: { span: 6 }, }, { @@ -183,10 +209,10 @@ export const searchFormSchema: FormSchema[] = [ component: 'ApiSelect', componentProps: () => { return { - api: () =>getDutyWorkplaceOptions() - } + api: () => getDutyWorkplaceOptions(), + }; }, - labelWidth: 'auto' + labelWidth: 'auto', }, { //标题名称 @@ -198,16 +224,16 @@ export const searchFormSchema: FormSchema[] = [ componentProps: { options: [ { - label: "医疗机构", - value: "医疗机构" + label: '医疗机构', + value: '医疗机构', }, { - label: "卫生行政部门", - value: "卫生行政部门" - } - ] + label: '卫生行政部门', + value: '卫生行政部门', + }, + ], }, - labelWidth: 'auto' + labelWidth: 'auto', }, { field: 'reformName', @@ -217,7 +243,7 @@ export const searchFormSchema: FormSchema[] = [ dictType: 'reformTasks', }, itemProps: { validateTrigger: 'blur' }, - labelWidth: 'auto' + labelWidth: 'auto', }, { field: 'superLeader', @@ -226,8 +252,7 @@ export const searchFormSchema: FormSchema[] = [ componentProps: { dictType: 'superLeader', }, - labelWidth: 'auto' - + labelWidth: 'auto', }, // { // field: 'stage', @@ -239,4 +264,4 @@ export const searchFormSchema: FormSchema[] = [ // labelWidth: 'auto' // }, -]; \ No newline at end of file +];