diff --git a/src/components/Delivery/yihandeled.vue b/src/components/Delivery/yihandeled.vue
index 119208e..8d162de 100644
--- a/src/components/Delivery/yihandeled.vue
+++ b/src/components/Delivery/yihandeled.vue
@@ -4,13 +4,12 @@
       <div class="maintop">
         <div class="mainbtn">
           <el-button
+            v-hasButtons="['DeliveryHandledPrint']"
             size="small"
             class="thebtn2"
             :disabled="multiple"
-            v-hasButtons="['DeliveryHandledPrint']"
             @click="getPrintCheck"
-            >{{ '生成打印' }}</el-button
-          >
+          >{{ '生成打印' }}</el-button>
           <!-- <el-button
             size="small"
             class="thebtn3"
@@ -28,20 +27,24 @@
             >{{ '解绑追溯' }}</el-button
           > -->
           <el-button
+            v-hasButtons="['DeliveryHandledDelete']"
             size="small"
             class="thebtn4"
             :disabled="multiple"
             @click="deleteDelivery"
-            v-hasButtons="['DeliveryHandledDelete']"
-            >{{ '批量删除' }}</el-button
-          >
+          >{{ '批量删除' }}</el-button>
           <el-button
-            size="small"
             v-hasButtons="['DeliveryHandledExport']"
-            @click="handleExport"
+            size="small"
             class="thebtn1"
-            >{{ '导出' }}</el-button
-          >
+            @click="handleExport"
+          >{{ '导出' }}</el-button>
+          <el-button
+            v-hasButtons="['DeliveryHandledExport']"
+            size="small"
+            class="thebtn1"
+            @click="handleWaresExport"
+          >仓储导出</el-button>
         </div>
       </div>
       <el-table
@@ -49,49 +52,43 @@
         height="540px"
         style="width: 100%"
         :header-cell-style="{ background: '#EEEEEE' }"
-        @selection-change="handleSelectionChange"
         :span-method="objectSpanMethod"
+        @selection-change="handleSelectionChange"
       >
         <!-- :row-class-name="tableRowClassName"
          -->
-        <el-table-column prop="colsele" type="selection" width="55">
-        </el-table-column>
+        <el-table-column prop="colsele" type="selection" width="55" />
 
         <el-table-column
           align="center"
           width="80px"
           prop="dayBatch"
           label="批次"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           width="60px"
           prop="batchNumber"
           label="序号"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           align="center"
           width="180px"
           prop="deliverCode"
           :label="'发货单号'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           width="180px"
           align="center"
           prop="orderCode"
           :label="'订单编号'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="orderTypeVal"
           :label="'订单类型'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="orderStatusVal"
@@ -101,10 +98,9 @@
           <template slot-scope="scope">
             <span>{{ scope.row.orderStatusVal }}</span>
             <span
-              @click="deleteOrderRow(scope.row)"
               style="font-size: 18px; cursor: pointer; margin-left: 10px"
-              ><i class="el-icon-delete"></i
-            ></span>
+              @click="deleteOrderRow(scope.row)"
+            ><i class="el-icon-delete" /></span>
           </template>
         </el-table-column>
         <el-table-column
@@ -112,49 +108,41 @@
           align="center"
           prop="memberCode"
           :label="'会员编号'"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           align="center"
           prop="memberName"
           :label="'会员姓名'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           width="150px"
           align="center"
           prop="phone"
           :label="'联系方式'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           min-width="120px"
           prop="productCode"
           :label="'产品编号'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           width="150px"
           align="center"
           prop="productName"
           :label="'产品名称'"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           width="150px"
           align="center"
           prop="specsName"
           :label="'产品规格'"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="unitName" :label="'产品单位'">
-        </el-table-column>
+        />
+        <el-table-column align="center" prop="unitName" :label="'产品单位'" />
 
-        <el-table-column align="center" prop="quantity" :label="'产品数量'">
-        </el-table-column>
+        <el-table-column align="center" prop="quantity" :label="'产品数量'" />
         <!-- <el-table-column align="center" prop="isBarCodeVal" label="是否追溯">
         </el-table-column>
         <el-table-column align="center" prop="barCode" :label="'追溯编号'">
