From 477ca8ae7e34dc3d8769cd5d95c624e43c0231f5 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Sat, 19 Apr 2025 13:39:03 +0800
Subject: [PATCH] feat(delivery): delete two second

---
 src/components/Delivery/twoSend.vue    | 1101 ------------------------
 src/views/logistics/delivery/index.vue |  735 ++++++++--------
 2 files changed, 343 insertions(+), 1493 deletions(-)
 delete mode 100644 src/components/Delivery/twoSend.vue

diff --git a/src/components/Delivery/twoSend.vue b/src/components/Delivery/twoSend.vue
deleted file mode 100644
index 5bf355f..0000000
--- a/src/components/Delivery/twoSend.vue
+++ /dev/null
@@ -1,1101 +0,0 @@
-<template>
-  <div>
-    <div class="main">
-      <div class="maintop">
-        <div class="mainbtn">
-          <el-button
-            size="small"
-            :disabled="idList.length != 1"
-            class="thebtn2"
-            
-             v-hasButtons="['deliverTwo']"
-            @click="getImmediateData"
-            >{{ '二次发货' }}</el-button
-          >
-
-          <!-- <el-button size="small" @click="handleExport" class="thebtn1"
-            > {{ '导入' }}</el-button
-          > -->
-        </div>
-      </div>
-      <el-table
-        :data="tableData"
-        height="540px"
-        style="width: 100%"
-        :header-cell-style="{ background: '#EEEEEE' }"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column prop="colsele" type="selection" width="55">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="orderCode"
-          width="180px"
-          :label="'订单编号'"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="orderTypeVal"
-          :label="'订单类型'"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="memberCode" :label="'会员编号'">
-        </el-table-column>
-
-        <el-table-column
-          align="center"
-          prop="memberName"
-          :label="'会员姓名'"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="phone"
-          width="150px"
-          :label="'联系方式'"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="recName" :label="'收货人'">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          width="150px"
-          prop="recPhone"
-          :label="'收货电话'"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="recProvinceVal"
-          :label="'省'"
-        >
-        </el-table-column>
-        <el-table-column
-          min-width="100px"
-          align="center"
-          prop="storehouseName"
-          :label="'发货仓库'"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="recCityVal"
-          :label="'市'"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="recCountyVal"
-          :label="'区/县'"
-        >
-        </el-table-column>
-        <el-table-column
-          width="200px"
-          align="center"
-          prop="recAddress"
-          :label="'详细地址'"
-        >
-        </el-table-column>
-        <el-table-column
-          min-width="120px"
-          align="center"
-          prop="orderAmount"
-          :label="'订单金额'"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="postage"
-          :label="'订单邮费'"
-        >
-        </el-table-column>
-        <el-table-column
-          min-width="120px"
-          align="center"
-          prop="orderAchieve"
-          :label="'订单业绩'"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="deliveryWayVal"
-          :label="'发货方式'"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="payTypeVal" :label="'支付方式'">
-        </el-table-column>
-        <el-table-column align="center" prop="remark" :label="'备注'">
-        </el-table-column>
-        <el-table-column
-          min-width="180px"
-          align="center"
-          prop="creationTime"
-          :label="'创建日期'"
-        >
-        </el-table-column>
-        <el-table-column
-          min-width="180px"
-          align="center"
-          prop="payTime"
-          :label="'支付日期'"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="payTime" :label="'操作'">
-          <template slot-scope="scope">
-            <el-button
-              @click="toFixed(scope.row.pkId)"
-              type="text"
-              size="small"
-            >
-              {{ '查看' }}
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="params.pageNum"
-      :limit.sync="params.pageSize"
-      @pagination="getList"
-      :pageSizes='pageSizes'
-    />
-    <el-dialog
-      :title="'二次发货'"
-      :visible.sync="isChangeGoods"
-      width="90%"
-      :close-on-click-modal="false"
-      center
-    >
-      <el-table
-        :data="allDetails.detailList"
-        style="width: 100%"
-        :span-method="objectSpanMethod1"
-        :header-cell-style="{ background: '#EEEEEE' }"
-        :row-class-name="tableRowClassName"
-      >
-        <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="quantity" :label="'产品数量'">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="price"
-          :label="'产品单价' + '(￥)'"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="achievement"
-          :label="`${'产品业绩'}` + `(${isLocalSymbol()})`"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="assAchievement"
-          :label="`${'产品业绩'}` + `(BV)`"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="postage"
-          :label="'邮费' + `(${isLocalSymbol()})`"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="orderCode"
-          width="170"
-          :label="'订单编号'"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="orderAmount"
-          :label="'商品总价' + `(${isLocalSymbol()})`"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="orderAchieve"
-          :label="'商品业绩' + `(${isLocals()})`"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="orderAssAchieve"
-          :label="'商品业绩' + `(BV)`"
-        >
-        </el-table-column>
-      </el-table>
-      <el-form label-width="auto">
-        <el-row
-          :gutter="40"
-          v-for="(item, index) in allDetails.accountList"
-          :key="index"
-        >
-          <el-col :span="4">
-            <el-form-item label="扣款账户">
-              <!-- <el-select clearable
-                         v-model="item.pkAccount">
-                <el-option v-for="item in bdAccountList"
-                           :key="item.pkId"
-                           :label="item.accountName"
-                           :value="item.pkId"></el-option>
-              </el-select> -->
-              <el-input disabled v-model="item.pkAccountVal" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'扣款金额'">
-              <el-input disabled v-model="item.amount" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <el-table
-        :data="newGoodsList"
-        style="width: 100%"
-        :span-method="objectSpanMethod1"
-        :header-cell-style="{ background: '#EEEEEE' }"
-        @selection-change="newListSelect"
-        :row-class-name="tableRowClassName"
-      >
-        <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column
-          align="center"
-          prop="productName"
-          width="120"
-          :label="'产品名称'"
-        >
-          <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.productCode"
-              @change="changeProduct($event, scope.$index)"
-              size="medium"
-              filterable
-              :placeholder="'请选择'"
-            >
-              <el-option
-                v-for="item in productList"
-                :key="item.productCode"
-                :label="item.productName"
-                :value="item.productCode"
-              >
-              </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="productCode"
-          :label="'产品编号'"
-        >
-          <template slot-scope="scope">
-            <div>{{ scope.row.productCode || '请选择' }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="specsName"
-          width="150"
-          :label="'产品规格'"
-        >
-          <template slot-scope="scope">
-            <el-popover
-              placement="bottom"
-              width="300"
-              v-model="scope.row.visible"
-            >
-              <div v-for="(item, index) in scope.row.specs" :key="index">
-                <div class="tit">{{ item.typeName }}</div>
-                <el-radio-group v-model="item.radio">
-                  <el-radio
-                    :label="ctem.specsId"
-                    :key="cindex"
-                    v-for="(ctem, cindex) in item.specsList"
-                    >{{ ctem.value }}</el-radio
-                  >
-                </el-radio-group>
-              </div>
-              <div style="text-align: right; margin: 0">
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="scope.row.visible = false"
-                >
-                  {{ '取消' }}</el-button
-                >
-                <el-button
-                  type="primary"
-                  size="mini"
-                  @click="sureSpecs(scope.$index)"
-                  >{{ '确定' }}</el-button
-                >
-              </div>
-              <el-button slot="reference">{{
-                scope.row.specsName || '请选择'
-              }}</el-button>
-            </el-popover>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          align="center"
-          prop="quantity"
-          width="150"
-          :label="'数量'"
-        >
-          <template slot-scope="scope">
-            <el-input-number
-              v-model="scope.row.quantity"
-              :min="0"
-              size="mini"
-              :label="'描述文字'"
-            >
-            </el-input-number>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="price"
-          width="120"
-          :label="'产品单价' + '(￥)'"
-        >
-          <template slot-scope="scope">
-            <el-input clearable size="medium" v-model="scope.row.price">
-            </el-input>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="achievement"
-          width="120"
-          :label="`${'产品业绩'}` + `(${isLocalSymbol()})`"
-        >
-          <template slot-scope="scope">
-            <el-input clearable size="medium" v-model="scope.row.achievement">
-            </el-input>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          width="120"
-          prop="assAchievement"
-          :label="'产品业绩' + '(BV)'"
-        >
-          <template slot-scope="scope">
-            <el-input
-              clearable
-              size="medium"
-              v-model="scope.row.assAchievement"
-            >
-            </el-input>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="orderAmount"
-          :label="'商品总价' + `(${isLocalSymbol()})`"
-        >
-          <template slot-scope="scope">
-            <div>{{ orderAmount }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="orderAchieve"
-          :label="'商品业绩' + `(${isLocals()})`"
-        >
-          <template slot-scope="scope">
-            <div>{{ orderAchieve }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="orderAssAchieve"
-          :label="'商品业绩' + `(BV)`"
-        >
-          <template slot-scope="scope">
-            <div>{{ orderAssAchieve }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="orderAssAchieve"
-          :label="'操作'"
-        >
-          <template slot-scope="scope">
-            <div
-              style="color: #c8161d; cursor: pointer"
-              @click="removeRow(scope.row, scope.$index)"
-            >
-              {{ '删除' }}
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="addList">
-        <i class="el-icon-circle-plus" @click="addNewItem"></i>
-      </div>
-      <el-form :form="forms" label-width="auto">
-        <el-row
-          v-for="(item, index) in forms.accountList"
-          :key="index"
-          :gutter="40"
-        >
-          <el-col :span="4">
-            <el-form-item label="扣款账户">
-              <el-select clearable v-model="item.pkAccount">
-                <el-option
-                  v-for="ctem in bdAccountList"
-                  :key="ctem.pkId"
-                  :label="ctem.accountName"
-                  :value="ctem.pkId"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'扣款比例'">
-              <el-input
-                clearable
-                v-model="item.deductRatio"
-                :placeholder="'请输入' +'扣款比例'"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="2">
-            <div class="middle">
-              <div @click="delKou(index)" v-if="forms.accountList.length != 1">
-                <i class="el-icon-remove"></i>
-              </div>
-              <div @click="addKou">
-                <i class="el-icon-circle-plus"></i>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div class="selDz">
-        <div>{{ '收货地址' }}</div>
-        <el-row style="margin-top: 10px">
-          <el-radio v-model="selLocal" :label="1"
-            >{{ allDetails.recName }}{{ allDetails.recPhone
-            }}{{ allDetails.recProvinceVal }}{{ allDetails.recCityVal
-            }}{{ allDetails.recCountryVal
-            }}{{ allDetails.recAddress }}</el-radio
-          >
-        </el-row>
-        <el-row style="margin-top: 10px">
-          <el-radio v-model="selLocal" :label="2">{{
-            '使用新地址'
-          }}</el-radio>
-        </el-row>
-      </div>
-      <el-form :form="forms" v-show="selLocal == 2" label-width="auto">
-        <el-row :gutter="20">
-          <el-col :span="4">
-            <el-form-item :label="'收货人'">
-              <el-input v-model="forms.recName" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'联系方式'">
-              <el-input v-model="forms.recPhone" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="'收货地址'" class="dizhi">
-              <el-cascader
-                v-model="forms.dizhi"
-                :options="areaData"
-                :props="regionParams"
-                :placeholder="'请选择收货地址'"
-              ></el-cascader>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="" label-width="0">
-              <el-input v-model="forms.recAddress" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'邮费'">
-              <el-input v-model="forms.postage" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div class="xian"></div>
-      <div class="selDz">
-        <div>{{ '奖金发放' }}</div>
-      </div>
-      <el-form>
-        <el-form :form="forms" label-width="auto">
-          <el-row :gutter="20">
-            <el-col :span="4">
-              <el-form-item :label="'是否发放'">
-                <el-radio-group @change="getFong" v-model="forms.bonusFlag">
-                  <el-radio :label="0">{{ '是' }}</el-radio>
-                  <el-radio :label="1">{{ '否' }}</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20" v-show="forms.bonusFlag == 0">
-            <el-col :span="24">
-              <el-form-item :label="'奖金类型'">
-                <el-checkbox-group v-model="forms.bonusList">
-                  <el-checkbox
-                    v-for="item in bonusCountryList"
-                    :key="item.value"
-                    :label="item.value"
-                    >{{ item.label }}</el-checkbox
-                  >
-                </el-checkbox-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="isChangeGoods = false">{{
-          '取消'
-        }}</el-button>
-        <el-button type="primary" @click="saveGoods">{{
-          '确认'
-        }}</el-button>
-      </span>
-    </el-dialog>
-    <el-dialog
-      :title="'发货清单'"
-      :visible.sync="sendGoods"
-      width="90%"
-      :close-on-click-modal="false"
-      center
-    >
-      <el-table
-        :data="rowDetails"
-        style="width: 100%"
-        :header-cell-style="{ background: '#EEEEEE' }"
-        :row-class-name="tableRowClassName"
-      >
-        <el-table-column align="center" prop="cover" :label="'产品主图'">
-          <template slot-scope="scope">
-            <img class="bgImg" :src="scope.row.cover" alt="" />
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="productCode"
-          :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="weight"
-          :label="'重量' + '(KG)'"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="price"
-          :label="'产品单价' + '(￥)'"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="quantity" :label="'产品数量'">
-        </el-table-column>
-        <el-table-column align="center" prop="specsName" label="产品总价(￥)">
-          <template slot-scope="scope">
-            <div>{{ scope.row.price * scope.row.quantity }}</div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-  </div>
-</template>
-
-  <script>
-import * as del from "@/api/delivery";
-import * as api from "@/api/configManage.js";
-import * as pro from "@/api/product.js";
-import { isLocals, isLocalSymbol } from "@/utils/numberToCurrency";
-
-export default {
-  name: "Nowdelivery",
-  props: {
-    params: {
-      type: Object,
-      default: null,
-    },
-  },
-  watch: {
-    newGoodsList: {
-      handler(n) {
-        let orderAchieve = 0,
-          orderAmount = 0,
-          orderAssAchieve = 0;
-        this.newGoodsList.forEach((item) => {
-          orderAchieve += item.achievement * item.quantity;
-          orderAmount += item.price * item.quantity;
-          orderAssAchieve += item.assAchievement * item.quantity;
-        });
-        this.orderAchieve = orderAchieve;
-        this.orderAmount = orderAmount;
-        this.orderAssAchieve = orderAssAchieve;
-      },
-      deep: true,
-    },
-    selLocal(n) {
-      this.forms.dizhi = [];
-      this.forms.recName = "";
-      this.forms.recPhone = "";
-      this.forms.recAddress = "";
-      this.forms.postage = "";
-    },
-  },
-  data() {
-    return {
-      selLocal: 1,
-      orderAchieve: "",
-      orderAmount: "",
-      orderAssAchieve: "",
-      tableData: [],
-      total: 0,
-      idList: [],
-      // 非多个禁用
-      multiple: true,
-      ljfhShow: false,
-      fhTable: [],
-      isChangeGoods: false,
-      allDetails: {
-        detailList: [],
-        accountList: [],
-      },
-      rowIndexArr: [],
-      colSpanArr: [],
-      bdAccountList: [],
-      newGoodsList: [],
-      productList: [],
-      bonusCountryList: [],
-      forms: {
-        dizhi: [],
-        bonusList: [],
-        bonusFlag: 0,
-        recName: "",
-        recPhone: "",
-        recAddress: "",
-        postage: "",
-        accountList: [
-          {
-            pkAccount: "",
-            deductRatio: "",
-          },
-        ],
-      },
-      areaData: [],
-      regionParams: {
-        label: "name",
-        value: "id",
-        children: "children",
-        expandTrigger: "hover",
-      },
-      sendGoods: false,
-      rowDetails: [],
-      pageSizes: [50, 100, 200, 500,1000,2000],
-      // 需要合并项的列
-    };
-  },
-  created() {
-    // this.getList();
-    this.getAllArea();
-  },
-  methods: {
-    isLocalSymbol,
-    isLocals,
-    // 账户列表
-    getpkBdAccountList() {
-      api.pkBdAccountList().then((res) => {
-        this.bdAccountList = res.rows;
-      });
-    },
-    getFong(e) {
-      this.forms.bonusList = [];
-    },
-    bonusCountry() {
-      del.bonusCountry().then((res) => {
-        this.bonusCountryList = res.data;
-      });
-    },
-    // 删除扣款
-    delKou(index) {
-      this.forms.accountList.splice(index, 1);
-    },
-    // 添加扣款
-    addKou() {
-      this.forms.accountList.push({
-        pkAccount: "",
-        deductRatio: "",
-      });
-    },
-    toFixed(id) {
-      del
-        .deliverSecondDetails({
-          pkId: id,
-        })
-        .then((res) => {
-          if (res.code == 200) {
-            this.rowDetails = res.data;
-            this.sendGoods = true;
-          }
-        });
-    },
-    newListSelect(e) {
-      this.newGoodsSelList = e;
-    },
-    handleSelectionChange(selection) {
-      this.idList = selection.map((item) => item.pkId);
-    },
-    getProduct() {
-      del.getProductAll().then((res) => {
-        this.productList = res.data;
-      });
-    },
-    saveGoods() {
-      let obj;
-      if (this.selLocal == 1) {
-        obj = Object.assign({}, this.forms, {
-          pkId: this.allDetails.pkId,
-          recName: this.allDetails.recName,
-          recPhone: this.allDetails.recPhone,
-          recAddress: this.allDetails.recAddress,
-          postage: this.allDetails.postage,
-          recProvince: this.allDetails.recProvince,
-          recCity: this.allDetails.recCity,
-          recCounty: this.allDetails.recCounty || "",
-          productList: this.newGoodsList,
-        });
-      } else {
-        obj = Object.assign({}, this.forms, {
-          pkId: this.allDetails.pkId,
-          recProvince: this.forms.dizhi[0],
-          recCity: this.forms.dizhi[1],
-          recCounty: this.forms.dizhi[2] || "",
-          productList: this.newGoodsList,
-        });
-      }
-      if(this.forms.bonusFlag == 0){
-        if(this.forms.bonusList<=0){
-          this.$message({
-          message: '请选择奖金类型',
-          type: "warning",
-        });
-        return false
-        }
-      }
-      // bonusList
-      this.$router.push({
-        path: "twoZxqc",
-        query: {
-          data: JSON.stringify(obj),
-          approvalBusiness: 253,
-        },
-      });
-    },
-
-    changeProduct(e, index) {
-      this.productList.forEach((item) => {
-        if (item.productCode == e) {
-          this.$set(this.newGoodsList[index], "productName", item.productName);
-          this.$set(this.newGoodsList[index], "pkProduct", item.pkId);
-        }
-      });
-      this.getSku([e]);
-    },
-    // 获取规格
-    getSku(arr) {
-      pro.getProductCodeSpecs({ productCodes: arr }).then((res) => {
-        this.newGoodsList.forEach((item) => {
-          arr.forEach((ctem) => {
-            res.data.forEach((stem) => {
-              if (item.productCode == ctem && ctem == stem.productCode) {
-                // item.specs = stem.specsTypeData
-                this.$set(item, "specs", stem.specsTypeData);
-              }
-            });
-          });
-        });
-        this.$forceUpdate();
-      });
-    },
-    getAllArea() {
-      pro.findAllArea().then((res) => {
-        this.areaData = res.data;
-      });
-    },
-    sureSpecs(index) {
-      this.newGoodsList[index].specs.forEach((item) => {
-        item.specsList.forEach((ctem) => {
-          if (item.radio == ctem.specsId) {
-            item.radioVal = ctem.value;
-          }
-        });
-      });
-      this.newGoodsList[index].specsNameArr = [];
-      this.newGoodsList[index].specificationsArr = [];
-      this.newGoodsList[index].specs.forEach((item) => {
-        this.newGoodsList[index].specsNameArr.push(item.radioVal);
-        this.newGoodsList[index].specificationsArr.push(item.radio);
-      });
-      this.newGoodsList[index].specsNameId = this.newGoodsList[
-        index
-      ].specificationsArr
-        .sort()
-        .join(",");
-      this.newGoodsList[index].specsName =
-        this.newGoodsList[index].specsNameArr.join(",");
-      this.newGoodsList[index].visible = false;
-    },
-    addNewItem() {
-      let obj = {
-        memberCode: this.allDetails.memberCode,
-        memberName: this.allDetails.memberName,
-        pkProduct: "",
-        quantity: 1,
-        specsNameId: "",
-        specsName: "",
-        price: "",
-        achievement: "",
-        assAchievement: "",
-        orderAchieve: "",
-        orderAmount: "",
-        orderAssAchieve: "",
-      };
-      this.newGoodsList.push(obj);
-      this.getColSpanData("orderCode", this.newGoodsList);
-    },
-    removeRow(row, index) {
-      this.newGoodsList.splice(index, 1);
-    },
-    getImmediateData() {
-      del
-        .deliverPopData({
-          pkId: this.idList[0],
-        })
-        .then((res) => {
-          res.data.detailList.forEach((item) => {
-            item.postage = res.data.postage;
-            item.orderAchieve = res.data.orderAchieve;
-            item.orderAmount = res.data.orderAmount;
-            item.orderAssAchieve = res.data.orderAssAchieve;
-            item.orderCode = res.data.orderCode;
-          });
-          this.allDetails = res.data;
-
-          this.getColSpanData("orderCode", this.allDetails.detailList);
-          this.getpkBdAccountList();
-          this.getProduct();
-          this.bonusCountry();
-        });
-      this.isChangeGoods = true;
-    },
-    getList() {
-      del.deliverSecond(this.params).then((res) => {
-        this.tableData = res.rows;
-        this.total = res.total;
-      });
-    },
-    // 调换货合并列
-    objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex >= 8 && columnIndex < 11) {
-        for (let i = 0; i < this.colSpanArr.length; i++) {
-          if (rowIndex == this.rowIndexArr[i]) {
-            return {
-              rowspan: this.colSpanArr[i],
-              colspan: 1,
-            };
-          } else {
-            if (
-              rowIndex > this.rowIndexArr[i] &&
-              rowIndex < this.rowIndexArr[i + 1]
-            ) {
-              return {
-                rowspan: 0,
-                colspan: 0,
-              };
-            }
-          }
-        }
-      }
-    },
-    // 合并行数据处理
-    getColSpanData(prop, datas) {
-      this.rowIndexArr = [];
-      this.colSpanArr = [];
-      let colLength = 1;
-      datas.forEach((element, index) => {
-        if (index == 0) {
-          // rowIndex开始合并的位置为0,合并单元格数量默认为1
-          this.rowIndexArr.push(0);
-          colLength = 1;
-        } else {
-          if (element[prop] == datas[index - 1][prop]) {
-            // 当相邻两条数据相等时，rowspan+1,即colLength+1
-            colLength += 1;
-            // 当最后一条数据与倒数第2条不等式，在colSpanArr中push(1)
-            if (index == datas.length - 1) {
-              this.colSpanArr.push(colLength);
-            }
-          } else {
-            //  相邻两条不等时push index和合并的长度
-            this.colSpanArr.push(colLength);
-            this.rowIndexArr.push(index);
-            if (index == datas.length - 1) {
-              this.colSpanArr.push(1);
-            }
-            colLength = 1;
-          }
-        }
-      });
-      this.rowIndexArr.push(datas.length);
-    },
-    //导出
-    handleExport() {
-      this.download(
-        "/sale/manage/deliver/export",
-        { ...this.params },
-        `${'发货清单-立即发货'}${new Date().getTime()}.xlsx`
-      );
-    },
-    tableRowClassName({ row, rowIndex }) {
-      if (rowIndex % 2 == 1) {
-        return "warning-row";
-      } else if (rowIndex % 2 == 0) {
-        return "success-row";
-      }
-      return "";
-    },
-  },
-};
-</script>
-
-  <style lang="scss" scoped>
-::v-deep .el-table .warning-row {
-  background: #f9f9f9;
-}
-
-::v-deep .el-table .success-row {
-  background: #ffffff;
-}
-::v-deep .el-table thead {
-  color: #000000;
-}
-.main {
-  // margin-top: 20px;
-  background: #ffffff;
-  border-radius: 8px;
-  box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
-
-  .main_content {
-    padding: 20px 25px;
-  }
-
-  .maintop {
-    display: flex;
-    // padding: 10px 20px;
-    padding-bottom: 10px;
-    justify-content: space-between;
-    align-items: center;
-    .mainbtn {
-      .thebtn1 {
-        color: #ffffff;
-        background: rgba(243, 169, 0, 1);
-      }
-      .thebtn2 {
-        color: #ffffff;
-        background: rgba(72, 178, 253, 1);
-      }
-      .thebtn3 {
-        color: #ffffff;
-        background: rgba(83, 177, 30, 1);
-      }
-      .thebtn4 {
-        color: #ffffff;
-        background: rgba(199, 48, 48, 1);
-      }
-      .thebtn5 {
-        color: #ffffff;
-        background: rgba(0, 155, 88, 1);
-      }
-      .thebtn6 {
-        color: #ffffff;
-        background: rgba(236, 108, 0, 1);
-      }
-    }
-  }
-}
-::v-deep .el-form-item {
-  margin-bottom: 0;
-}
-.addList {
-  text-align: center;
-  margin-top: 10px;
-  font-size: 28px;
-}
-.dizhi {
-  ::v-deep .el-cascader {
-    width: 100%;
-  }
-}
-.selDz {
-  margin: 10px 0;
-}
-.xian {
-  height: 1px;
-  background: #cccccc;
-  margin: 20px 0;
-}
-::v-deep .el-dialog__header {
-  border-bottom: 0;
-}
-::v-deep .el-checkbox-group {
-  display: flex;
-  flex-wrap: wrap;
-}
-::v-deep .el-dialog {
-  // margin-top: 10vh!important;
-}
-::v-deep .el-dialog__body {
-  height: 500px;
-  overflow-y: auto;
-}
-.middle {
-  display: flex;
-  line-height: 40px;
-  font-size: 18px;
-  // margin-left: 20px;
-  white-space: nowrap;
-}
-.bgImg {
-  width: 48px;
-  height: 48px;
-}
-</style>
diff --git a/src/views/logistics/delivery/index.vue b/src/views/logistics/delivery/index.vue
index 5b31db4..16ee78b 100644
--- a/src/views/logistics/delivery/index.vue
+++ b/src/views/logistics/delivery/index.vue
@@ -2,39 +2,39 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :topList="topList"
+      :top-list="topList"
       :moren="moren"
-    ></topBar>
+    />
     <div class="thetopbox">
       <el-form ref="form" :model="queryParams" label-width="80px">
         <template v-if="activeName == 0">
           <el-row :gutter="20">
             <el-col :span="4">
               <el-form-item :label="'订单编号'" prop="orderCode">
-                <el-input clearable v-model="queryParams.orderCode"></el-input>
+                <el-input v-model="queryParams.orderCode" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员编号'" prop="memberCode">
-                <el-input clearable v-model="queryParams.memberCode"></el-input>
+                <el-input v-model="queryParams.memberCode" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员姓名'" prop="memberName">
-                <el-input clearable v-model="queryParams.memberName"></el-input>
+                <el-input v-model="queryParams.memberName" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'联系方式'" prop="phone">
-                <el-input clearable v-model="queryParams.phone"></el-input>
+                <el-input v-model="queryParams.phone" clearable />
               </el-form-item>
             </el-col>
 
             <el-col :span="4">
               <el-form-item :label="'订单类型'" prop="orderType">
                 <el-select
-                  clearable
                   v-model="queryParams.orderType"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -42,15 +42,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'订单状态'" prop="orderStatus">
                 <el-select
-                  clearable
                   v-model="queryParams.orderStatus"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -58,7 +58,7 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -67,8 +67,8 @@
             <el-col :span="4">
               <el-form-item :label="'预售状态'" prop="preSaleStatus">
                 <el-select
-                  clearable
                   v-model="queryParams.preSaleStatus"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -76,15 +76,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'发货方式'" prop="deliveryWay">
                 <el-select
-                  clearable
                   v-model="queryParams.deliveryWay"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -92,15 +92,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'运输方式'" prop="transportType">
                 <el-select
-                  clearable
                   v-model="queryParams.transportType"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -108,15 +108,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'支付方式'" prop="payType">
                 <el-select
-                  clearable
                   v-model="queryParams.payType"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -124,15 +124,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'供应方式'" prop="operateScope">
                 <el-select
-                  clearable
                   v-model="queryParams.operateScope"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -140,15 +140,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'产品分类'" prop="pkClassify">
                 <el-select
-                  clearable
                   v-model="queryParams.pkClassify"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -156,7 +156,7 @@
                     :key="index"
                     :label="item.name"
                     :value="item.pkId"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -167,8 +167,8 @@
                 <el-col :span="4">
                   <el-form-item :label="'销售类型'" prop="isGift">
                     <el-select
-                      clearable
                       v-model="queryParams.isGift"
+                      clearable
                       :placeholder="'请选择'"
                     >
                       <el-option
@@ -176,7 +176,7 @@
                         :key="index"
                         :label="item.label"
                         :value="item.value"
-                      ></el-option>
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -186,8 +186,8 @@
                     prop="shippingChannel"
                   >
                     <el-select
-                      clearable
                       v-model="queryParams.shippingChannel"
+                      clearable
                       :placeholder="'请选择'"
                     >
                       <el-option
@@ -195,15 +195,15 @@
                         :key="index"
                         :label="item.label"
                         :value="item.value"
-                      ></el-option>
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item :label="'发货仓库'" prop="orderType">
                     <el-select
-                      clearable
                       v-model="queryParams.pkStorehouse"
+                      clearable
                       :placeholder="'请选择'"
                     >
                       <el-option
@@ -211,46 +211,45 @@
                         :key="index"
                         :label="item.name"
                         :value="item.pkId"
-                      ></el-option>
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item :label="'产品名称'" prop="productName">
-                    <el-input v-model="queryParams.productName"></el-input>
+                    <el-input v-model="queryParams.productName" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item :label="'产品规格'" prop="specsName">
-                    <el-input v-model="queryParams.specsName"></el-input>
+                    <el-input v-model="queryParams.specsName" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item :label="'收货人'" prop="recName">
-                    <el-input v-model="queryParams.recName"></el-input>
+                    <el-input v-model="queryParams.recName" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item :label="'收货电话'" prop="recPhone">
-                    <el-input v-model="queryParams.recPhone"></el-input>
+                    <el-input v-model="queryParams.recPhone" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item :label="'原单号'" prop="code">
                     <el-input
                       v-model="queryParams.originalOrderCode"
-                    ></el-input> </el-form-item
-                ></el-col>
+                    /> </el-form-item></el-col>
                 <el-col :span="8">
                   <el-form-item :label="$t('选择产品')" prop="productIdList">
                     <el-input
+                      v-model="productLists"
                       clearable
                       @clear="clearProduct"
                       @focus="openDig"
-                      v-model="productLists"
-                    ></el-input>
+                    />
                   </el-form-item>
                 </el-col>
                 <!--                <el-col :span="4">-->
@@ -275,8 +274,7 @@
                       :end-placeholder="'结束日期'"
                       value-format="yyyy-MM-dd"
                       :unlink-panels="true"
-                    >
-                    </el-date-picker>
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -289,8 +287,7 @@
                       :end-placeholder="'结束日期'"
                       value-format="yyyy-MM-dd"
                       :unlink-panels="true"
-                    >
-                    </el-date-picker>
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -300,20 +297,20 @@
                     prop="shoppingAddress"
                   >
                     <el-cascader
-                      style="width: 100%"
                       v-model="queryParams.shoppingAddress"
+                      style="width: 100%"
                       :options="areaData"
                       :props="regionParams"
                       @change="handleChange1"
-                    ></el-cascader>
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label-width="10px">
                     <el-input
-                      clearable
                       v-model="queryParams.recAddress"
-                    ></el-input>
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -325,37 +322,37 @@
             <el-col :span="4">
               <el-form-item :label="'发货单号'" prop="deliverCode">
                 <el-input
-                  clearable
                   v-model="queryParams.deliverCode"
-                ></el-input>
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'订单编号'" prop="orderCode">
-                <el-input clearable v-model="queryParams.orderCode"></el-input>
+                <el-input v-model="queryParams.orderCode" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员编号'" prop="memberCode">
-                <el-input clearable v-model="queryParams.memberCode"></el-input>
+                <el-input v-model="queryParams.memberCode" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员姓名'" prop="memberName">
-                <el-input clearable v-model="queryParams.memberName"></el-input>
+                <el-input v-model="queryParams.memberName" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'联系方式'" prop="phone">
-                <el-input clearable v-model="queryParams.phone"></el-input>
+                <el-input v-model="queryParams.phone" clearable />
               </el-form-item>
             </el-col>
 
             <el-col :span="4">
               <el-form-item :label="'订单类型'" prop="orderType">
                 <el-select
-                  clearable
                   v-model="queryParams.orderType"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -363,7 +360,7 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -372,8 +369,8 @@
             <el-col :span="4">
               <el-form-item :label="'订单状态'" prop="orderStatus">
                 <el-select
-                  clearable
                   v-model="queryParams.orderStatus"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -381,15 +378,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'预售状态'" prop="preSaleStatus">
                 <el-select
-                  clearable
                   v-model="queryParams.preSaleStatus"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -397,15 +394,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'发货方式'" prop="deliveryWay">
                 <el-select
-                  clearable
                   v-model="queryParams.deliveryWay"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -413,15 +410,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'运输方式'" prop="transportType">
                 <el-select
-                  clearable
                   v-model="queryParams.transportType"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -429,15 +426,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'供应方式'" prop="operateScope">
                 <el-select
-                  clearable
                   v-model="queryParams.operateScope"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -445,15 +442,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'打印状态'" prop="printStatus">
                 <el-select
-                  clearable
                   v-model="queryParams.printStatus"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -461,7 +458,7 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -471,12 +468,12 @@
               <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item :label="'收货人'" prop="recName">
-                    <el-input v-model="queryParams.recName"></el-input>
+                    <el-input v-model="queryParams.recName" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item :label="'收货电话'" prop="recPhone">
-                    <el-input v-model="queryParams.recPhone"></el-input>
+                    <el-input v-model="queryParams.recPhone" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -486,20 +483,20 @@
                     prop="shoppingAddress"
                   >
                     <el-cascader
-                      style="width: 100%"
                       v-model="queryParams.shoppingAddress"
+                      style="width: 100%"
                       :options="areaData"
                       :props="regionParams"
                       @change="handleChange1"
-                    ></el-cascader>
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="" prop="recAddress" label-width="40px">
                     <el-input
-                      clearable
                       v-model="queryParams.recAddress"
-                    ></el-input>
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -507,32 +504,32 @@
                 <el-col :span="4">
                   <el-form-item :label="'产品名称'" prop="productName">
                     <el-input
-                      clearable
                       v-model="queryParams.productName"
-                    ></el-input>
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item :label="'追溯编号'" prop="barCode">
                     <el-input
-                      clearable
                       v-model="queryParams.barCode"
-                    ></el-input>
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item label="是否追溯" prop="isBarCode">
                     <el-select
+                      v-model="queryParams.isBarCode"
                       clearable
                       :placeholder="'请选择'"
-                      v-model="queryParams.isBarCode"
                     >
                       <el-option
                         v-for="item in yesornoList"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
-                      ></el-option>
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -542,24 +539,24 @@
                     prop="shippingChannel"
                   >
                     <el-select
+                      v-model="queryParams.shippingChannel"
                       clearable
                       :placeholder="'请选择'"
-                      v-model="queryParams.shippingChannel"
                     >
                       <el-option
                         v-for="item in shippingChannelList"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
-                      ></el-option>
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item :label="'发货仓库'" prop="orderType">
                     <el-select
-                      clearable
                       v-model="queryParams.pkStorehouse"
+                      clearable
                       :placeholder="'请选择'"
                     >
                       <el-option
@@ -567,7 +564,7 @@
                         :key="index"
                         :label="item.name"
                         :value="item.pkId"
-                      ></el-option>
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -586,9 +583,9 @@
                 <el-col :span="4">
                   <el-form-item label="批次" prop="dayBatch">
                     <el-input
-                      clearable
                       v-model="queryParams.dayBatch"
-                    ></el-input>
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -601,8 +598,7 @@
                       :end-placeholder="'结束日期'"
                       value-format="yyyy-MM-dd"
                       :unlink-panels="true"
-                    >
-                    </el-date-picker>
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -615,8 +611,7 @@
                       :end-placeholder="'结束日期'"
                       value-format="yyyy-MM-dd"
                       :unlink-panels="true"
-                    >
-                    </el-date-picker>
+                    />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -628,36 +623,36 @@
             <el-col :span="4">
               <el-form-item :label="'发货单号'" prop="deliverCode">
                 <el-input
-                  clearable
                   v-model="queryParams.deliverCode"
-                ></el-input>
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'订单编号'" prop="orderCode">
-                <el-input clearable v-model="queryParams.orderCode"></el-input>
+                <el-input v-model="queryParams.orderCode" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员编号'" prop="memberCode">
-                <el-input clearable v-model="queryParams.memberCode"></el-input>
+                <el-input v-model="queryParams.memberCode" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员姓名'" prop="memberName">
-                <el-input clearable v-model="queryParams.memberName"></el-input>
+                <el-input v-model="queryParams.memberName" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'联系方式'" prop="phone">
-                <el-input clearable v-model="queryParams.phone"></el-input>
+                <el-input v-model="queryParams.phone" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'发货状态'" prop="deliveryStatus">
                 <el-select
-                  clearable
                   v-model="queryParams.deliveryStatus"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -665,7 +660,7 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -674,8 +669,8 @@
             <el-col :span="4">
               <el-form-item :label="'发货方式'" prop="deliveryWay">
                 <el-select
-                  clearable
                   v-model="queryParams.deliveryWay"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -683,15 +678,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'运输方式'" prop="transportType">
                 <el-select
-                  clearable
                   v-model="queryParams.transportType"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -699,7 +694,7 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -707,8 +702,8 @@
             <el-col :span="4">
               <el-form-item :label="'供应方式'" prop="operateScope">
                 <el-select
-                  clearable
                   v-model="queryParams.operateScope"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -716,19 +711,19 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'产品名称'" prop="productName">
                 <el-autocomplete
-                  class="inline-input"
                   v-model="queryParams.productName"
+                  class="inline-input"
                   :fetch-suggestions="querySearch"
                   placeholder="请输入内容或选择"
                   @select="handleSelect"
-                ></el-autocomplete>
+                />
                 <!-- <el-select
                   clearable
                   v-model="queryParams.productName"
@@ -745,15 +740,15 @@
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'产品规格'" prop="specsName">
-                <el-input clearable v-model="queryParams.specsName"></el-input>
+                <el-input v-model="queryParams.specsName" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'物流公司'" prop="logisticsCompany">
                 <el-input
-                  clearable
                   v-model="queryParams.logisticsCompany"
-                ></el-input>
+                  clearable
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -763,21 +758,21 @@
                 <el-col :span="4">
                   <el-form-item :label="'物流单号'" prop="logisticsCode">
                     <el-input
-                      clearable
                       v-model="queryParams.logisticsCode"
-                    ></el-input>
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item :label="'收货人'" prop="recName">
-                    <el-input v-model="queryParams.recName"></el-input>
+                    <el-input v-model="queryParams.recName" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item :label="'发货仓库'" prop="orderType">
                     <el-select
-                      clearable
                       v-model="queryParams.pkStorehouse"
+                      clearable
                       :placeholder="'请选择'"
                     >
                       <el-option
@@ -785,7 +780,7 @@
                         :key="index"
                         :label="item.name"
                         :value="item.pkId"
-                      ></el-option>
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -796,67 +791,48 @@
                     prop="shoppingAddress"
                   >
                     <el-cascader
-                      style="width: 100%"
                       v-model="queryParams.shoppingAddress"
+                      style="width: 100%"
                       :options="areaData"
                       :props="regionParams"
                       @change="handleChange1"
-                    ></el-cascader>
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="" prop="recAddress" label-width="40px">
                     <el-input
-                      clearable
                       v-model="queryParams.recAddress"
-                    ></el-input>
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item :label="'收货电话'" prop="recPhone">
-                    <el-input v-model="queryParams.recPhone"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item
-                    :label="'二次发货'"
-                    prop="secondDeliver"
-                  >
-                    <el-select
-                      clearable
-                      v-model="queryParams.secondDeliver"
-                      :placeholder="'请选择'"
-                    >
-                      <el-option
-                        v-for="(item, index) in yesornoList"
-                        :key="index"
-                        :label="item.label"
-                        :value="item.value"
-                      ></el-option>
-                    </el-select>
+                    <el-input v-model="queryParams.recPhone" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item label="是否追溯" prop="isBarCode">
                     <el-select
+                      v-model="queryParams.isBarCode"
                       clearable
                       :placeholder="'请选择'"
-                      v-model="queryParams.isBarCode"
                     >
                       <el-option
                         v-for="item in yesornoList"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
-                      ></el-option>
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item :label="'追溯编号'" prop="barCode">
-                    <el-input v-model="queryParams.barCode"></el-input>
+                    <el-input v-model="queryParams.barCode" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
@@ -865,8 +841,8 @@
                     prop="shippingChannel"
                   >
                     <el-select
-                      clearable
                       v-model="queryParams.shippingChannel"
+                      clearable
                       :placeholder="'请选择'"
                     >
                       <el-option
@@ -874,22 +850,11 @@
                         :key="index"
                         :label="item.label"
                         :value="item.value"
-                      ></el-option>
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <!--                <el-col :span="4">-->
-                <!--                  <el-form-item :label="$t('系统类型')">-->
-                <!--                    <el-select clearable v-model="queryParams.systemType">-->
-                <!--                      <el-option-->
-                <!--                        v-for="item in systemTypes"-->
-                <!--                        :key="item.value"-->
-                <!--                        :label="item.label"-->
-                <!--                        :value="item.value"-->
-                <!--                      ></el-option>-->
-                <!--                    </el-select>-->
-                <!--                  </el-form-item>-->
-                <!--                </el-col>-->
+
               </el-row>
 
               <el-row :gutter="20">
@@ -903,8 +868,7 @@
                       :end-placeholder="'结束日期'"
                       value-format="yyyy-MM-dd"
                       :unlink-panels="true"
-                    >
-                    </el-date-picker>
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -917,8 +881,7 @@
                       :end-placeholder="'结束日期'"
                       value-format="yyyy-MM-dd"
                       :unlink-panels="true"
-                    >
-                    </el-date-picker>
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -931,8 +894,7 @@
                       :end-placeholder="'结束日期'"
                       value-format="yyyy-MM-dd"
                       :unlink-panels="true"
-                    >
-                    </el-date-picker>
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -945,8 +907,7 @@
                       :end-placeholder="'结束日期'"
                       value-format="yyyy-MM-dd"
                       :unlink-panels="true"
-                    >
-                    </el-date-picker>
+                    />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -957,29 +918,29 @@
           <el-row :gutter="20">
             <el-col :span="4">
               <el-form-item :label="'订单编号'" prop="orderCode">
-                <el-input clearable v-model="queryParams.orderCode"></el-input>
+                <el-input v-model="queryParams.orderCode" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员编号'" prop="memberCode">
-                <el-input clearable v-model="queryParams.memberCode"></el-input>
+                <el-input v-model="queryParams.memberCode" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'会员姓名'" prop="memberName">
-                <el-input clearable v-model="queryParams.memberName"></el-input>
+                <el-input v-model="queryParams.memberName" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'联系方式'" prop="phone">
-                <el-input clearable v-model="queryParams.phone"></el-input>
+                <el-input v-model="queryParams.phone" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'订单类型'" prop="orderType">
                 <el-select
-                  clearable
                   v-model="queryParams.orderType"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -987,15 +948,15 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'发货方式'" prop="deliveryWay">
                 <el-select
-                  clearable
                   v-model="queryParams.deliveryWay"
+                  clearable
                   :placeholder="'请选择'"
                 >
                   <el-option
@@ -1003,7 +964,7 @@
                     :key="index"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -1011,12 +972,12 @@
           <el-row :gutter="20">
             <el-col :span="4">
               <el-form-item :label="'收货人'" prop="recName">
-                <el-input v-model="queryParams.recName"></el-input>
+                <el-input v-model="queryParams.recName" />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'收货电话'" prop="recPhone">
-                <el-input v-model="queryParams.recPhone"></el-input>
+                <el-input v-model="queryParams.recPhone" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -1026,17 +987,17 @@
                 prop="shoppingAddress"
               >
                 <el-cascader
-                  style="width: 100%"
                   v-model="queryParams.shoppingAddress"
+                  style="width: 100%"
                   :options="areaData"
                   :props="regionParams"
                   @change="handleChange1"
-                ></el-cascader>
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="" prop="recAddress" label-width="0">
-                <el-input clearable v-model="queryParams.recAddress"></el-input>
+                <el-input v-model="queryParams.recAddress" clearable />
               </el-form-item>
             </el-col>
           </el-row>
@@ -1046,8 +1007,8 @@
                 <el-col :span="4">
                   <el-form-item :label="'支付方式'" prop="payType">
                     <el-select
-                      clearable
                       v-model="queryParams.payType"
+                      clearable
                       :placeholder="'请选择'"
                     >
                       <el-option
@@ -1055,15 +1016,15 @@
                         :key="index"
                         :label="item.label"
                         :value="item.value"
-                      ></el-option>
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item :label="'发货仓库'" prop="orderType">
                     <el-select
-                      clearable
                       v-model="queryParams.pkStorehouse"
+                      clearable
                       :placeholder="'请选择'"
                     >
                       <el-option
@@ -1071,7 +1032,7 @@
                         :key="index"
                         :label="item.name"
                         :value="item.pkId"
-                      ></el-option>
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -1085,8 +1046,7 @@
                       :end-placeholder="'结束日期'"
                       value-format="yyyy-MM-dd"
                       :unlink-panels="true"
-                    >
-                    </el-date-picker>
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -1099,8 +1059,7 @@
                       :end-placeholder="'结束日期'"
                       value-format="yyyy-MM-dd"
                       :unlink-panels="true"
-                    >
-                    </el-date-picker>
+                    />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -1111,15 +1070,14 @@
           <el-col :span="4">
             <div class="searchbox" style="margin-left: 20px">
               <el-button class="searchbtn" @click="getSearch(1)">
-                {{ '搜索' }}</el-button
-              >
+                {{ '搜索' }}</el-button>
               <el-button @click="reChongzhi"> {{ '重置' }}</el-button>
             </div>
           </el-col>
           <div class="openClose" @click="changeActive">
             <i
               :class="isActive ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
-            ></i>
+            />
             <div>{{ isActive ? '点击收起' : '点击展开' }}</div>
           </div>
         </el-row>
@@ -1127,22 +1085,20 @@
     </div>
     <div class="main">
       <el-tabs
-        style="padding: 10px 20px"
         v-model="activeName"
+        style="padding: 10px 20px"
         @tab-click="handleClick"
       >
-        <el-tab-pane :label="'未合单'" name="0" v-if="menu1">
-          <unhandeled ref="unhandeled" :params="queryParams"></unhandeled>
+        <el-tab-pane v-if="menu1" :label="'未合单'" name="0">
+          <unhandeled ref="unhandeled" :params="queryParams" />
         </el-tab-pane>
-        <el-tab-pane :label="'已合单'" name="1" v-if="menu2">
-          <yihandeled ref="yihandeled" :params="queryParams"></yihandeled>
+        <el-tab-pane v-if="menu2" :label="'已合单'" name="1">
+          <yihandeled ref="yihandeled" :params="queryParams" />
         </el-tab-pane>
-        <el-tab-pane name="2" :label="'立即发货'" v-if="menu3">
-          <nowdelivery ref="nowdelivery" :params="queryParams"></nowdelivery>
-        </el-tab-pane>
-        <el-tab-pane :label="'二次发货'" name="3" v-if="menu4">
-          <twoSend ref="twoSend" :params="queryParams"></twoSend>
+        <el-tab-pane v-if="menu3" name="2" :label="'立即发货'">
+          <nowdelivery ref="nowdelivery" :params="queryParams" />
         </el-tab-pane>
+
       </el-tabs>
     </div>
     <el-dialog
@@ -1157,13 +1113,13 @@
         <el-input
           v-model="select.productName"
           :placeholder="'请输入'"
-          @keyup.enter.native="getDataList"
           prefix-icon="el-icon-search"
-        ></el-input>
-        <div style="height: 10px"></div>
+          @keyup.enter.native="getDataList"
+        />
+        <div style="height: 10px" />
         <el-table
-          :data="dialogList"
           ref="lessonTableRef"
+          :data="dialogList"
           style="width: 100%"
           :row-key="
             (row) => {
@@ -1178,25 +1134,22 @@
             type="selection"
             :reserve-selection="true"
             width="55"
-          >
-          </el-table-column>
+          />
           <el-table-column align="center" prop="cover" :label="'产品主图'">
             <template slot-scope="scope">
-              <img class="bgImg" :src="scope.row.cover" alt="" />
+              <img class="bgImg" :src="scope.row.cover" alt="">
             </template>
           </el-table-column>
           <el-table-column
             align="center"
             prop="productName"
             :label="'产品名称'"
-          >
-          </el-table-column>
+          />
           <el-table-column
             align="center"
             prop="productCode"
             :label="'产品编号'"
-          >
-          </el-table-column>
+          />
         </el-table>
         <pagination
           v-show="total > 0"
@@ -1217,33 +1170,31 @@
 </template>
 
 <script>
-import topBar from "@/components/topBar";
-import * as api from "@/api/site.js";
-import * as log from "@/api/logistics";
-import unhandeled from "@/components/Delivery/unhandeled.vue";
-import yihandeled from "@/components/Delivery/yihandeled.vue";
-import nowdelivery from "@/components/Delivery/nowdelivery.vue";
-import twoSend from "@/components/Delivery/twoSend.vue";
-import * as del from "@/api/delivery.js";
-import { getRouters } from "@/api/settle";
-import { productList } from "@/api/product";
+import topBar from '@/components/topBar'
+import * as api from '@/api/site.js'
+import * as log from '@/api/logistics'
+import unhandeled from '@/components/Delivery/unhandeled.vue'
+import yihandeled from '@/components/Delivery/yihandeled.vue'
+import nowdelivery from '@/components/Delivery/nowdelivery.vue'
+import * as del from '@/api/delivery.js'
+import { getRouters } from '@/api/settle'
+import { productList } from '@/api/product'
 export default {
-  name: "Fhqd",
+  name: 'Fhqd',
   components: {
     topBar,
     unhandeled,
     yihandeled,
-    nowdelivery,
-    twoSend,
+    nowdelivery
   },
   data() {
     return {
-      moren: "fhqd",
+      moren: 'fhqd',
       topList: [
         {
           name: '发货清单',
-          path: "fhqd",
-        },
+          path: 'fhqd'
+        }
       ],
       dialogVisible: false,
       dialogList: [],
@@ -1251,199 +1202,199 @@ export default {
       tableData: [],
       productLists: [],
       select: {},
-      orderTypeList: [], //订单类型
-      orderStatusList: [], //订单状态
-      presaleStatusList: [], //预售状态
-      deliveryWayList: [], //发货方式
-      transportTypeList: [], //运输方式
-      orderPayTypeList: [], //支付方式
-      supplyWayList: [], //供应方式
-      saleTypeList: [], //销售类型
-      deliveryStatusList: [], //发货状态
-      shippingChannelList: [], //发货类型
-      classifyAllList: [], //产品分类
-      printStatusList: [], //打印状态
-      productAllList: [], //产品名称
-      yesornoList: [], //二次发货
-      storehouseList: [], //发货仓库
-      total:'',
+      orderTypeList: [], // 订单类型
+      orderStatusList: [], // 订单状态
+      presaleStatusList: [], // 预售状态
+      deliveryWayList: [], // 发货方式
+      transportTypeList: [], // 运输方式
+      orderPayTypeList: [], // 支付方式
+      supplyWayList: [], // 供应方式
+      saleTypeList: [], // 销售类型
+      deliveryStatusList: [], // 发货状态
+      shippingChannelList: [], // 发货类型
+      classifyAllList: [], // 产品分类
+      printStatusList: [], // 打印状态
+      productAllList: [], // 产品名称
+      yesornoList: [], // 二次发货
+      storehouseList: [], // 发货仓库
+      total: '',
       queryParams: {
         pageNum: 1,
         pageSize: 500,
-        deliverCode: "", //发货单号12
-        printStatus: "", //打印状态1
-        productName: "", //产品名称2
-        specsName: "", //产品规格2
-        logisticsCompany: "", //物流公司2
-        logisticsCode: "", //物流单号2
-        secondDeliver: "", //二次发货2
-        orderCode: "",
-        memberCode: "",
-        memberName: "",
-        phone: "",
-        orderType: "",
-        orderStatus: "",
-        preSaleStatus: "",
-        deliveryWay: "",
-        transportType: "",
-        payType: "",
-        operateScope: "",
-        recName: "",
-        recPhone: "",
-        recProvince: "",
-        recCity: "",
-        recCounty: "",
-        recAddress: "",
-        isGift: "",
-        shippingChannel: "",
+        deliverCode: '', // 发货单号12
+        printStatus: '', // 打印状态1
+        productName: '', // 产品名称2
+        specsName: '', // 产品规格2
+        logisticsCompany: '', // 物流公司2
+        logisticsCode: '', // 物流单号2
+        secondDeliver: '', // 二次发货2
+        orderCode: '',
+        memberCode: '',
+        memberName: '',
+        phone: '',
+        orderType: '',
+        orderStatus: '',
+        preSaleStatus: '',
+        deliveryWay: '',
+        transportType: '',
+        payType: '',
+        operateScope: '',
+        recName: '',
+        recPhone: '',
+        recProvince: '',
+        recCity: '',
+        recCounty: '',
+        recAddress: '',
+        isGift: '',
+        shippingChannel: '',
         shoppingAddress: [],
         creationTime: [],
         payTime: [],
-        printTime: [], //打印时间2
-        deliverTime: [], //发货时间2
-        productIdList: [],
+        printTime: [], // 打印时间2
+        deliverTime: [], // 发货时间2
+        productIdList: []
       },
       isActive: true,
       areaData: [],
       regionParams: {
-        label: "name",
-        value: "id",
-        children: "children",
-        expandTrigger: "hover",
-        checkStrictly: true,
+        label: 'name',
+        value: 'id',
+        children: 'children',
+        expandTrigger: 'hover',
+        checkStrictly: true
       },
       activeName: 0,
       menu1: false,
       menu2: false,
       menu3: false,
-      menu4: false,
-    };
+      menu4: false
+    }
   },
   created() {
-    this.getData();
-    this.getSearch();
-    this.getUserRoute();
+    this.getData()
+    this.getSearch()
+    this.getUserRoute()
   },
   methods: {
     clearProduct() {
-      this.tableData = [];
-      this.lsArr = [];
-      this.queryParams.productIdList = [];
-      this.productLists = [];
+      this.tableData = []
+      this.lsArr = []
+      this.queryParams.productIdList = []
+      this.productLists = []
     },
     openDig() {
-      this.select = {};
+      this.select = {}
       productList(Object.assign({ isPutOn: 0 }, this.queryParams)).then(
         (res) => {
           res.rows.forEach((item) => {
-            item.quantity = 1;
-            item.pkProduct = item.pkProduct;
-            item.isGift = 0;
-          });
-          this.dialogList = res.rows;
-          this.total = res.total;
+            item.quantity = 1
+            item.pkProduct = item.pkProduct
+            item.isGift = 0
+          })
+          this.dialogList = res.rows
+          this.total = res.total
         }
-      );
-      this.dialogVisible = true;
+      )
+      this.dialogVisible = true
     },
     handleClose() {
-      this.dialogVisible = false;
+      this.dialogVisible = false
     },
     getDataList() {
       productList(
         Object.assign({ isPutOn: 0 }, this.queryParams, this.select)
       ).then((res) => {
         res.rows.forEach((item) => {
-          item.quantity = 1;
-          item.pkProduct = item.pkProduct;
-          item.isGift = 0;
-        });
-        this.dialogList = res.rows;
-        this.total = res.total;
-      });
+          item.quantity = 1
+          item.pkProduct = item.pkProduct
+          item.isGift = 0
+        })
+        this.dialogList = res.rows
+        this.total = res.total
+      })
     },
     dialogChange(val) {
-      this.lsArr = val;
+      this.lsArr = val
     },
     onSubmit() {
       // this.tableData = []
       this.lsArr.forEach((item) => {
-        this.tableData.push(item);
-      });
+        this.tableData.push(item)
+      })
       // this.tableData = this.clearArr(this.tableData)
