From 2bc890123de9126a86534ec9db6cfbca36b560d4 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 24 Oct 2024 11:12:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/export.js | 63 +++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/utils/export.js b/src/utils/export.js
index c5390f0e..dc7dcd6c 100644
--- a/src/utils/export.js
+++ b/src/utils/export.js
@@ -135,40 +135,41 @@ function addRangeBorder(range, ws) {
     'AG',
   ];
   console.log('range :>> ', range);
-  range.forEach(item => {
-    console.log('item :>> ', item);
-    let style = {
-      s: {
-        border: {
-          top: {
-            style: 'thin',
-            color: { rgb: '000000' },
-          },
-          bottom: {
-            style: 'thin',
-            color: { rgb: '000000' },
-          },
-          left: {
-            style: 'thin',
-            color: { rgb: '000000' },
-          },
-          right: {
-            style: 'thin',
-            color: { rgb: '000000' },
+  range &&
+    range.forEach(item => {
+      console.log('item :>> ', item);
+      let style = {
+        s: {
+          border: {
+            top: {
+              style: 'thin',
+              color: { rgb: '000000' },
+            },
+            bottom: {
+              style: 'thin',
+              color: { rgb: '000000' },
+            },
+            left: {
+              style: 'thin',
+              color: { rgb: '000000' },
+            },
+            right: {
+              style: 'thin',
+              color: { rgb: '000000' },
+            },
           },
         },
-      },
-    };
-    // 处理合并行
-    for (let i = item.s.c; i <= item.e.c; i++) {
-      ws[`${cols[i]}${Number(item.e.r) + 1}`] = ws[`${cols[i]}${Number(item.e.r) + 1}`] || style;
-      // 处理合并列
-      for (let k = item.s.r + 2; k <= item.e.r + 1; k++) {
-        // console.log(' ws[cols[k] + item.e.r] :>> ', ws[cols[k] + item.e.r]);
-        ws[cols[i] + k] = ws[cols[i] + k] || style;
+      };
+      // 处理合并行
+      for (let i = item.s.c; i <= item.e.c; i++) {
+        ws[`${cols[i]}${Number(item.e.r) + 1}`] = ws[`${cols[i]}${Number(item.e.r) + 1}`] || style;
+        // 处理合并列
+        for (let k = item.s.r + 2; k <= item.e.r + 1; k++) {
+          // console.log(' ws[cols[k] + item.e.r] :>> ', ws[cols[k] + item.e.r]);
+          ws[cols[i] + k] = ws[cols[i] + k] || style;
+        }
       }
-    }
-  });
+    });
   return ws;
 }
 

From dd8ab328302f56d365d8be3e16f77a183d7a8276 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 24 Oct 2024 11:42:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=8D=95?=
 =?UTF-8?q?=E5=93=81=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/distribution/inventory/CreateOrder.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index fb1dde84..85dede72 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -3700,6 +3700,7 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
           const value = details.package.data[i];
 
           const _obj = {
+            ...value,
             id: value.advanceDetailId,
             incomeCategoryId: value.confirmIncomeCategoryId,
             incomeCategoryName: value.confirmIncomeCategoryName,