@@ -162,97 +150,82 @@
         <el-table-column align="center" prop="scanTime" :label="'扫码日期'">
         </el-table-column> -->
 
-        <el-table-column align="center" prop="recName" :label="'收货人'">
-        </el-table-column>
+        <el-table-column align="center" prop="recName" :label="'收货人'" />
         <el-table-column
           width="150px"
           align="center"
           prop="recPhone"
           :label="'收货电话'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           width="180px"
           align="center"
           prop="recAddress"
           :formatter="formatAddress"
           :label="'收货地址'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="shippingChannelVal"
           :label="'发货类型'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           min-width="100px"
           align="center"
           prop="storehouseName"
           :label="'发货仓库'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="printStatusVal"
           :label="'打印状态'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           width="150px"
           align="center"
           prop="payTime"
           :label="'支付日期'"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           align="center"
           prop="deliveryWayVal"
           :label="'发货方式'"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           align="center"
           prop="operateScopeVal"
           :label="'供应方式'"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           align="center"
           prop="tranTypeVal"
           :label="'运输方式'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="preSaleStatusVal"
           :label="'预售状态'"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           align="center"
           prop="logisticsCompany"
           :label="'物流公司'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="logisticsCode"
           :label="'物流单号'"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="remark" :label="'备注'">
-        </el-table-column>
+        />
+        <el-table-column align="center" prop="remark" :label="'备注'" />
         <el-table-column
           align="center"
           prop="vertexName"
           :label="$t('隶属体系')"
-        >
-        </el-table-column>
+        />
         <!-- <el-table-column
           align="center"
           prop="systemType"
@@ -273,8 +246,7 @@
           align="center"
           prop="creationTime"
           :label="'创建日期'"
-        >
-        </el-table-column>
+        />
       </el-table>
     </div>
     <pagination
@@ -282,8 +254,8 @@
       :total="total"
       :page.sync="params.pageNum"
       :limit.sync="params.pageSize"
+      :page-sizes="pageSizes"
       @pagination="getList"
-      :pageSizes="pageSizes"
     />
 
     <!-- 打印货单1版 -->
@@ -362,83 +334,78 @@
       :visible.sync="bdzsShow"
       width="70%"
       append-to-body
