From db41fe2a91a3132b45ce4fe96d992eda4d18bb34 Mon Sep 17 00:00:00 2001
From: kangwenjing <1138819403@qq.com>
Date: Wed, 15 Apr 2026 16:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=89=8D=E7=AB=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/Expansion.tsx     | 18 ++++++++++--------
 frontend/src/pages/Opportunities.tsx | 16 ++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/frontend/src/pages/Expansion.tsx b/frontend/src/pages/Expansion.tsx
index 0969d0c4..39b701eb 100644
--- a/frontend/src/pages/Expansion.tsx
+++ b/frontend/src/pages/Expansion.tsx
@@ -329,8 +329,6 @@ function buildSalesExportHeaders(items: SalesExpansionItem[]) {
   const headers = [
     "工号",
     "姓名",
-    "创建人",
-    "更新修改时间",
     "联系方式",
     "代表处 / 办事处",
     "所属部门",
@@ -346,6 +344,7 @@ function buildSalesExportHeaders(items: SalesExpansionItem[]) {
     headers.push(`项目${index + 1}编码`, `项目${index + 1}名称`, `项目${index + 1}金额`);
   }
 
+  headers.push("创建人", "更新修改时间");
   headers.push("跟进记录");
   return headers;
 }
@@ -357,8 +356,6 @@ function buildSalesExportData(items: SalesExpansionItem[]) {
     const row = [
       normalizeExportText(item.employeeNo),
       normalizeExportText(item.name),
-      normalizeExportText(item.owner),
-      normalizeExportText(item.updatedAt),
       normalizeExportText(item.phone),
       normalizeExportText(item.officeName),
       normalizeExportText(item.dept),
@@ -379,6 +376,10 @@ function buildSalesExportData(items: SalesExpansionItem[]) {
       );
     }
 
+    row.push(
+      normalizeExportText(item.owner),
+      normalizeExportText(item.updatedAt),
+    );
     row.push(formatExportFollowUps(item.followUps));
     return row;
   });
@@ -390,8 +391,6 @@ function buildChannelExportHeaders(items: ChannelExpansionItem[]) {
   const headers = [
     "编码",
     "渠道名称",
-    "创建人",
-    "更新修改时间",
     "省份",
     "市",
     "办公地址",
@@ -416,6 +415,7 @@ function buildChannelExportHeaders(items: ChannelExpansionItem[]) {
   }
 
   headers.push("备注说明");
+  headers.push("创建人", "更新修改时间");
   headers.push("跟进记录");
   return headers;
 }
@@ -428,8 +428,6 @@ function buildChannelExportData(items: ChannelExpansionItem[]) {
     const row = [
       normalizeExportText(item.channelCode),
       normalizeExportText(item.name),
-      normalizeExportText(item.owner),
-      normalizeExportText(item.updatedAt),
       normalizeExportText(item.province),
       normalizeExportText(item.city),
       normalizeExportText(item.officeAddress),
@@ -464,6 +462,10 @@ function buildChannelExportData(items: ChannelExpansionItem[]) {
     }
 
     row.push(normalizeExportText(item.notes));
+    row.push(
+      normalizeExportText(item.owner),
+      normalizeExportText(item.updatedAt),
+    );
     row.push(formatExportFollowUps(item.followUps));
     return row;
   });
diff --git a/frontend/src/pages/Opportunities.tsx b/frontend/src/pages/Opportunities.tsx
index a6de74f1..8301535f 100644
--- a/frontend/src/pages/Opportunities.tsx
+++ b/frontend/src/pages/Opportunities.tsx
@@ -1619,10 +1619,6 @@ export default function Opportunities() {
       const headers = [
         "项目编号",
         "项目名称",
-        "创建人",
-        "更新修改时间",
-        "是否签单",
-        "是否推送OMS",
         "项目地",
         "最终用户",
         "建设类型",
@@ -1643,6 +1639,10 @@ export default function Opportunities() {
         "项目最新进展",
         "后续规划",
         "备注说明",
+        "创建人",
+        "更新修改时间",
+        "是否签单",
+        "是否推送OMS",
         "跟进记录",
       ];
 
@@ -1670,10 +1670,6 @@ export default function Opportunities() {
         worksheet.addRow([
           normalizeOpportunityExportText(item.code),
           normalizeOpportunityExportText(item.name),
-          normalizeOpportunityExportText(item.owner),
-          normalizeOpportunityExportText(item.updatedAt),
-          formatOpportunityBoolean(item.archived, "已签单", "未签单"),
-          formatOpportunityBoolean(item.pushedToOms, "已推送", "未推送"),
           normalizeOpportunityExportText(item.projectLocation),
           normalizeOpportunityExportText(item.client),
           normalizeOpportunityExportText(item.type || "新建"),
@@ -1694,6 +1690,10 @@ export default function Opportunities() {
           normalizeOpportunityExportText(item.latestProgress),
           normalizeOpportunityExportText(item.nextPlan),
           normalizeOpportunityExportText(item.notes),
+          normalizeOpportunityExportText(item.owner),
+          normalizeOpportunityExportText(item.updatedAt),
+          formatOpportunityBoolean(item.archived, "已签单", "未签单"),
+          formatOpportunityBoolean(item.pushedToOms, "已推送", "未推送"),
           followUpText,
         ]);
       });