From ff889860cc82af07b78cbee109b2a9b4725d1664 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Wed, 30 Oct 2024 16:12:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E4=B9=A6-=E8=B4=A2=E6=94=BF?=
 =?UTF-8?q?=E6=8B=A8=E6=AC=BE=E3=80=81=E5=B9=B4=E5=BA=A6=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E8=A1=A8=20=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=2010.30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yusuanshu/NianDuYuSuanDemo.vue            | 75 +++++++++++++++++++
 .../kejigongguan/yusuanshu/index.vue          | 14 ++--
 2 files changed, 80 insertions(+), 9 deletions(-)
 create mode 100644 jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue

diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue
new file mode 100644
index 0000000..71d106e
--- /dev/null
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue
@@ -0,0 +1,75 @@
+<template>
+  <div class="p-4">
+    <BasicTable @register="registerTable" />
+  </div>
+</template>
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { BasicColumn, BasicTable } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { demoListApi } from '/@/api/demo/table';
+
+//计算合并表头
+export default defineComponent({
+  components: { BasicTable },
+  setup() {
+
+    // 列表页面公共参数、方法
+    const { tableContext } = useListPage({
+      tableProps: {
+        title: '分组表头示例',
+        api: demoListApi,
+        columns: getMergeHeaderColumns(),
+      },
+    });
+
+    //BasicTable绑定注册
+    const [registerTable] = tableContext;
+
+    function getMergeHeaderColumns(): BasicColumn[] {
+      return [
+        {
+          title: 'ID',
+          dataIndex: 'id',
+          width: 300,
+        },
+        {
+          title: '姓名',
+          dataIndex: 'name',
+          width: 300,
+        },
+        {
+          title: '地址',
+          width: 120,
+          children: [
+            {
+              title: '地址',
+              dataIndex: 'address',
+              key: 'address',
+              width: 200,
+            },
+            {
+              title: '编号',
+              dataIndex: 'no',
+              key: 'no',
+            },
+          ],
+        },
+        {
+          title: '开始时间',
+          dataIndex: 'beginTime',
+          width: 200,
+        },
+        {
+          title: '结束时间',
+          dataIndex: 'endTime',
+          width: 200,
+        },
+      ];
+    }
+    return {
+      registerTable,
+    };
+  },
+});
+</script>
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/index.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/index.vue
index e1c5e0e..7111a8e 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/index.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/index.vue
@@ -7,6 +7,7 @@
         <a-tab-pane key="ProjectBaseInfoDemo" tab="项目基本情况表"></a-tab-pane>
         <a-tab-pane key="DepartBaseInfoDemo" tab="部门基本情况表"></a-tab-pane>
         <a-tab-pane key="ProjectFeeBudgetDemo" tab="项目经费预算表"></a-tab-pane>
+        <a-tab-pane key="NianDuYuSuanDemo" tab="财政拨款、年度预算表"></a-tab-pane>
 <!--        <a-tab-pane key="ZhengWenDemo" tab="正文"></a-tab-pane>-->
 <!--        <a-tab-pane key="XiangMuHeZuoKaiFaDemo" tab="项目合作开发情况"></a-tab-pane>-->
 <!--        <a-tab-pane key="HeZuoDanWeiDemo" tab="合作单位"></a-tab-pane>-->
@@ -30,13 +31,14 @@
   import ProjectBaseInfoDemo from './ProjectBaseInfoDemo.vue';
   import DepartBaseInfoDemo from './DepartBaseInfoDemo.vue';
   import ProjectFeeBudgetDemo from './ProjectFeeBudgetDemo.vue';
-  import XiangMuJiXiaoMuBiaoDemo from '../xiangmushu/XiangMuJiXiaoMuBiaoDemo.vue';
+  import NianDuYuSuanDemo from './NianDuYuSuanDemo.vue';
+/*  import XiangMuJiXiaoMuBiaoDemo from '../xiangmushu/XiangMuJiXiaoMuBiaoDemo.vue';
   import YiJianDemo from '../xiangmushu/YiJianDemo.vue';
   import HeZuoDanWeiDemo from '../xiangmushu/HeZuoDanWeiDemo.vue';
   import ZhuYaoRenYuanDemo from '../xiangmushu/ZhuYaoRenYuanDemo.vue';
   import ZhengWenDemo from '../xiangmushu/ZhengWenDemo.vue';
   import XiangMuHeZuoKaiFaDemo from '../xiangmushu/XiangMuHeZuoKaiFaDemo.vue';
-  import JeecgPdfView from '../xiangmushu/JeecgPdfView.vue';
+  import JeecgPdfView from '../xiangmushu/JeecgPdfView.vue';*/
   import FuJianDemo from '../xiangmushu/FuJianDemo.vue';
   import { useRouter } from 'vue-router';
 
@@ -53,13 +55,7 @@
           ProjectBaseInfoDemo: ProjectBaseInfoDemo,
           DepartBaseInfoDemo: DepartBaseInfoDemo,
           ProjectFeeBudgetDemo: ProjectFeeBudgetDemo,
-          ZhengWenDemo: ZhengWenDemo,
-          XiangMuHeZuoKaiFaDemo: XiangMuHeZuoKaiFaDemo,
-          XiangMuJiXiaoMuBiaoDemo: XiangMuJiXiaoMuBiaoDemo,
-          YiJianDemo: YiJianDemo,
-          HeZuoDanWeiDemo: HeZuoDanWeiDemo,
-          ZhuYaoRenYuanDemo: ZhuYaoRenYuanDemo,
-          JeecgPdfView: JeecgPdfView,
+          NianDuYuSuanDemo: NianDuYuSuanDemo,
           FuJianDemo: FuJianDemo,
         };
         return componentType[activeKey.value];