-      ><div>
-        <el-table
-          :data="codeData"
-          height="500px"
-          style="width: 100%"
-          :header-cell-style="{ background: '#EEEEEE' }"
-          border
-          ref="singleTable"
-          @current-change="handleCurrentChange"
-        >
-          <el-table-column
-            align="center"
-            prop="orderCode"
-            :label="'订单编号'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="productName"
-            :label="'产品名称'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="specsName"
-            :label="'产品规格'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="productNum"
-            :label="'产品数量'"
-          >
-          </el-table-column>
-          <el-table-column align="center" prop="barCode" :label="'追溯编号'">
-            <template slot-scope="scope">
-              <el-input
-                :disabled="!ifcodebind"
-                v-model="scope.row.barCode"
-                tabindex="1"
-                :ref="'mark' + scope.$index"
-                @keydown.enter.native="nextFocus"
-              ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="" :label="'操作'">
-            <template slot-scope="scope">
-              <div
-                v-if="ifcodebind"
-                @click="reCz(scope.row)"
-                style="cursor: pointer; color: #409eff"
-              >
-                {{ '重置' }}
-              </div>
-              <div
-                @click="handleDelete(scope.row, scope.$index, codeData)"
-                style="color: #c73030; cursor: pointer"
-              >
-                {{ '删除' }}
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="footer" style="text-align: center; margin-top: 20px">
-          <el-button @click="bdzsShow = false">
-            {{ '取消' }}</el-button
-          >
-          <el-button type="primary" @click="sureBd">{{
-            '确定'
-          }}</el-button>
-        </div>
+    ><div>
+      <el-table
+        ref="singleTable"
+        :data="codeData"
+        height="500px"
+        style="width: 100%"
+        :header-cell-style="{ background: '#EEEEEE' }"
+        border
+        @current-change="handleCurrentChange"
+      >
+        <el-table-column
+          align="center"
+          prop="orderCode"
+          :label="'订单编号'"
+        />
+        <el-table-column
+          align="center"
+          prop="productName"
+          :label="'产品名称'"
+        />
+        <el-table-column
+          align="center"
+          prop="specsName"
+          :label="'产品规格'"
+        />
+        <el-table-column
+          align="center"
+          prop="productNum"
+          :label="'产品数量'"
+        />
+        <el-table-column align="center" prop="barCode" :label="'追溯编号'">
+          <template slot-scope="scope">
+            <el-input
+              :ref="'mark' + scope.$index"
+              v-model="scope.row.barCode"
+              :disabled="!ifcodebind"
+              tabindex="1"
+              @keydown.enter.native="nextFocus"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="" :label="'操作'">
+          <template slot-scope="scope">
+            <div
+              v-if="ifcodebind"
+              style="cursor: pointer; color: #409eff"
+              @click="reCz(scope.row)"
+            >
+              {{ '重置' }}
+            </div>
+            <div
+              style="color: #c73030; cursor: pointer"
+              @click="handleDelete(scope.row, scope.$index, codeData)"
+            >
+              {{ '删除' }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="footer" style="text-align: center; margin-top: 20px">
+        <el-button @click="bdzsShow = false">
+          {{ '取消' }}</el-button>
+        <el-button type="primary" @click="sureBd">{{
+          '确定'
+        }}</el-button>
       </div>
+    </div>
     </el-dialog>
 
     <!-- 国内打印 -->
-    <div id="print-content" v-show="false">
-      <div class="fhdbox2" v-for="(item, index) in dyhdData" :key="index">
+    <div v-show="false" id="print-content">
+      <div v-for="(item, index) in dyhdData" :key="index" class="fhdbox2">
         <div>
           <div
             class="fhdTitle"
@@ -466,7 +433,7 @@
           </div>
 
           <div style="padding-right: 20px">
-            <img :id="'barcode' + index" />
+            <img :id="'barcode' + index">
           </div>
           <div
             class="mainrow2"
@@ -512,8 +479,7 @@
               <span> {{ '收货地址' }}:</span>
               <span>
                 {{ item.recProvinceVal }}{{ item.recCityVal
-                }}{{ item.recCountyVal || "" }}{{ item.recAddress }}</span
-              >
+                }}{{ item.recCountyVal || "" }}{{ item.recAddress }}</span>
             </div>
           </div>
 
@@ -573,21 +539,21 @@
           </div>
           <div>
             <span style="font-weight: bold; font-size: 12px">温馨提示：</span>
-            <span style="font-size:10px;!important"
-              >尊敬的各位家人，感谢您长期以来对海之圣的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span
-            >
+            <span
+              style="font-size:10px;!important"
+            >尊敬的各位家人，感谢您长期以来对海之圣的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span>
           </div>
-          <div style="page-break-after: always"></div>
+          <div style="page-break-after: always" />
         </div>
       </div>
     </div>
     <!-- 海外打印 -->
-    <div id="print-content2" v-show="false">
+    <div v-show="false" id="print-content2">
       <div
-        class="fhdbox2"
-        style="min-height: 100vh"
         v-for="(item, index) in dyhdData"
         :key="index"
+        class="fhdbox2"
+        style="min-height: 100vh"
       >
         <div
           class="fhdTitle"
@@ -718,8 +684,8 @@
             <td colspan="2">{{ aitem.price }}</td>
             <td colspan="2">{{ aitem.price * aitem.quantity }}</td>
             <td colspan="2">{{ aitem.specsName }}</td>
-            <td colspan="2"></td>
-            <td colspan="2"></td>
+            <td colspan="2" />
+            <td colspan="2" />
           </tr>
         </table>
       </div>