-      this.dialogVisible = false;
+      this.dialogVisible = false
       this.dialogList.forEach((row) => {
-        this.$refs.lessonTableRef.toggleRowSelection(row, false);
-      });
+        this.$refs.lessonTableRef.toggleRowSelection(row, false)
+      })
       // 判断重复
-      let arr = this.tableData;
-      let isTrue = false;
+      const arr = this.tableData
+      let isTrue = false
       for (var i = 0; i < arr.length; i++) {
         // 首次遍历数组
         for (var j = i + 1; j < arr.length; j++) {
           // 再次遍历数组
           if (arr[i].productCode == arr[j].productCode) {
             if (arr[i].isGift == arr[j].isGift) {
-              isTrue = true;
+              isTrue = true
             }
           }
         }
       }
       if (isTrue) {
-        this.$message.error("请勿选择重复的商品");
-        this.tableData = [];
-        this.lsArr = [];
-        this.queryParams.productIdList = [];
-        this.productLists = [];
-        return;
+        this.$message.error('请勿选择重复的商品')
+        this.tableData = []
+        this.lsArr = []
+        this.queryParams.productIdList = []
+        this.productLists = []
+        return
       }
-      this.queryParams.productIdList = [];
-      this.productLists = [];
+      this.queryParams.productIdList = []
+      this.productLists = []
       this.tableData.forEach((item) => {
-        this.queryParams.productIdList.push(item.pkId);
-        this.productLists.push(item.productName);
-      });
+        this.queryParams.productIdList.push(item.pkId)
+        this.productLists.push(item.productName)
+      })
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
-        return "warning-row";
+        return 'warning-row'
       } else if (rowIndex % 2 == 0) {
-        return "success-row";
+        return 'success-row'
       }
