From 53b3e80814278565399510bbb6bbc87ba8ff6a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com>
Date: Mon, 13 Apr 2026 16:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=9C=80=E6=B1=82=E6=8F=90?=
 =?UTF-8?q?=E6=8A=A5=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/PlanYearDemandHdr/components/config.ts     |  6 +++---
 src/views/plan/PlanYearDemandHdr/index.vue          |  4 ++--
 .../plan/PlanYearDemandHdrEc/components/config.ts   |  6 +++---
 .../PlanYearDemandHdrEc/components/createForm.vue   |  2 ++
 src/views/plan/PlanYearDemandHdrEc/index.vue        | 13 ++++++++-----
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/views/plan/PlanYearDemandHdr/components/config.ts b/src/views/plan/PlanYearDemandHdr/components/config.ts
index 2c28b2c..7940574 100644
--- a/src/views/plan/PlanYearDemandHdr/components/config.ts
+++ b/src/views/plan/PlanYearDemandHdr/components/config.ts
@@ -44,7 +44,7 @@ export const columns: BasicColumn[] = [
     title: '年度',
     componentType: 'input',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
 
@@ -53,7 +53,7 @@ export const columns: BasicColumn[] = [
     title: '版本号',
     componentType: 'input',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
 
@@ -89,7 +89,7 @@ export const columns: BasicColumn[] = [
     title: '状态',
     componentType: 'input',
     align: 'left',
-
+    width: 80,
     sorter: true,
   },
 ];
diff --git a/src/views/plan/PlanYearDemandHdr/index.vue b/src/views/plan/PlanYearDemandHdr/index.vue
index 59b5ee9..ff4440c 100644
--- a/src/views/plan/PlanYearDemandHdr/index.vue
+++ b/src/views/plan/PlanYearDemandHdr/index.vue
@@ -104,7 +104,7 @@
       showResetButton: true,
     },
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id',page: params.limit };
     },
     afterFetch: (res) => {
       tableRef.value.setToolBarWidth();
@@ -115,7 +115,7 @@
     
     striped: false,
     actionColumn: {
-      width: 160,
+      width: 140,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },
diff --git a/src/views/plan/PlanYearDemandHdrEc/components/config.ts b/src/views/plan/PlanYearDemandHdrEc/components/config.ts
index 59aeda8..287279a 100644
--- a/src/views/plan/PlanYearDemandHdrEc/components/config.ts
+++ b/src/views/plan/PlanYearDemandHdrEc/components/config.ts
@@ -26,7 +26,7 @@ export const columns: BasicColumn[] = [
     title: '年度',
     componentType: 'input',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
 
@@ -35,7 +35,7 @@ export const columns: BasicColumn[] = [
     title: '版本号',
     componentType: 'input',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
 
@@ -62,7 +62,7 @@ export const columns: BasicColumn[] = [
     title: '状态',
     componentType: 'input',
     align: 'left',
-
+    width: 80,
     sorter: true,
   },
 ];
diff --git a/src/views/plan/PlanYearDemandHdrEc/components/createForm.vue b/src/views/plan/PlanYearDemandHdrEc/components/createForm.vue
index da8c302..afceb6c 100644
--- a/src/views/plan/PlanYearDemandHdrEc/components/createForm.vue
+++ b/src/views/plan/PlanYearDemandHdrEc/components/createForm.vue
@@ -210,6 +210,7 @@
       }
     }
     const updateData = (data)=> {
+      dataList.value = []
       let arr = data?.lngPlanYearDemandList || [];
       let objPng = {}
       let objLng = {}
@@ -342,6 +343,7 @@
     }
     async function handleSubmit(type) {
       try {
+        await formRef.value.validateFields();
         let objLng = {catCode:'LNG'}
         let objPng = {catCode:'PNG'}
         dataList.value.forEach((v,idx)=> {
diff --git a/src/views/plan/PlanYearDemandHdrEc/index.vue b/src/views/plan/PlanYearDemandHdrEc/index.vue
index 97a6399..5cf81b4 100644
--- a/src/views/plan/PlanYearDemandHdrEc/index.vue
+++ b/src/views/plan/PlanYearDemandHdrEc/index.vue
@@ -113,7 +113,7 @@
     },
     immediate: false,
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id', page: params.limit, cuCode: curCuCode.value };
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id',limit:params.limit||1, page: params.limit||1, cuCode: curCuCode.value };
     },
     afterFetch: (res) => {
       tableRef.value.setToolBarWidth();
@@ -212,10 +212,11 @@
     });
   }
   function handleRefresh() {
+    checkBtn()
     reload();
   }
   function handleSuccess() {
-    
+    checkBtn()
     reload();
   }
   
@@ -244,13 +245,15 @@
       'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
     );
   }
+  const checkBtn = async() => {
+    const checkRes = await checkCuPlanState(curCuCode.value)
+    addDisabled.value = Number((checkRes?.count ?? 0)) !== 0
+  }
   onMounted(async() => {
     const res = await getCompDept(userInfo.id)
     curCuCode.value = res?.comp?.cuCode
     reload({searchInfo:{'limit':1,'size':10,'page':1, cuCode: curCuCode.value}});
-    const checkRes = await checkCuPlanState(curCuCode.value)
-    addDisabled.value = (checkRes?.count ?? 0) !== 0
-
+    checkBtn()
     const maxYearRes = await getCuMaxPlanYear(curCuCode.value)
     cuMaxPlanYear.value = maxYearRes?.planYear ? Number(maxYearRes.planYear) : null