@@ -728,21 +694,21 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-import * as del from "@/api/delivery";
-import JsBarcode from "jsbarcode";
+import { mapGetters } from 'vuex'
+import * as del from '@/api/delivery'
+import JsBarcode from 'jsbarcode'
 export default {
-  name: "Yihandeled",
+  name: 'Yihandeled',
+  filters: {
+    decimalFormat(value) {
+      return Number(value).toFixed(2)
+    }
+  },
   props: {
     params: {
       type: Object,
-      default: null,
-    },
-  },
-  filters: {
-    decimalFormat(value) {
-      return Number(value).toFixed(2);
-    },
+      default: null
+    }
   },
   data() {
     return {
@@ -752,192 +718,206 @@ export default {
       orderIdList: [],
       multiple: true,
       bdzsShow: false,
-      zsTitle: "",
-      ifcodebind: "", //true绑定false解绑
+      zsTitle: '',
+      ifcodebind: '', // true绑定false解绑
       codeData: [],
-      delIdList: [], //存放删除
-      delIdList2: [], //存放解绑
+      delIdList: [], // 存放删除
+      delIdList2: [], // 存放解绑
       pageSizes: [100, 500, 1000, 2000, 4000],
       // 需要合并项的列
       needMergeArr: [
         {
-          colName: "colsele",
-          mergeCheckNames: ["deliverCode"],
+          colName: 'colsele',
+          mergeCheckNames: ['deliverCode']
         },
         {
-          colName: "dayBatch",
-          mergeCheckNames: ["dayBatch", "batchNumber"],
+          colName: 'dayBatch',
+          mergeCheckNames: ['dayBatch', 'batchNumber']
         },
         {
-          colName: "batchNumber",
-          mergeCheckNames: ["dayBatch", "batchNumber"],
+          colName: 'batchNumber',
+          mergeCheckNames: ['dayBatch', 'batchNumber']
         },
         {
-          colName: "deliverCode",
-          mergeCheckNames: ["deliverCode"],
+          colName: 'deliverCode',
+          mergeCheckNames: ['deliverCode']
         },
         {
-          colName: "orderCode",
-          mergeCheckNames: ["deliverCode", "orderCode"],
+          colName: 'orderCode',
+          mergeCheckNames: ['deliverCode', 'orderCode']
         },
         {
-          colName: "orderTypeVal",
-          mergeCheckNames: ["deliverCode", "orderCode", "orderTypeVal"],
+          colName: 'orderTypeVal',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'orderTypeVal']
         },
         {
-          colName: "memberCode",
-          mergeCheckNames: ["deliverCode", "orderCode", "memberCode"],
+          colName: 'memberCode',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'memberCode']
         },
         {
-          colName: "memberName",
-          mergeCheckNames: ["deliverCode", "orderCode", "memberName"],
+          colName: 'memberName',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'memberName']
         },
         {
-          colName: "phone",
-          mergeCheckNames: ["deliverCode", "orderCode", "phone"],
+          colName: 'phone',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'phone']
         },
         {
-          colName: "recName",
-          mergeCheckNames: ["deliverCode", "orderCode", "recName"],
+          colName: 'recName',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'recName']
         },
         {
-          colName: "recPhone",
-          mergeCheckNames: ["deliverCode", "orderCode", "recPhone"],
+          colName: 'recPhone',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'recPhone']
         },
 
         {
-          colName: "recAddress",
-          mergeCheckNames: ["deliverCode", "orderCode", "recAddress"],
+          colName: 'recAddress',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'recAddress']
         },
         {
-          colName: "operateScopeVal",
-          mergeCheckNames: ["deliverCode", "orderCode", "operateScopeVal"],
+          colName: 'operateScopeVal',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'operateScopeVal']
         },
         {
-          colName: "isLandTransVal",
-          mergeCheckNames: ["deliverCode", "orderCode", "isLandTransVal"],
+          colName: 'isLandTransVal',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'isLandTransVal']
         },
         {
-          colName: "deliveryWayVal",
-          mergeCheckNames: ["deliverCode", "orderCode", "deliveryWayVal"],
+          colName: 'deliveryWayVal',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'deliveryWayVal']
         },
         {
-          colName: "preSaleStatusVal",
-          mergeCheckNames: ["deliverCode", "orderCode", "preSaleStatusVal"],
+          colName: 'preSaleStatusVal',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'preSaleStatusVal']
         },
         {
-          colName: "printStatusVal",
-          mergeCheckNames: ["deliverCode", "orderCode", "printStatusVal"],
+          colName: 'printStatusVal',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'printStatusVal']
         },
         {
-          colName: "remark",
-          mergeCheckNames: ["deliverCode", "orderCode", "remark"],
+          colName: 'remark',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'remark']
         },
         {
-          colName: "creationTime",
-          mergeCheckNames: ["deliverCode", "orderCode", "creationTime"],
+          colName: 'creationTime',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'creationTime']
         },
         {
-          colName: "payTime",
-          mergeCheckNames: ["deliverCode", "orderCode", "payTime"],
+          colName: 'payTime',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'payTime']
         },
         {
-          colName: "logisticsCompany",
-          mergeCheckNames: ["deliverCode", "orderCode", "logisticsCompany"],
+          colName: 'logisticsCompany',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'logisticsCompany']
         },
         {
-          colName: "logisticsCode",
-          mergeCheckNames: ["deliverCode", "orderCode", "logisticsCode"],
-        },
+          colName: 'logisticsCode',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'logisticsCode']
+        }
       ],
       rowMergeArrs: {}, // 包含需要一个或多个合并项信息的对象
       dyhdTable: [],
       dyhdData: [],