-      return "";
+      return ''
     },
     getUserRoute() {
       getRouters().then((res) => {
         res.data.forEach((item) => {
           // 未合单
-          if (item.routeName == "DeliveryUnhandled") {
-            this.menu1 = true;
+          if (item.routeName == 'DeliveryUnhandled') {
+            this.menu1 = true
           }
           // 已合单
-          if (item.routeName == "DeliveryHandled") {
-            this.menu2 = true;
+          if (item.routeName == 'DeliveryHandled') {
+            this.menu2 = true
           }
           // 立即发货
-          if (item.routeName == "DeliveryImmediate") {
-            this.menu3 = true;
+          if (item.routeName == 'DeliveryImmediate') {
+            this.menu3 = true
           }
           // 二次发货
-          if (item.routeName == "DeliverySecond") {
-            this.menu4 = true;
+          if (item.routeName == 'DeliverySecond') {
+            this.menu4 = true
           }
-        });
-      });
+        })
+      })
     },
-    //带输入建议的产品名称
+    // 带输入建议的产品名称
     querySearch(queryString, cb) {
       // console.log('queryString??',queryString)
-      var productAllList = this.productAllList;
+      var productAllList = this.productAllList
       var results = queryString
         ? productAllList.filter(this.createFilter(queryString))
-        : productAllList;
+        : productAllList
       // 调用 callback 返回建议列表的数据
 
-      cb(results);
+      cb(results)
     },
     createFilter(queryString) {
       return (product) => {
@@ -1451,117 +1402,117 @@ export default {
           product.productName
             .toLowerCase()
             .indexOf(queryString.toLowerCase()) === 0
-        );
-      };
+        )
+      }
     },
     handleSelect(item) {
-      this.queryParams.productName = item.pkId;
+      this.queryParams.productName = item.pkId
       // console.log('🌈a???',item)
     },
     handleClick(tab) {
       this.queryParams = {
         pageNum: 1,
         pageSize: 500,
-        orderStatus: "",
-      };
+        orderStatus: ''
+      }
       // this.activeName = tab.name
