Merge branch 'dev' into pre-production

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;
 }
 

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,