-      pkCountry: "",
-      currentRow: "",
-    };
+      pkCountry: '',
+      currentRow: ''
+    }
   },
   computed: {
-    ...mapGetters(["user"]),
+    ...mapGetters(['user'])
   },
   mounted() {
-    this.getList();
-    this.pkCountry = this.user.pkCountry;
+    this.getList()
+    this.pkCountry = this.user.pkCountry
   },
   methods: {
     formatAddress(row) {
       return (
         row.recProvinceVal +
         row.recCityVal +
-        (row.recCountyVal || "") +
+        (row.recCountyVal || '') +
         row.recAddress
-      );
+      )
     },
     // 条码枪回车
     handleCurrentChange(val) {
-      this.currentRow = val;
+      this.currentRow = val
     },
     // 条码枪回车
     nextFocus() {
-      const len = this.codeData.length;
-      const val = this.currentRow;
+      const len = this.codeData.length
+      const val = this.currentRow
       this.codeData.forEach((v, i) => {
         if (v === val) {
           if (i < len - 1) {
-            this.setCurrent(this.codeData[i + 1]);
-            this.$refs["mark" + (i + 1)].focus();
+            this.setCurrent(this.codeData[i + 1])
+            this.$refs['mark' + (i + 1)].focus()
           } else {
-            this.setCurrent(this.codeData[0]);
-            this.$refs["mark" + 0].focus();
+            this.setCurrent(this.codeData[0])
+            this.$refs['mark' + 0].focus()
           }
         }
-      });
+      })
     },
     // 条码枪回车
     setCurrent(row) {
-      this.$refs.singleTable.setCurrentRow(row);
+      this.$refs.singleTable.setCurrentRow(row)
     },
     totalAmount(row) {
-      let total2 = "";
+      let total2 = ''
 
-      total2 = row.price * row.quantity;
-      return total2;
+      total2 = row.price * row.quantity
+      return total2
     },