-      this.getSearch(0);
+      this.getSearch(0)
       // console.log('🌈',tab.name)
     },
     getData() {
       api.areaList().then((res) => {
-        this.areaData = res.data;
-      });
+        this.areaData = res.data
+      })
       log.getOrderType().then((res) => {
-        this.orderTypeList = res.data;
-      });
+        this.orderTypeList = res.data
+      })
       del.getDeliveryStatus().then((res) => {
-        this.deliveryStatusList = res.data;
-      });
+        this.deliveryStatusList = res.data
+      })
       del.getOrderStatus().then((res) => {
-        this.orderStatusList = res.data;
-      });
+        this.orderStatusList = res.data
+      })
       del.getPresaleStatus().then((res) => {
-        this.presaleStatusList = res.data;
-      });
+        this.presaleStatusList = res.data
+      })
       del.getDeliveryWayList().then((res) => {
-        this.deliveryWayList = res.data;
-      });
+        this.deliveryWayList = res.data
+      })
       del.getTransportType().then((res) => {
-        this.transportTypeList = res.data;
-      });
+        this.transportTypeList = res.data
+      })
       del.getOrderPayType().then((res) => {
-        this.orderPayTypeList = res.data;
-      });
+        this.orderPayTypeList = res.data
+      })
       del.getSupplyWay().then((res) => {
-        this.supplyWayList = res.data;
-      });
+        this.supplyWayList = res.data
+      })
       del.getSaleTypeList().then((res) => {
-        this.saleTypeList = res.data;
-      });
+        this.saleTypeList = res.data
+      })
       del.getShippingChannelList().then((res) => {
-        this.shippingChannelList = res.data;
-      });
+        this.shippingChannelList = res.data
+      })
       del.getClassifyAll().then((res) => {
-        this.classifyAllList = res.data;
-      });
+        this.classifyAllList = res.data
+      })
       del.getPrintStatus().then((res) => {
-        this.printStatusList = res.data;
-      });
+        this.printStatusList = res.data
+      })
       del.getProductAll().then((res) => {
         res.data.forEach((element) => {
-          element.value = element.productName;
-        });
-        this.productAllList = res.data;
-      });
+          element.value = element.productName
+        })
+        this.productAllList = res.data
+      })
       del.getDealerYesNo().then((res) => {
-        this.yesornoList = res.data;
-      });
+        this.yesornoList = res.data
+      })
       del.getStorehouseList().then((res) => {
-        this.storehouseList = res.rows;
-      });
+        this.storehouseList = res.rows
+      })
     },
     handleChange1() {},
