From 0bed5ad69cbfad46fc8a758a9a296f5b9232fb8f Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Tue, 15 Jul 2025 11:45:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=B8=8B=E8=BD=BD=E5=B7=AE?=
 =?UTF-8?q?=E5=BC=82=E6=95=B0=E6=8D=AE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImportForm/src/ImportFormStep.vue         | 65 +++++++++++--------
 src/locales/en-US.ts                          |  3 +-
 src/locales/zh-CN.ts                          |  3 +-
 3 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue
index aaba316bb..3d1a20085 100644
--- a/src/components/ImportForm/src/ImportFormStep.vue
+++ b/src/components/ImportForm/src/ImportFormStep.vue
@@ -83,9 +83,11 @@
             <Icon icon="ep:download" />
             {{ t('ts.下载模板') }}
           </el-button>
-           <el-button type="primary" plain @click="downloadDifferenceData" v-if="active == 1 && error">
-            <Icon icon="ep:download" />
-            {{ t('ts.差异数据') }}
+             <el-button type="primary" plain @click="downloadDifferenceData" v-if="active == 1 && error">
+            {{ t('ts.下载差异数据') }}
+          </el-button>
+           <el-button type="primary" plain @click="differentialAdjustment" v-if="active == 1 && error">
+            {{ t('ts.差异调整') }}
           </el-button>
         </div>
         <el-button :disabled="formLoading || isShowLoading" type="primary" @click="submitForm" v-if="active == 0 || (active == 1 && !error)">{{ t('ts.下一步') }}</el-button>
@@ -690,36 +692,43 @@ const importTemplate = () => {
 const searchTableSuccess = (formField, searchField, val, type, row) => {
   emits('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
 }
-
-const downloadDifferenceData = () => {
+// 下载差异数据
+const downloadDifferenceData = () => { 
   if (props.tableObject.tableList.length === 0) {
     message.warning('没有可下载的差异数据');
     return;
   }
 
-//   // 获取当前使用的列定义
-//   const columns = currentColumns.value;
-
-//   // 创建工作簿和工作表，使用原始数据
-//   const wb = XLSX.utils.book_new();
-//   const ws = XLSX.utils.json_to_sheet(props.tableObject.tableList);
-
-//   // 替换表头为中文;
-//   columns.forEach((col, index) => {
-//     const cellAddress = XLSX.utils.encode_cell({ r: 0, c: index });
-//     if (ws[cellAddress]) {
-//       ws[cellAddress].v = col.label;
-//     }
-//   });
-
-//   // 设置列宽（可选）
-//   const colWidth = columns.map(() => ({ wch: 20 }));
-//   ws['!cols'] = colWidth;
-
-//   // 添加工作表到工作簿并下载
-//   XLSX.utils.book_append_sheet(wb, ws, "差异数据");
-//   const timestamp = new Date().getTime();
-//   XLSX.writeFile(wb, `差异数据_${timestamp}.xlsx`);
+  // 获取当前使用的列定义
+  const columns = currentColumns.value;
+
+  // 创建工作簿和工作表，使用原始数据
+  const wb = XLSX.utils.book_new();
+  const ws = XLSX.utils.json_to_sheet(props.tableObject.tableList);
+
+  // 替换表头为中文;
+  columns.forEach((col, index) => {
+    const cellAddress = XLSX.utils.encode_cell({ r: 0, c: index });
+    if (ws[cellAddress]) {
+      ws[cellAddress].v = col.label;
+    }
+  });
+
+  // 设置列宽（可选）
+  const colWidth = columns.map(() => ({ wch: 20 }));
+  ws['!cols'] = colWidth;
+
+  // 添加工作表到工作簿并下载
+  XLSX.utils.book_append_sheet(wb, ws, "差异数据");
+  const timestamp = new Date().getTime();
+  XLSX.writeFile(wb, `差异数据_${timestamp}.xlsx`);
+}
+// 差异调整
+const differentialAdjustment = () => {
+  if (props.tableObject.tableList.length === 0) {
+    message.warning('没有差异数据');
+    return;
+  }
   const list = props.tableObject.tableList.map(item => {
     return {
       materialCode: item.materialCode,
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 6d8fd8bc0..4f0f6bd03 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -904,7 +904,8 @@ export default {
     '追加：只新增，不修改':'Add：Add，no modify',
     '覆盖：只修改不新增':'Cover：Modify，not add',
     下载模板: 'Download Template',
-    差异数据: 'Differential data',
+    下载差异数据: 'Download differential data',
+    差异调整: 'Differential adjustment',
     更新:'Update',
     追加:'Add',
     覆盖:'Cover',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index fcb83c554..1f5422c39 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -909,7 +909,8 @@ export default {
     '追加：只新增，不修改':'追加：只新增，不修改',
     '覆盖：只修改不新增':'覆盖：只修改不新增',
     下载模板: '下载模板',
-    差异数据: '差异数据',
+    下载差异数据: '下载差异数据',
+    差异调整: '差异调整',
     更新:'更新',
     追加:'追加',
     覆盖:'覆盖',