-    //解决多列行列合并，根据某一列 合并其他列
+    // 解决多列行列合并，根据某一列 合并其他列
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      let needMerge = this.needMergeArr.some((item) => {
-        return item.colName === column.property;
-      });
+      const needMerge = this.needMergeArr.some((item) => {
+        return item.colName === column.property
+      })
       if (needMerge === true) {
-        return this.mergeAction(column.property, rowIndex, column);
+        return this.mergeAction(column.property, rowIndex, column)
       }
     },
     mergeAction(val, rowIndex, colData) {
-      let _row = this.rowMergeArrs[val].rowArr[rowIndex];
-      let _col = _row > 0 ? 1 : 0;
-      return [_row, _col];
+      const _row = this.rowMergeArrs[val].rowArr[rowIndex]
+      const _col = _row > 0 ? 1 : 0
+      return [_row, _col]
+    },
+    handleWaresExport() {
+      this.params.pkDeliverList = this.idList
+      this.$confirm('是否确认导出所有数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then((_) => {
+        this.download(
+          '/sale/manage/deliver-handled/wms-export',
+          { ...this.params },
+          `${'已合单-仓储导出'}${new Date().getTime()}.xlsx`
+        )
+      })
     },
     rowMergeHandle(arr, data) {
-      if (!Array.isArray(arr) && !arr.length) return false;
-      if (!Array.isArray(data) && !data.length) return false;
-      let needMerge = {};
+      if (!Array.isArray(arr) && !arr.length) return false
+      if (!Array.isArray(data) && !data.length) return false
+      const needMerge = {}
 
       arr.forEach((mergeItem) => {
         // 创建合并管理对象
         needMerge[mergeItem.colName] = {
           rowArr: [],
-          rowMergeNum: 0,
-        };
-        let currentMergeItemData = needMerge[mergeItem.colName];
+          rowMergeNum: 0
+        }
+        const currentMergeItemData = needMerge[mergeItem.colName]
 
         // 进行合并管理对象数据的遍历整理
         data.forEach((item, index) => {
           if (index === 0) {
-            currentMergeItemData.rowArr.push(1);
-            currentMergeItemData.rowMergeNum = 0;
+            currentMergeItemData.rowArr.push(1)
+            currentMergeItemData.rowMergeNum = 0
           } else {
-            let currentRowData = data[index];
-            let preRowData = data[index - 1];
+            const currentRowData = data[index]
+            const preRowData = data[index - 1]
 
             if (
               this.colMergeCheck(
@@ -948,48 +928,47 @@ export default {
             ) {
               currentMergeItemData.rowArr[
                 currentMergeItemData.rowMergeNum
-              ] += 1;
-              currentMergeItemData.rowArr.push(0);
+              ] += 1
+              currentMergeItemData.rowArr.push(0)
             } else {
-              currentMergeItemData.rowArr.push(1);
-              currentMergeItemData.rowMergeNum = index;
+              currentMergeItemData.rowArr.push(1)
+              currentMergeItemData.rowMergeNum = index
             }
           }
-        });
-      });
-      return needMerge;
+        })
+      })
+      return needMerge
     },
     colMergeCheck(currentRowData, preRowData, mergeCheckNames) {
-      if (!Array.isArray(mergeCheckNames) && !mergeCheckNames.length)
-        return false;
-      let result = true;
+      if (!Array.isArray(mergeCheckNames) && !mergeCheckNames.length) { return false }
+      let result = true
       for (let index = 0; index < mergeCheckNames.length; index++) {
-        const mergeCheckName = mergeCheckNames[index];
+        const mergeCheckName = mergeCheckNames[index]
         if (currentRowData[mergeCheckName] !== preRowData[mergeCheckName]) {
-          result = false;
-          break;
+          result = false
+          break
         }
       }
-      return result;
+      return result
     },
-    //删除行内订单状态列
+    // 删除行内订单状态列
     deleteOrderRow(row) {
-      this.$confirm('是否删除' + "?").then((_) => {
+      this.$confirm('是否删除' + '?').then((_) => {
         del.deleteDeliverItems({ id: row.pkId || null }).then((res) => {
           if (res.code == 200) {
             this.$message({
               message: res.msg,
-              type: "success",
-            });
-            this.getList();
+              type: 'success'
+            })
+            this.getList()
           }
-        });
-      });
+        })
+      })
     },
-    //重置
+    // 重置
     reCz(row) {
       this.$confirm('是否重置?').then((_) => {
-        row.barCode = "";
+        row.barCode = ''
         // del
         //   .codeReset({ barCodeId: row.deliverBarCodeId || null })
         //   .then((res) => {
@@ -1000,158 +979,158 @@ export default {
         //       });
         //     }
         //   });
-      });
+      })
     },
-    //列表删除
+    // 列表删除
     deleteDelivery() {
-      this.$confirm('是否删除' + "?").then((_) => {
+      this.$confirm('是否删除' + '?').then((_) => {
         del.deleteDeliver({ idList: this.idList.join() }).then((res) => {
           if (res.code == 200) {
             this.$message({
               message: res.msg,
-              type: "success",
-            });
-            this.getList();
+              type: 'success'
+            })
+            this.getList()
           }
-        });
-      });
+        })
+      })
     },