-    //搜索
+    // 搜索
     getSearch(index) {
       if (this.queryParams.shoppingAddress) {
-        this.queryParams.recProvince = this.queryParams.shoppingAddress[0];
-        this.queryParams.recCity = this.queryParams.shoppingAddress[1];
-        this.queryParams.recCounty = this.queryParams.shoppingAddress[2];
+        this.queryParams.recProvince = this.queryParams.shoppingAddress[0]
+        this.queryParams.recCity = this.queryParams.shoppingAddress[1]
+        this.queryParams.recCounty = this.queryParams.shoppingAddress[2]
       } else {
-        this.queryParams.recAddress = "";
+        this.queryParams.recAddress = ''
       }
 
       this.$nextTick(() => {
-        console.log("this.$refs", this.$refs);
+        console.log('this.$refs', this.$refs)
         if (this.activeName == 0) {
-          this.$refs.unhandeled.getList();
+          this.$refs.unhandeled.getList()
         } else if (this.activeName == 1) {
-          this.$refs.yihandeled.getList();
+          this.$refs.yihandeled.getList()
         } else if (this.activeName == 2) {
-          this.$refs.nowdelivery.getList();
+          this.$refs.nowdelivery.getList()
         } else if (this.activeName == 3) {
           if (index && index == 1) {
-            this.$refs.twoSend.getList();
+            this.$refs.twoSend.getList()
           }
         }
-      });
+      })
     },
-    //重置
+    // 重置
     reChongzhi() {
       this.queryParams = {
         pageNum: 1,
         pageSize: 500,
-        orderStatus: 1,
-      };
-      this.getSearch();
+        orderStatus: 1
+      }
+      this.getSearch()
     },
     // 展开折叠
     changeActive() {
-      this.isActive = !this.isActive;
-    },
-  },
-};
+      this.isActive = !this.isActive
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>