Merge branch 'dev' into pre-production

src/utils/export.js

@@ -135,6 +135,7 @@ function addRangeBorder(range, ws) {
     'AG',
   ];
   console.log('range :>> ', range);
+  range &&
     range.forEach(item => {
       console.log('item :>> ', item);
       let style = {

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,