-    //删除
+    // 删除
     handleDelete(row, index, rows) {
       if (this.ifcodebind) {
-        //绑定-删除
-        this.$confirm('是否删除' + "?").then((_) => {
+        // 绑定-删除
+        this.$confirm('是否删除' + '?').then((_) => {
           if (row.deliverBarCodeId) {
             del.codeReset({ barCodeId: row.deliverBarCodeId }).then((res) => {
               if (res.code == 200) {
                 this.$message({
                   message: res.msg,
-                  type: "success",
-                });
-                rows.splice(index, 1);
+                  type: 'success'
+                })
+                rows.splice(index, 1)
               }
-            });
+            })
           } else {
             this.$message({
-              message: "没有绑定过追溯码",
-              type: "warning",
-            });
+              message: '没有绑定过追溯码',
+              type: 'warning'
+            })
           }
-        });
+        })
       } else {
-        //解绑-删除
+        // 解绑-删除
 
-        this.$confirm('是否删除' + "?").then((_) => {
+        this.$confirm('是否删除' + '?').then((_) => {
           if (row.deliverBarCodeId) {
             del.codeReset({ barCodeId: row.deliverBarCodeId }).then((res) => {
               if (res.code == 200) {
                 this.$message({
                   message: res.msg,
-                  type: "success",
-                });
+                  type: 'success'
+                })
               }
-            });
-            let thedel1 = [];
-            thedel1.push(row.deliverBarCodeId);
-            this.delIdList = thedel1;
-            rows.splice(index, 1);
+            })
+            const thedel1 = []
+            thedel1.push(row.deliverBarCodeId)
+            this.delIdList = thedel1
+            rows.splice(index, 1)
           } else {
             this.$message({
-              message: "没有绑定过追溯码",
-              type: "warning",
-            });
+              message: '没有绑定过追溯码',
+              type: 'warning'
+            })
           }
-        });
+        })
       }
     },
     getList() {
-      this.params.pkDeliverList = [];
+      this.params.pkDeliverList = []
       del.getDeliveryHandledList(this.params).then((res) => {
-        this.tableData = res.rows;
-        this.total = res.total;
+        this.tableData = res.rows
+        this.total = res.total
         this.rowMergeArrs = this.rowMergeHandle(
           this.needMergeArr,
           this.tableData
-        );
-      });
+        )
+      })
     },
 
-    //绑定/解绑
+    // 绑定/解绑
     sureBd() {
       if (this.ifcodebind == true) {
-        //绑定
+        // 绑定
         del.savCodeBind(this.codeData).then((res) => {
           if (res.code == 200) {
             this.$message({
               message: res.msg,
-              type: "success",
-            });
-            this.bdzsShow = false;
-            this.getList();
+              type: 'success'
+            })
+            this.bdzsShow = false
+            this.getList()
           }
-        });
+        })
       } else {
         if (this.codeData.length > 0) {
-          //解绑确定
+          // 解绑确定
           del.codeUnbind(this.delIdList2).then((res) => {
             if (res.code == 200) {
               this.$message({
                 message: res.msg,
-                type: "success",
-              });
-              this.bdzsShow = false;
-              this.getList();
+                type: 'success'
+              })
+              this.bdzsShow = false
+              this.getList()
             }
-          });
+          })
         } else {
-          this.bdzsShow = false;
+          this.bdzsShow = false
         }
       }
     },
     codeBind(index) {
-      this.delIdList = [];
-      this.ifcodebind = index;
+      this.delIdList = []
+      this.ifcodebind = index
 
       if (index == true) {
-        //绑定追溯
-        this.zsTitle = '绑定追溯码';
+        // 绑定追溯
+        this.zsTitle = '绑定追溯码'
         del
           .getCodeBindData({ deliverIdList: this.idList.join() })
           .then((res) => {
             res.data.forEach((element) => {
-              element.productNum = 1;
-            });
-            this.codeData = res.data;
-          });
+              element.productNum = 1
+            })
+            this.codeData = res.data
+          })
       } else if (index == false) {
-        //解绑追溯
-        this.zsTitle = '解绑追溯码';
+        // 解绑追溯
+        this.zsTitle = '解绑追溯码'
 
         del
           .getCodeUnbindData({
             deliverIdList: this.idList.join(),
-            orderIdList: this.orderIdList.join(),
+            orderIdList: this.orderIdList.join()
           })
           .then((res) => {
             res.data.forEach((element) => {
-              element.productNum = 1;
-            });
-            this.codeData = res.data;
-            let thedel2 = [];
+              element.productNum = 1
+            })
+            this.codeData = res.data
+            const thedel2 = []
             res.data.forEach((ele) => {
-              thedel2.push(ele.deliverBarCodeId);
-            });
-            this.delIdList2 = thedel2;
-          });
+              thedel2.push(ele.deliverBarCodeId)
+            })
+            this.delIdList2 = thedel2
+          })
       }
