From 9852470ebbc2e56e19ba9432d8d3296abb1c9a9f Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Wed, 30 Oct 2024 18:00: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            | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue
index d6dfd59..106bfc3 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue
@@ -34,42 +34,48 @@ export default defineComponent({
     function getMergeHeaderColumns(): BasicColumn[] {
       return [
         {
-          title: 'ID',
-          dataIndex: 'id',
-          width: 300,
-        },
-        {
-          title: '姓名',
+          title: '单位名称',
           dataIndex: 'name',
           width: 300,
           edit: true
         },
         {
-          title: '地址',
+          title: '分年度预算',
           width: 120,
+          edit: true,
           children: [
             {
-              title: '地址',
+              title: '2025年',
               dataIndex: 'address',
               key: 'address',
               width: 200,
+              edit: true,
             },
-            {
-              title: '编号',
+            /*{
+              title: '2026年',
               dataIndex: 'no',
               key: 'no',
+              edit: true
             },
+            {
+              title: '2027年',
+              dataIndex: 'no',
+              key: 'no',
+              edit: true
+            },*/
           ],
         },
         {
-          title: '开始时间',
+          title: '小计',
           dataIndex: 'beginTime',
           width: 200,
+          edit: true,
         },
         {
           title: '结束时间',
           dataIndex: 'endTime',
           width: 200,
+          edit: true,
         },
       ];
     }