diff --git a/src/views/ProcessApprovalSubPage/component/fieldChangeDetail.vue b/src/views/ProcessApprovalSubPage/component/fieldChangeDetail.vue
index 97e5364..7230e77 100644
--- a/src/views/ProcessApprovalSubPage/component/fieldChangeDetail.vue
+++ b/src/views/ProcessApprovalSubPage/component/fieldChangeDetail.vue
@@ -16,102 +16,115 @@
\ No newline at end of file
+ .first {
+ padding-top: 20px;
+ margin-top: 20px;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
+ }
+
diff --git a/src/views/projectBoard/liangShaiKanBan/index.vue b/src/views/projectBoard/liangShaiKanBan/index.vue
new file mode 100644
index 0000000..0b28525
--- /dev/null
+++ b/src/views/projectBoard/liangShaiKanBan/index.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/projectBoard/liangShaiKanBan/liangShaiKanBan.api.ts b/src/views/projectBoard/liangShaiKanBan/liangShaiKanBan.api.ts
new file mode 100644
index 0000000..1af3683
--- /dev/null
+++ b/src/views/projectBoard/liangShaiKanBan/liangShaiKanBan.api.ts
@@ -0,0 +1,24 @@
+import { defHttp } from '@/utils/http/axios';
+
+export enum Api {
+ getSuperLeaderApproveInfo = '/workflow/getSuperLeaderApproveInfo',
+
+ getURTUnApprovedDaysPage = "/workflow/getURTUnApprovedDaysPage",
+ showCountBoardByAdminDivision = "/huzhouProject/showCountBoardByAdminDivision",
+
+ countStageByRefrom= "/huzhouProject/countStageByRefrom",
+ getStagePage = "/huzhouProject/getStagePage",
+}
+/**
+ * 总体看板
+ */
+
+export const countStageByRefrom = (params?) => defHttp.get({ url: Api.countStageByRefrom,params})
+export const getStagePage = (params?) => defHttp.get({ url: Api.getStagePage,params})
+// export const getDimensionPageSorted = (params) => defHttp.get({ url: Api.getDgetStagePageimensionPageSorted,params })
+// export const getPageSorted = (params) => defHttp.get({ url: Api.getPageSorted,params })
+
+// export const submitplaninfoUploadFile = (params?) =>defHttp.post({ url: Api.submitplaninfoUploadFile,headers:{ "Content-Type": "multipart/form-data" }, params })
+
+
+
diff --git a/src/views/projectBoard/liangShaiKanBan/liangShaiKanBan.data.ts b/src/views/projectBoard/liangShaiKanBan/liangShaiKanBan.data.ts
new file mode 100644
index 0000000..ee324e9
--- /dev/null
+++ b/src/views/projectBoard/liangShaiKanBan/liangShaiKanBan.data.ts
@@ -0,0 +1,242 @@
+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();
+
+ let uniqueList = [...new Set(dutyWorkplaceOption)];
+
+ let res = uniqueList.map((item) => {
+ return {
+ label: item,
+ value: item,
+ };
+ });
+ console.log('wwres', res);
+
+ return res;
+}
+export const huizongcolumns: BasicColumn[] = [
+
+ {
+ title: '改革所属项目',
+ dataIndex: 'reformName',
+ format: 'dict|reformTasks',
+ resizable: true
+ },
+ {
+ title: '任务牵头处室',
+ dataIndex: 'superLeader',
+ format: 'dict|superLeader',
+ resizable: true
+ },
+ {
+ title: '项目总数',
+ dataIndex: 'projectNum',
+ },
+ {
+ title: '项目立项阶段(联审)',
+ dataIndex: 'reviewNum',
+ },
+ {
+ title: '项目立项阶段(核验)',
+ dataIndex: 'verifyNum',
+ },
+ {
+ title: '项目立项阶段(立项)',
+ dataIndex: 'approvalNum',
+ },
+ {
+ title: '项目立项阶段数量',
+ dataIndex: 'proposalNum',
+ },
+ {
+ title: '项目采购阶段数量',
+ dataIndex: 'purchaseNum',
+ },
+ {
+ title: '项目建设阶段数量',
+ dataIndex: 'buildNum',
+ },
+ {
+ title: '项目验收阶段数量',
+ dataIndex: 'acceptanceNum',
+ },
+
+];
+
+export const liangshaicolumns: BasicColumn[] = [
+ {
+ title: '改革所属项目',
+ dataIndex: 'reformName',
+ format: 'dict|reformTasks',
+ resizable: true
+ },
+ {
+ title: '任务牵头处室',
+ dataIndex: 'superLeader',
+ format: 'dict|superLeader',
+ resizable: true
+ },
+ {
+ title: '项目名称',
+ dataIndex: 'projectName',
+ },
+ {
+ title: '责任单位',
+ dataIndex: 'dutyWorkplace',
+ },
+ {
+ title: '申报阶段',
+ dataIndex: 'declareStage',
+ format: 'dict|CompletionStatus',
+
+ },
+ {
+ title: '立项阶段(联审)',
+ dataIndex: 'reviewStage',
+ format: 'dict|CompletionStatus',
+
+ },
+ {
+ title: '立项阶段(核验)',
+ dataIndex: 'verifyStage',
+ format: 'dict|CompletionStatus',
+
+ },
+ {
+ title: '立项阶段(立项)',
+ dataIndex: 'approvalStage',
+ format: 'dict|CompletionStatus',
+
+ },
+ {
+ title: '采购阶段',
+ dataIndex: 'purchaseStage',
+ format: 'dict|CompletionStatus',
+
+ },
+ {
+ title: '建设阶段',
+ dataIndex: 'buildStage',
+ format: 'dict|CompletionStatus',
+
+ },
+ {
+ title: '验收阶段',
+ dataIndex: 'acceptanceStage',
+ format: 'dict|CompletionStatus',
+
+ },
+
+];
+
+export const searchFormSchema: FormSchema[] = [
+ {
+ label: '项目名称',
+ field: 'projectName',
+ component: 'Input',
+ labelWidth: 'auto'
+ //colProps: { span: 6 },
+ },
+ {
+ label: '行政区划',
+ field: 'adminDivision',
+ component: 'Select',
+ labelWidth: 'auto',
+ componentProps: {
+ options: [
+ {
+ label: "市本级",
+ value: "市本级"
+ },
+ {
+ label: "吴兴区",
+ value: "吴兴区"
+ },
+ {
+ label: "南浔区",
+ value: "南浔区"
+ },
+ {
+ label: "德清县",
+ value: "德清县"
+ },
+ {
+ label: "长兴县",
+ value: "长兴县"
+ },
+ {
+ label: "安吉县",
+ value: "安吉县"
+ },
+ ]
+ }
+ //colProps: { span: 6 },
+ },
+ {
+ //标题名称
+ label: '责任单位',
+ //字段
+ field: 'dutyWorkplace',
+ //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType
+ component: 'ApiSelect',
+ componentProps: () => {
+ return {
+ api: () =>getDutyWorkplaceOptions()
+ }
+ },
+ labelWidth: 'auto'
+ },
+ {
+ //标题名称
+ label: '单位属性',
+ //字段
+ field: 'workplaceProperties',
+ //组件 支持组件详见 components/Form/src/types/index.ts 中的 ComponentType
+ component: 'Select',
+ componentProps: {
+ options: [
+ {
+ label: "医疗机构",
+ value: "医疗机构"
+ },
+ {
+ label: "卫生行政部门",
+ value: "卫生行政部门"
+ }
+ ]
+ },
+ labelWidth: 'auto'
+ },
+ {
+ field: 'reformName',
+ label: '改革所属项目',
+ component: 'DictSelect',
+ componentProps: {
+ dictType: 'reformTasks',
+ },
+ itemProps: { validateTrigger: 'blur' },
+ labelWidth: 'auto'
+ },
+ {
+ field: 'superLeader',
+ label: '上级指导处室',
+ component: 'DictSelect',
+ componentProps: {
+ dictType: 'superLeader',
+ },
+ labelWidth: 'auto'
+
+ },
+ // {
+ // field: 'stage',
+ // label: '项目状态',
+ // component: 'DictSelect',
+ // componentProps: {
+ // dictType: 'projectStage',
+ // },
+ // labelWidth: 'auto'
+
+ // },
+];
\ No newline at end of file
diff --git a/src/views/projectBoard/urt/urt/urt.data.ts b/src/views/projectBoard/urt/urt/urt.data.ts
index ad461b1..0680b3b 100644
--- a/src/views/projectBoard/urt/urt/urt.data.ts
+++ b/src/views/projectBoard/urt/urt/urt.data.ts
@@ -49,7 +49,21 @@ export const urtgcolumns: BasicColumn[] = [
dataIndex: 'sgaj',
ellipsis: false,
-}
+},
+{
+ title: '是否完成',
+ dataIndex: 'isfinish',
+ customRender: ({ record }) => {
+ if (record.isfinish == 1) {
+ return "审批中"
+ } else if (record.isfinish == 2) {
+ return "已完成"
+ } else {
+ return "未完成"
+ }
+
+ },
+},
];
export const urtFormSchema: FormSchema[] = [
{
diff --git a/src/views/projectLib/projectInfo/projectInfo.data.ts b/src/views/projectLib/projectInfo/projectInfo.data.ts
index 6df196a..00f8429 100644
--- a/src/views/projectLib/projectInfo/projectInfo.data.ts
+++ b/src/views/projectLib/projectInfo/projectInfo.data.ts
@@ -310,6 +310,7 @@ export const formSchemas: FormSchema[] = [
//步数
step: 1,
min: 0,
+
},
//一列占比总共24,比如一行显示2列
colProps: { span: 12 },
diff --git a/src/views/projectLib/projectInfoHistory/projectInfoHistory.data.ts b/src/views/projectLib/projectInfoHistory/projectInfoHistory.data.ts
index 889bdfc..ec1369c 100644
--- a/src/views/projectLib/projectInfoHistory/projectInfoHistory.data.ts
+++ b/src/views/projectLib/projectInfoHistory/projectInfoHistory.data.ts
@@ -5,7 +5,25 @@ const dictStore = useDictStore();
const reformTasksDicts: Array