-      this.bdzsShow = true;
+      this.bdzsShow = true
     },
-    //生成打印
+    // 生成打印
     getPrintCheck() {
       del
         .deliverHandledPrint({ deliverIdList: this.idList.join() })
         .then((res) => {
-          this.dyhdData = res.data;
+          this.dyhdData = res.data
         })
         .finally(() => {
           // 在接口请求完成后，循环生成条形码并展示在页面上
@@ -1159,58 +1138,58 @@ export default {
           // 循环生成条形码并展示在页面上
           this.dyhdData.forEach((item, index) => {
             // 使用JsBarcode生成条形码图片
-            JsBarcode("#barcode" + index, item.deliverCode, {
-              format: "CODE128",
-              lineColor: "#000",
-              background: "#EBEEF5",
+            JsBarcode('#barcode' + index, item.deliverCode, {
+              format: 'CODE128',
+              lineColor: '#000',
+              background: '#EBEEF5',
               width: 2,
               height: 20,
-              displayValue: false,
-            });
-          });
+              displayValue: false
+            })
+          })
         })
         .then(() => {
           if (this.pkCountry == 1) {
-            const printContent = document.getElementById("print-content");
-            const printWindow = window.open("", "_blank"); //这句解决edge浏览器打不开的问题
-            printWindow.document.write(printContent.innerHTML);
-            printWindow.document.close();
-            printWindow.focus();
-            printWindow.print();
-            printWindow.close();
+            const printContent = document.getElementById('print-content')
+            const printWindow = window.open('', '_blank') // 这句解决edge浏览器打不开的问题
+            printWindow.document.write(printContent.innerHTML)
+            printWindow.document.close()
+            printWindow.focus()
+            printWindow.print()
+            printWindow.close()
           } else {
-            const printContent = document.getElementById("print-content2");
-            const printWindow = window.open("", "_blank"); //这句解决edge浏览器打不开的问题
-            printWindow.document.write(printContent.innerHTML);
-            printWindow.document.close();
-            printWindow.focus();
-            printWindow.print();
-            printWindow.close();
+            const printContent = document.getElementById('print-content2')
+            const printWindow = window.open('', '_blank') // 这句解决edge浏览器打不开的问题
+            printWindow.document.write(printContent.innerHTML)
+            printWindow.document.close()
+            printWindow.focus()
+            printWindow.print()
+            printWindow.close()
           }
-        });
+        })
     },
     handleSelectionChange(selection) {
-      this.idList = selection.map((item) => item.pkDeliver);
-      this.orderIdList = selection.map((item) => item.pkOrder);
-      this.multiple = !selection.length;
+      this.idList = selection.map((item) => item.pkDeliver)
+      this.orderIdList = selection.map((item) => item.pkOrder)
+      this.multiple = !selection.length
     },
-    //导出
+    // 导出
     handleExport() {
-      this.params.pkDeliverList = this.idList;
+      this.params.pkDeliverList = this.idList
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then((_) => {
         this.download(
-          "/sale/manage/deliver-handled/export",
+          '/sale/manage/deliver-handled/export',
           { ...this.params },
           `${'已合单'}${new Date().getTime()}.xlsx`
-        );
-      });
-    },
-  },
-};
+        )
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>