From ee076404c5d691d49b2f24503f27e576fd830820 Mon Sep 17 00:00:00 2001
From: wang <wzh@>
Date: Mon, 16 Mar 2026 15:37:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9C=8D=E5=8A=A1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/erp/cost/firm-reports-list.vue   |  4 ++--
 .../erp/service/service-applications-form.vue | 19 +++++++++++--------
 .../erp/service/service-applications-list.vue |  1 +
 .../service-applications-report-list.vue      |  3 ++-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/business/erp/cost/firm-reports-list.vue b/src/views/business/erp/cost/firm-reports-list.vue
index abfde60..bb69f20 100644
--- a/src/views/business/erp/cost/firm-reports-list.vue
+++ b/src/views/business/erp/cost/firm-reports-list.vue
@@ -49,12 +49,12 @@
         <!---------- 表格操作行 begin ----------->
         <a-row class="smart-table-btn-block">
             <div class="smart-table-operate-block">
-                <!--<a-button v-if="isCeo" @click="showForm" type="primary" >
+                <a-button v-if="isCto" @click="showForm" type="primary" >
                     <template #icon>
                         <PlusOutlined />
                     </template>
                     新建
-                </a-button>-->
+                </a-button>
                 <a-button v-if="isCto" @click="confirmBatchDelete" type="primary" danger  :disabled="selectedRowKeyList.length == 0">
                     <template #icon>
                         <DeleteOutlined />
diff --git a/src/views/business/erp/service/service-applications-form.vue b/src/views/business/erp/service/service-applications-form.vue
index b31f7a7..9ae8f75 100644
--- a/src/views/business/erp/service/service-applications-form.vue
+++ b/src/views/business/erp/service/service-applications-form.vue
@@ -392,17 +392,20 @@
     
     // 先获取当前用户信息
     const userInfo = await getCurrentUserInfo();
+    console.log('获取到的用户信息:', userInfo);
+    console.log('rowData:', rowData);
+    console.log('rowData类型:', typeof rowData);
+    console.log('是否为空:', !rowData, _.isEmpty(rowData));
     
     if (rowData && !_.isEmpty(rowData)) {
-      // 编辑模式或详情模式：合并用户信息和现有数据
+      // 编辑模式或详情模式：使用接口返回的数据
       Object.assign(form, rowData);
-      // 确保用户信息不被覆盖
-      if (userInfo) {
-        form.userId = userInfo.employeeId;
-        form.actualName = userInfo.actualName || form.actualName;
-        form.certificateNumber = userInfo.licenseNumber || form.certificateNumber;
-        form.firmId = userInfo.departmentId || form.firmId;
-        form.departmentName = userInfo.departmentName || form.departmentName;
+      // 只有在新增模式下才使用当前用户信息
+      // 详情/编辑模式使用接口返回的原始数据，不覆盖
+      
+      // 将接口返回的userName映射到actualName（表单使用actualName字段）
+      if (rowData.userName) {
+        form.actualName = rowData.userName;
       }
       
       // 编辑模式或详情模式下，如果有attachmentIds，则获取文件列表
diff --git a/src/views/business/erp/service/service-applications-list.vue b/src/views/business/erp/service/service-applications-list.vue
index af139ae..f47a0fe 100644
--- a/src/views/business/erp/service/service-applications-list.vue
+++ b/src/views/business/erp/service/service-applications-list.vue
@@ -941,6 +941,7 @@ onMounted(async () => {
     const costReportFormRef = ref();
 
     function showForm(data) {
+        console.log('showForm传入的data:', data);
         // 检查用户是否已签约
         if (checkUserSigned()) {
             // 已签约，直接显示表单
diff --git a/src/views/business/erp/service/service-applications-report-list.vue b/src/views/business/erp/service/service-applications-report-list.vue
index 022599a..22ac185 100644
--- a/src/views/business/erp/service/service-applications-report-list.vue
+++ b/src/views/business/erp/service/service-applications-report-list.vue
@@ -59,7 +59,7 @@
             <div class="smart-table-operate-block">
          
                 <!-- 新建申报按钮：非协会角色且非CEO角色显示 -->
-                <a-button v-if="!isAssociationRole && !isCeo" @click="showForm" type="primary">
+                <a-button v-if="!isAssociationRole && !isCeo" @click="showForm()" type="primary">
                     <template #icon>
                         <PlusOutlined />
                     </template>
@@ -796,6 +796,7 @@ onMounted(async () => {
     const formRef = ref();
 
     function showForm(data) {
+        console.log('service-applications-report-list showForm data:', data);
         // 检查用户是否已签约
         if (checkUserSigned()) {
             // 已签约，直接显示表单