From 37363636ea9f41deb49c8b87e0cbfeb287b156f5 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Fri, 24 Jul 2026 16:03:35 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260724=20=E6=94=B9=E5=96=84=E6=8F=90?=
 =?UTF-8?q?=E6=A1=88=20=E6=96=B0=E5=A2=9E=E7=94=B3=E8=AF=B7=E5=8F=AA?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E4=B8=BB=E8=A1=A8=EF=BC=8C=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E7=94=B1=E5=90=8E=E7=BB=AD=E8=AF=84=E5=88=86=E5=92=8C=E6=8A=95?=
 =?UTF-8?q?=E7=A5=A8=E6=B5=81=E7=A8=8B=E7=BB=B4=E6=8A=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ImprovementProposalForm.vue     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue b/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
index 2cb90f4..67e6334 100644
--- a/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
+++ b/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
@@ -84,8 +84,8 @@
       </template>
     </JFormContainer>
 
-		<!-- 子表单区域 -->
-    <a-tabs v-model:activeKey="activeKey" animated style="overflow:hidden;">
+		<!-- 新增申请只填写主表，子表由后续评分和投票流程维护。 -->
+    <a-tabs v-if="showSubTables" v-model:activeKey="activeKey" animated style="overflow:hidden;">
       <a-tab-pane tab="部门评议评分表" key="improvementDeptScore" :forceRender="true">
         <j-vxe-table
           :keep-source="true"
@@ -214,6 +214,9 @@
         return props.formDisabled;
       });
 
+      // 普通新增没有业务 ID，不展示评分和投票子表；已有数据及流程表单正常展示。
+      const showSubTables = computed(() => Boolean(formData.id || props.formData?.dataId));
+
       onMounted(()=>{
         initFormData();
       });
@@ -297,10 +300,14 @@
 
       async function submitForm() {
         const mainData = await getFormData();
-        const subData = await getSubFormAndTableData();
-        const values = Object.assign({}, dbData, mainData, subData);
+        const isUpdate = Boolean(mainData.id);
+        const values = Object.assign({}, dbData, mainData);
+        // 新增提案只保存主表；已有提案编辑或流程提交时才采集子表数据。
+        if (isUpdate) {
+          const subData = await getSubFormAndTableData();
+          Object.assign(values, subData);
+        }
         console.log('表单提交数据', values)
-        const isUpdate = values.id ? true : false
         await saveOrUpdate(values, isUpdate);
         //关闭弹窗
         emit('success');
@@ -338,6 +345,7 @@
         handleFormChange,
         formItemLayout,
         disabled,
+        showSubTables,
         showFlowSubmitButton,
         getFormData,
         submitForm,