diff --git a/src/components/Delivery/yihandeled.vue b/src/components/Delivery/yihandeled.vue
index 119208e..3c9fdee 100644
--- a/src/components/Delivery/yihandeled.vue
+++ b/src/components/Delivery/yihandeled.vue
@@ -4,13 +4,12 @@
       <div class="maintop">
         <div class="mainbtn">
           <el-button
+            v-hasButtons="['DeliveryHandledPrint']"
             size="small"
             class="thebtn2"
             :disabled="multiple"
-            v-hasButtons="['DeliveryHandledPrint']"
             @click="getPrintCheck"
-            >{{ '生成打印' }}</el-button
-          >
+          >{{ '生成打印' }}</el-button>
           <!-- <el-button
             size="small"
             class="thebtn3"
@@ -28,20 +27,24 @@
             >{{ '解绑追溯' }}</el-button
           > -->
           <el-button
+            v-hasButtons="['DeliveryHandledDelete']"
             size="small"
             class="thebtn4"
             :disabled="multiple"
             @click="deleteDelivery"
-            v-hasButtons="['DeliveryHandledDelete']"
-            >{{ '批量删除' }}</el-button
-          >
+          >{{ '批量删除' }}</el-button>
           <el-button
-            size="small"
             v-hasButtons="['DeliveryHandledExport']"
-            @click="handleExport"
+            size="small"
             class="thebtn1"
-            >{{ '导出' }}</el-button
-          >
+            @click="handleExport"
+          >{{ '导出' }}</el-button>
+          <el-button
+            v-hasButtons="['DeliveryHandledExport']"
+            size="small"
+            class="thebtn1"
+            @click="handleWaresExport"
+          >仓储导出</el-button>
         </div>
       </div>
       <el-table
@@ -49,49 +52,43 @@
         height="540px"
         style="width: 100%"
         :header-cell-style="{ background: '#EEEEEE' }"
-        @selection-change="handleSelectionChange"
         :span-method="objectSpanMethod"
+        @selection-change="handleSelectionChange"
       >
         <!-- :row-class-name="tableRowClassName"
          -->
-        <el-table-column prop="colsele" type="selection" width="55">
-        </el-table-column>
+        <el-table-column prop="colsele" type="selection" width="55" />
 
         <el-table-column
           align="center"
           width="80px"
           prop="dayBatch"
           label="批次"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           width="60px"
           prop="batchNumber"
           label="序号"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           align="center"
           width="180px"
           prop="deliverCode"
           :label="'发货单号'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           width="180px"
           align="center"
           prop="orderCode"
           :label="'订单编号'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="orderTypeVal"
           :label="'订单类型'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="orderStatusVal"
@@ -101,10 +98,9 @@
           <template slot-scope="scope">
             <span>{{ scope.row.orderStatusVal }}</span>
             <span
-              @click="deleteOrderRow(scope.row)"
               style="font-size: 18px; cursor: pointer; margin-left: 10px"
-              ><i class="el-icon-delete"></i
-            ></span>
+              @click="deleteOrderRow(scope.row)"
+            ><i class="el-icon-delete" /></span>
           </template>
         </el-table-column>
         <el-table-column
@@ -112,49 +108,41 @@
           align="center"
           prop="memberCode"
           :label="'会员编号'"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           align="center"
           prop="memberName"
           :label="'会员姓名'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           width="150px"
           align="center"
           prop="phone"
           :label="'联系方式'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           min-width="120px"
           prop="productCode"
           :label="'产品编号'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           width="150px"
           align="center"
           prop="productName"
           :label="'产品名称'"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           width="150px"
           align="center"
           prop="specsName"
           :label="'产品规格'"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="unitName" :label="'产品单位'">
-        </el-table-column>
+        />
+        <el-table-column align="center" prop="unitName" :label="'产品单位'" />
 
-        <el-table-column align="center" prop="quantity" :label="'产品数量'">
-        </el-table-column>
+        <el-table-column align="center" prop="quantity" :label="'产品数量'" />
         <!-- <el-table-column align="center" prop="isBarCodeVal" label="是否追溯">
         </el-table-column>
         <el-table-column align="center" prop="barCode" :label="'追溯编号'">
@@ -162,97 +150,82 @@
         <el-table-column align="center" prop="scanTime" :label="'扫码日期'">
         </el-table-column> -->
 
-        <el-table-column align="center" prop="recName" :label="'收货人'">
-        </el-table-column>
+        <el-table-column align="center" prop="recName" :label="'收货人'" />
         <el-table-column
           width="150px"
           align="center"
           prop="recPhone"
           :label="'收货电话'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           width="180px"
           align="center"
           prop="recAddress"
           :formatter="formatAddress"
           :label="'收货地址'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="shippingChannelVal"
           :label="'发货类型'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           min-width="100px"
           align="center"
           prop="storehouseName"
           :label="'发货仓库'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="printStatusVal"
           :label="'打印状态'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           width="150px"
           align="center"
           prop="payTime"
           :label="'支付日期'"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           align="center"
           prop="deliveryWayVal"
           :label="'发货方式'"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           align="center"
           prop="operateScopeVal"
           :label="'供应方式'"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           align="center"
           prop="tranTypeVal"
           :label="'运输方式'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="preSaleStatusVal"
           :label="'预售状态'"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           align="center"
           prop="logisticsCompany"
           :label="'物流公司'"
-        >
-        </el-table-column>
+        />
         <el-table-column
           align="center"
           prop="logisticsCode"
           :label="'物流单号'"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="remark" :label="'备注'">
-        </el-table-column>
+        />
+        <el-table-column align="center" prop="remark" :label="'备注'" />
         <el-table-column
           align="center"
           prop="vertexName"
           :label="$t('隶属体系')"
-        >
-        </el-table-column>
+        />
         <!-- <el-table-column
           align="center"
           prop="systemType"
@@ -273,8 +246,7 @@
           align="center"
           prop="creationTime"
           :label="'创建日期'"
-        >
-        </el-table-column>
+        />
       </el-table>
     </div>
     <pagination
@@ -282,8 +254,8 @@
       :total="total"
       :page.sync="params.pageNum"
       :limit.sync="params.pageSize"
+      :page-sizes="pageSizes"
       @pagination="getList"
-      :pageSizes="pageSizes"
     />
 
     <!-- 打印货单1版 -->
@@ -362,83 +334,78 @@
       :visible.sync="bdzsShow"
       width="70%"
       append-to-body
-      ><div>
-        <el-table
-          :data="codeData"
-          height="500px"
-          style="width: 100%"
-          :header-cell-style="{ background: '#EEEEEE' }"
-          border
-          ref="singleTable"
-          @current-change="handleCurrentChange"
-        >
-          <el-table-column
-            align="center"
-            prop="orderCode"
-            :label="'订单编号'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="productName"
-            :label="'产品名称'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="specsName"
-            :label="'产品规格'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="productNum"
-            :label="'产品数量'"
-          >
-          </el-table-column>
-          <el-table-column align="center" prop="barCode" :label="'追溯编号'">
-            <template slot-scope="scope">
-              <el-input
-                :disabled="!ifcodebind"
-                v-model="scope.row.barCode"
-                tabindex="1"
-                :ref="'mark' + scope.$index"
-                @keydown.enter.native="nextFocus"
-              ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="" :label="'操作'">
-            <template slot-scope="scope">
-              <div
-                v-if="ifcodebind"
-                @click="reCz(scope.row)"
-                style="cursor: pointer; color: #409eff"
-              >
-                {{ '重置' }}
-              </div>
-              <div
-                @click="handleDelete(scope.row, scope.$index, codeData)"
-                style="color: #c73030; cursor: pointer"
-              >
-                {{ '删除' }}
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="footer" style="text-align: center; margin-top: 20px">
-          <el-button @click="bdzsShow = false">
-            {{ '取消' }}</el-button
-          >
-          <el-button type="primary" @click="sureBd">{{
-            '确定'
-          }}</el-button>
-        </div>
+    ><div>
+      <el-table
+        ref="singleTable"
+        :data="codeData"
+        height="500px"
+        style="width: 100%"
+        :header-cell-style="{ background: '#EEEEEE' }"
+        border
+        @current-change="handleCurrentChange"
+      >
+        <el-table-column
+          align="center"
+          prop="orderCode"
+          :label="'订单编号'"
+        />
+        <el-table-column
+          align="center"
+          prop="productName"
+          :label="'产品名称'"
+        />
+        <el-table-column
+          align="center"
+          prop="specsName"
+          :label="'产品规格'"
+        />
+        <el-table-column
+          align="center"
+          prop="productNum"
+          :label="'产品数量'"
+        />
+        <el-table-column align="center" prop="barCode" :label="'追溯编号'">
+          <template slot-scope="scope">
+            <el-input
+              :ref="'mark' + scope.$index"
+              v-model="scope.row.barCode"
+              :disabled="!ifcodebind"
+              tabindex="1"
+              @keydown.enter.native="nextFocus"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="" :label="'操作'">
+          <template slot-scope="scope">
+            <div
+              v-if="ifcodebind"
+              style="cursor: pointer; color: #409eff"
+              @click="reCz(scope.row)"
+            >
+              {{ '重置' }}
+            </div>
+            <div
+              style="color: #c73030; cursor: pointer"
+              @click="handleDelete(scope.row, scope.$index, codeData)"
+            >
+              {{ '删除' }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="footer" style="text-align: center; margin-top: 20px">
+        <el-button @click="bdzsShow = false">
+          {{ '取消' }}</el-button>
+        <el-button type="primary" @click="sureBd">{{
+          '确定'
+        }}</el-button>
       </div>
+    </div>
     </el-dialog>
 
     <!-- 国内打印 -->
-    <div id="print-content" v-show="false">
-      <div class="fhdbox2" v-for="(item, index) in dyhdData" :key="index">
+    <div v-show="false" id="print-content">
+      <div v-for="(item, index) in dyhdData" :key="index" class="fhdbox2">
         <div>
           <div
             class="fhdTitle"
@@ -466,7 +433,7 @@
           </div>
 
           <div style="padding-right: 20px">
-            <img :id="'barcode' + index" />
+            <img :id="'barcode' + index">
           </div>
           <div
             class="mainrow2"
@@ -512,8 +479,7 @@
               <span> {{ '收货地址' }}:</span>
               <span>
                 {{ item.recProvinceVal }}{{ item.recCityVal
-                }}{{ item.recCountyVal || "" }}{{ item.recAddress }}</span
-              >
+                }}{{ item.recCountyVal || "" }}{{ item.recAddress }}</span>
             </div>
           </div>
 
@@ -573,21 +539,21 @@
           </div>
           <div>
             <span style="font-weight: bold; font-size: 12px">温馨提示：</span>
-            <span style="font-size:10px;!important"
-              >尊敬的各位家人，感谢您长期以来对海之圣的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span
-            >
+            <span
+              style="font-size:10px;!important"
+            >尊敬的各位家人，感谢您长期以来对海之圣的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span>
           </div>
-          <div style="page-break-after: always"></div>
+          <div style="page-break-after: always" />
         </div>
       </div>
     </div>
     <!-- 海外打印 -->
-    <div id="print-content2" v-show="false">
+    <div v-show="false" id="print-content2">
       <div
-        class="fhdbox2"
-        style="min-height: 100vh"
         v-for="(item, index) in dyhdData"
         :key="index"
+        class="fhdbox2"
+        style="min-height: 100vh"
       >
         <div
           class="fhdTitle"
@@ -718,8 +684,8 @@
             <td colspan="2">{{ aitem.price }}</td>
             <td colspan="2">{{ aitem.price * aitem.quantity }}</td>
             <td colspan="2">{{ aitem.specsName }}</td>
-            <td colspan="2"></td>
-            <td colspan="2"></td>
+            <td colspan="2" />
+            <td colspan="2" />
           </tr>
         </table>
       </div>
@@ -728,21 +694,21 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-import * as del from "@/api/delivery";
-import JsBarcode from "jsbarcode";
+import { mapGetters } from 'vuex'
+import * as del from '@/api/delivery'
+import JsBarcode from 'jsbarcode'
 export default {
-  name: "Yihandeled",
+  name: 'Yihandeled',
+  filters: {
+    decimalFormat(value) {
+      return Number(value).toFixed(2)
+    }
+  },
   props: {
     params: {
       type: Object,
-      default: null,
-    },
-  },
-  filters: {
-    decimalFormat(value) {
-      return Number(value).toFixed(2);
-    },
+      default: null
+    }
   },
   data() {
     return {
@@ -752,192 +718,206 @@ export default {
       orderIdList: [],
       multiple: true,
       bdzsShow: false,
-      zsTitle: "",
-      ifcodebind: "", //true绑定false解绑
+      zsTitle: '',
+      ifcodebind: '', // true绑定false解绑
       codeData: [],
-      delIdList: [], //存放删除
-      delIdList2: [], //存放解绑
+      delIdList: [], // 存放删除
+      delIdList2: [], // 存放解绑
       pageSizes: [100, 500, 1000, 2000, 4000],
       // 需要合并项的列
       needMergeArr: [
         {
-          colName: "colsele",
-          mergeCheckNames: ["deliverCode"],
+          colName: 'colsele',
+          mergeCheckNames: ['deliverCode']
         },
         {
-          colName: "dayBatch",
-          mergeCheckNames: ["dayBatch", "batchNumber"],
+          colName: 'dayBatch',
+          mergeCheckNames: ['dayBatch', 'batchNumber']
         },
         {
-          colName: "batchNumber",
-          mergeCheckNames: ["dayBatch", "batchNumber"],
+          colName: 'batchNumber',
+          mergeCheckNames: ['dayBatch', 'batchNumber']
         },
         {
-          colName: "deliverCode",
-          mergeCheckNames: ["deliverCode"],
+          colName: 'deliverCode',
+          mergeCheckNames: ['deliverCode']
         },
         {
-          colName: "orderCode",
-          mergeCheckNames: ["deliverCode", "orderCode"],
+          colName: 'orderCode',
+          mergeCheckNames: ['deliverCode', 'orderCode']
         },
         {
-          colName: "orderTypeVal",
-          mergeCheckNames: ["deliverCode", "orderCode", "orderTypeVal"],
+          colName: 'orderTypeVal',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'orderTypeVal']
         },
         {
-          colName: "memberCode",
-          mergeCheckNames: ["deliverCode", "orderCode", "memberCode"],
+          colName: 'memberCode',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'memberCode']
         },
         {
-          colName: "memberName",
-          mergeCheckNames: ["deliverCode", "orderCode", "memberName"],
+          colName: 'memberName',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'memberName']
         },
         {
-          colName: "phone",
-          mergeCheckNames: ["deliverCode", "orderCode", "phone"],
+          colName: 'phone',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'phone']
         },
         {
-          colName: "recName",
-          mergeCheckNames: ["deliverCode", "orderCode", "recName"],
+          colName: 'recName',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'recName']
         },
         {
-          colName: "recPhone",
-          mergeCheckNames: ["deliverCode", "orderCode", "recPhone"],
+          colName: 'recPhone',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'recPhone']
         },
 
         {
-          colName: "recAddress",
-          mergeCheckNames: ["deliverCode", "orderCode", "recAddress"],
+          colName: 'recAddress',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'recAddress']
         },
         {
-          colName: "operateScopeVal",
-          mergeCheckNames: ["deliverCode", "orderCode", "operateScopeVal"],
+          colName: 'operateScopeVal',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'operateScopeVal']
         },
         {
-          colName: "isLandTransVal",
-          mergeCheckNames: ["deliverCode", "orderCode", "isLandTransVal"],
+          colName: 'isLandTransVal',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'isLandTransVal']
         },
         {
-          colName: "deliveryWayVal",
-          mergeCheckNames: ["deliverCode", "orderCode", "deliveryWayVal"],
+          colName: 'deliveryWayVal',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'deliveryWayVal']
         },
         {
-          colName: "preSaleStatusVal",
-          mergeCheckNames: ["deliverCode", "orderCode", "preSaleStatusVal"],
+          colName: 'preSaleStatusVal',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'preSaleStatusVal']
         },
         {
-          colName: "printStatusVal",
-          mergeCheckNames: ["deliverCode", "orderCode", "printStatusVal"],
+          colName: 'printStatusVal',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'printStatusVal']
         },
         {
-          colName: "remark",
-          mergeCheckNames: ["deliverCode", "orderCode", "remark"],
+          colName: 'remark',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'remark']
         },
         {
-          colName: "creationTime",
-          mergeCheckNames: ["deliverCode", "orderCode", "creationTime"],
+          colName: 'creationTime',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'creationTime']
         },
         {
-          colName: "payTime",
-          mergeCheckNames: ["deliverCode", "orderCode", "payTime"],
+          colName: 'payTime',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'payTime']
         },
         {
-          colName: "logisticsCompany",
-          mergeCheckNames: ["deliverCode", "orderCode", "logisticsCompany"],
+          colName: 'logisticsCompany',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'logisticsCompany']
         },
         {
-          colName: "logisticsCode",
-          mergeCheckNames: ["deliverCode", "orderCode", "logisticsCode"],
-        },
+          colName: 'logisticsCode',
+          mergeCheckNames: ['deliverCode', 'orderCode', 'logisticsCode']
+        }
       ],
       rowMergeArrs: {}, // 包含需要一个或多个合并项信息的对象
       dyhdTable: [],
       dyhdData: [],
-      pkCountry: "",
-      currentRow: "",
-    };
+      pkCountry: '',
+      currentRow: ''
+    }
   },
   computed: {
-    ...mapGetters(["user"]),
+    ...mapGetters(['user'])
   },
   mounted() {
-    this.getList();
-    this.pkCountry = this.user.pkCountry;
+    this.getList()
+    this.pkCountry = this.user.pkCountry
   },
   methods: {
+    handleWaresExport() {
+      this.params.pkDeliverList = this.idList
+      this.$confirm('是否确认导出所有数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then((_) => {
+        this.download(
+          '/sale/manage/deliver-handled/wms-export',
+          { ...this.params },
+          `${'已合单-仓储导出'}${new Date().getTime()}.xlsx`
+        )
+      })
+    },
     formatAddress(row) {
       return (
         row.recProvinceVal +
         row.recCityVal +
-        (row.recCountyVal || "") +
+        (row.recCountyVal || '') +
         row.recAddress
-      );
+      )
     },
     // 条码枪回车
     handleCurrentChange(val) {
-      this.currentRow = val;
+      this.currentRow = val
     },
     // 条码枪回车
     nextFocus() {
-      const len = this.codeData.length;
-      const val = this.currentRow;
+      const len = this.codeData.length
+      const val = this.currentRow
       this.codeData.forEach((v, i) => {
         if (v === val) {
           if (i < len - 1) {
-            this.setCurrent(this.codeData[i + 1]);
-            this.$refs["mark" + (i + 1)].focus();
+            this.setCurrent(this.codeData[i + 1])
+            this.$refs['mark' + (i + 1)].focus()
           } else {
-            this.setCurrent(this.codeData[0]);
-            this.$refs["mark" + 0].focus();
+            this.setCurrent(this.codeData[0])
+            this.$refs['mark' + 0].focus()
           }
         }
-      });
+      })
     },
     // 条码枪回车
     setCurrent(row) {
-      this.$refs.singleTable.setCurrentRow(row);
+      this.$refs.singleTable.setCurrentRow(row)
     },
     totalAmount(row) {
-      let total2 = "";
+      let total2 = ''
 
-      total2 = row.price * row.quantity;
-      return total2;
+      total2 = row.price * row.quantity
+      return total2
     },
-    //解决多列行列合并，根据某一列 合并其他列
+    // 解决多列行列合并，根据某一列 合并其他列
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      let needMerge = this.needMergeArr.some((item) => {
-        return item.colName === column.property;
-      });
+      const needMerge = this.needMergeArr.some((item) => {
+        return item.colName === column.property
+      })
       if (needMerge === true) {
-        return this.mergeAction(column.property, rowIndex, column);
+        return this.mergeAction(column.property, rowIndex, column)
       }
     },
     mergeAction(val, rowIndex, colData) {
-      let _row = this.rowMergeArrs[val].rowArr[rowIndex];
-      let _col = _row > 0 ? 1 : 0;
-      return [_row, _col];
+      const _row = this.rowMergeArrs[val].rowArr[rowIndex]
+      const _col = _row > 0 ? 1 : 0
+      return [_row, _col]
     },
     rowMergeHandle(arr, data) {
-      if (!Array.isArray(arr) && !arr.length) return false;
-      if (!Array.isArray(data) && !data.length) return false;
-      let needMerge = {};
+      if (!Array.isArray(arr) && !arr.length) return false
+      if (!Array.isArray(data) && !data.length) return false
+      const needMerge = {}
 
       arr.forEach((mergeItem) => {
         // 创建合并管理对象
         needMerge[mergeItem.colName] = {
           rowArr: [],
-          rowMergeNum: 0,
-        };
-        let currentMergeItemData = needMerge[mergeItem.colName];
+          rowMergeNum: 0
+        }
+        const currentMergeItemData = needMerge[mergeItem.colName]
 
         // 进行合并管理对象数据的遍历整理
         data.forEach((item, index) => {
           if (index === 0) {
-            currentMergeItemData.rowArr.push(1);
-            currentMergeItemData.rowMergeNum = 0;
+            currentMergeItemData.rowArr.push(1)
+            currentMergeItemData.rowMergeNum = 0
           } else {
-            let currentRowData = data[index];
-            let preRowData = data[index - 1];
+            const currentRowData = data[index]
+            const preRowData = data[index - 1]
 
             if (
               this.colMergeCheck(
@@ -948,48 +928,47 @@ export default {
             ) {
               currentMergeItemData.rowArr[
                 currentMergeItemData.rowMergeNum
-              ] += 1;
-              currentMergeItemData.rowArr.push(0);
+              ] += 1
+              currentMergeItemData.rowArr.push(0)
             } else {
-              currentMergeItemData.rowArr.push(1);
-              currentMergeItemData.rowMergeNum = index;
+              currentMergeItemData.rowArr.push(1)
+              currentMergeItemData.rowMergeNum = index
             }
           }
-        });
-      });
-      return needMerge;
+        })
+      })
+      return needMerge
     },
     colMergeCheck(currentRowData, preRowData, mergeCheckNames) {
-      if (!Array.isArray(mergeCheckNames) && !mergeCheckNames.length)
-        return false;
-      let result = true;
+      if (!Array.isArray(mergeCheckNames) && !mergeCheckNames.length) { return false }
+      let result = true
       for (let index = 0; index < mergeCheckNames.length; index++) {
-        const mergeCheckName = mergeCheckNames[index];
+        const mergeCheckName = mergeCheckNames[index]
         if (currentRowData[mergeCheckName] !== preRowData[mergeCheckName]) {
-          result = false;
-          break;
+          result = false
+          break
         }
       }
-      return result;
+      return result
     },
-    //删除行内订单状态列
+    // 删除行内订单状态列
     deleteOrderRow(row) {
-      this.$confirm('是否删除' + "?").then((_) => {
+      this.$confirm('是否删除' + '?').then((_) => {
         del.deleteDeliverItems({ id: row.pkId || null }).then((res) => {
           if (res.code == 200) {
             this.$message({
               message: res.msg,
-              type: "success",
-            });
-            this.getList();
+              type: 'success'
+            })
+            this.getList()
           }
-        });
-      });
+        })
+      })
     },
-    //重置
+    // 重置
     reCz(row) {
       this.$confirm('是否重置?').then((_) => {
-        row.barCode = "";
+        row.barCode = ''
         // del
         //   .codeReset({ barCodeId: row.deliverBarCodeId || null })
         //   .then((res) => {
@@ -1000,158 +979,158 @@ export default {
         //       });
         //     }
         //   });
-      });
+      })
     },
-    //列表删除
+    // 列表删除
     deleteDelivery() {
-      this.$confirm('是否删除' + "?").then((_) => {
+      this.$confirm('是否删除' + '?').then((_) => {
         del.deleteDeliver({ idList: this.idList.join() }).then((res) => {
           if (res.code == 200) {
             this.$message({
               message: res.msg,
-              type: "success",
-            });
-            this.getList();
+              type: 'success'
+            })
+            this.getList()
           }
-        });
-      });
+        })
+      })
     },
-    //删除
+    // 删除
     handleDelete(row, index, rows) {
       if (this.ifcodebind) {
-        //绑定-删除
-        this.$confirm('是否删除' + "?").then((_) => {
+        // 绑定-删除
+        this.$confirm('是否删除' + '?').then((_) => {
           if (row.deliverBarCodeId) {
             del.codeReset({ barCodeId: row.deliverBarCodeId }).then((res) => {
               if (res.code == 200) {
                 this.$message({
                   message: res.msg,
-                  type: "success",
-                });
-                rows.splice(index, 1);
+                  type: 'success'
+                })
+                rows.splice(index, 1)
               }
-            });
+            })
           } else {
             this.$message({
-              message: "没有绑定过追溯码",
-              type: "warning",
-            });
+              message: '没有绑定过追溯码',
+              type: 'warning'
+            })
           }
-        });
+        })
       } else {
-        //解绑-删除
+        // 解绑-删除
 
-        this.$confirm('是否删除' + "?").then((_) => {
+        this.$confirm('是否删除' + '?').then((_) => {
           if (row.deliverBarCodeId) {
             del.codeReset({ barCodeId: row.deliverBarCodeId }).then((res) => {
               if (res.code == 200) {
                 this.$message({
                   message: res.msg,
-                  type: "success",
-                });
+                  type: 'success'
+                })
               }
-            });
-            let thedel1 = [];
-            thedel1.push(row.deliverBarCodeId);
-            this.delIdList = thedel1;
-            rows.splice(index, 1);
+            })
+            const thedel1 = []
+            thedel1.push(row.deliverBarCodeId)
+            this.delIdList = thedel1
+            rows.splice(index, 1)
           } else {
             this.$message({
-              message: "没有绑定过追溯码",
-              type: "warning",
-            });
+              message: '没有绑定过追溯码',
+              type: 'warning'
+            })
           }
-        });
+        })
       }
     },
     getList() {
-      this.params.pkDeliverList = [];
+      this.params.pkDeliverList = []
       del.getDeliveryHandledList(this.params).then((res) => {
-        this.tableData = res.rows;
-        this.total = res.total;
+        this.tableData = res.rows
+        this.total = res.total
         this.rowMergeArrs = this.rowMergeHandle(
           this.needMergeArr,
           this.tableData
-        );
-      });
+        )
+      })
     },
 
-    //绑定/解绑
+    // 绑定/解绑
     sureBd() {
       if (this.ifcodebind == true) {
-        //绑定
+        // 绑定
         del.savCodeBind(this.codeData).then((res) => {
           if (res.code == 200) {
             this.$message({
               message: res.msg,
-              type: "success",
-            });
-            this.bdzsShow = false;
-            this.getList();
+              type: 'success'
+            })
+            this.bdzsShow = false
+            this.getList()
           }
-        });
+        })
       } else {
         if (this.codeData.length > 0) {
-          //解绑确定
+          // 解绑确定
           del.codeUnbind(this.delIdList2).then((res) => {
             if (res.code == 200) {
               this.$message({
                 message: res.msg,
-                type: "success",
-              });
-              this.bdzsShow = false;
-              this.getList();
+                type: 'success'
+              })
+              this.bdzsShow = false
+              this.getList()
             }
-          });
+          })
         } else {
-          this.bdzsShow = false;
+          this.bdzsShow = false
         }
       }
     },
     codeBind(index) {
-      this.delIdList = [];
-      this.ifcodebind = index;
+      this.delIdList = []
+      this.ifcodebind = index
 
       if (index == true) {
-        //绑定追溯
-        this.zsTitle = '绑定追溯码';
+        // 绑定追溯
+        this.zsTitle = '绑定追溯码'
         del
           .getCodeBindData({ deliverIdList: this.idList.join() })
           .then((res) => {
             res.data.forEach((element) => {
-              element.productNum = 1;
-            });
-            this.codeData = res.data;
-          });
+              element.productNum = 1
+            })
+            this.codeData = res.data
+          })
       } else if (index == false) {
-        //解绑追溯
-        this.zsTitle = '解绑追溯码';
+        // 解绑追溯
+        this.zsTitle = '解绑追溯码'
 
         del
           .getCodeUnbindData({
             deliverIdList: this.idList.join(),
-            orderIdList: this.orderIdList.join(),
+            orderIdList: this.orderIdList.join()
           })
           .then((res) => {
             res.data.forEach((element) => {
-              element.productNum = 1;
-            });
-            this.codeData = res.data;
-            let thedel2 = [];
+              element.productNum = 1
+            })
+            this.codeData = res.data
+            const thedel2 = []
             res.data.forEach((ele) => {
-              thedel2.push(ele.deliverBarCodeId);
-            });
-            this.delIdList2 = thedel2;
-          });
+              thedel2.push(ele.deliverBarCodeId)
+            })
+            this.delIdList2 = thedel2
+          })
       }
-      this.bdzsShow = true;
+      this.bdzsShow = true
     },
-    //生成打印
+    // 生成打印
     getPrintCheck() {
       del
         .deliverHandledPrint({ deliverIdList: this.idList.join() })
         .then((res) => {
-          this.dyhdData = res.data;
+          this.dyhdData = res.data
         })
         .finally(() => {
           // 在接口请求完成后，循环生成条形码并展示在页面上
@@ -1159,58 +1138,58 @@ export default {
           // 循环生成条形码并展示在页面上
           this.dyhdData.forEach((item, index) => {
             // 使用JsBarcode生成条形码图片
-            JsBarcode("#barcode" + index, item.deliverCode, {
-              format: "CODE128",
-              lineColor: "#000",
-              background: "#EBEEF5",
+            JsBarcode('#barcode' + index, item.deliverCode, {
+              format: 'CODE128',
+              lineColor: '#000',
+              background: '#EBEEF5',
               width: 2,
               height: 20,
-              displayValue: false,
-            });
-          });
+              displayValue: false
+            })
+          })
         })
         .then(() => {
           if (this.pkCountry == 1) {
-            const printContent = document.getElementById("print-content");
-            const printWindow = window.open("", "_blank"); //这句解决edge浏览器打不开的问题
-            printWindow.document.write(printContent.innerHTML);
-            printWindow.document.close();
-            printWindow.focus();
-            printWindow.print();
-            printWindow.close();
+            const printContent = document.getElementById('print-content')
+            const printWindow = window.open('', '_blank') // 这句解决edge浏览器打不开的问题
+            printWindow.document.write(printContent.innerHTML)
+            printWindow.document.close()
+            printWindow.focus()
+            printWindow.print()
+            printWindow.close()
           } else {
-            const printContent = document.getElementById("print-content2");
-            const printWindow = window.open("", "_blank"); //这句解决edge浏览器打不开的问题
-            printWindow.document.write(printContent.innerHTML);
-            printWindow.document.close();
-            printWindow.focus();
-            printWindow.print();
-            printWindow.close();
+            const printContent = document.getElementById('print-content2')
+            const printWindow = window.open('', '_blank') // 这句解决edge浏览器打不开的问题
+            printWindow.document.write(printContent.innerHTML)
+            printWindow.document.close()
+            printWindow.focus()
+            printWindow.print()
+            printWindow.close()
           }
-        });
+        })
     },
     handleSelectionChange(selection) {
-      this.idList = selection.map((item) => item.pkDeliver);
-      this.orderIdList = selection.map((item) => item.pkOrder);
-      this.multiple = !selection.length;
+      this.idList = selection.map((item) => item.pkDeliver)
+      this.orderIdList = selection.map((item) => item.pkOrder)
+      this.multiple = !selection.length
     },
-    //导出
+    // 导出
     handleExport() {
-      this.params.pkDeliverList = this.idList;
+      this.params.pkDeliverList = this.idList
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then((_) => {
         this.download(
-          "/sale/manage/deliver-handled/export",
+          '/sale/manage/deliver-handled/export',
           { ...this.params },
           `${'已合单'}${new Date().getTime()}.xlsx`
-        );
-      });
-    },
-  },
-};
+        )
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/router/index.js b/src/router/index.js
index 3e90a53..83e4b48 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -939,37 +939,8 @@ export const constantRoutes = [
             meta: { title: '邮费配置' }
           }
         ]
-      },
-      {
-        path: 'productBasicInfo',
-        name: 'productBasicInfo',
-        meta: { title: '产品基本信息' },
-        component: ParentView,
-        redirect: 'productBasicInfo/cpfl',
-        children: [
-          {
-            path: 'productBasicList',
-            name: 'productBasicList',
-            component: () => import('@/views/goodsManage/productBasicInfo/productBasicList/index.vue'),
-            meta: { title: '产品列表' },
-            hidden: true
-          },
-          {
-            path: 'productBasicAdd',
-            name: 'productBasicAdd',
-            component: () => import('@/views/goodsManage/productBasicInfo/productBasicAdd/jcsz.vue'),
-            meta: { title: '产品新增' },
-            hidden: true
-          },
-          {
-            path: 'productBasicDetail',
-            name: 'productBasicDetail',
-            component: () => import('@/views/goodsManage/productBasicInfo/productBasicAdd/productDetail.vue'),
-            // meta: { title: '产品列表'},
-            hidden: true
-          }
-        ]
       }
+
     ]
 
   },
diff --git a/src/views/goodsManage/productBasicInfo/productBasicAdd/jcsz.vue b/src/views/goodsManage/productBasicInfo/productBasicAdd/jcsz.vue
deleted file mode 100644
index e18491c..0000000
--- a/src/views/goodsManage/productBasicInfo/productBasicAdd/jcsz.vue
+++ /dev/null
@@ -1,802 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: kBank
- * @Date: 2022-10-28 09:02:23
--->
-<template>
-  <div class="page">
-    <div class="topbox">
-      <div class="levelList_i"
-           :class="tabActive == item.id ? 'act' : ''"
-           v-for="(item, index) in topList"
-           :key="index"
-           @click.prevent="handleLink(item.id)">
-        {{ item.name }}
-      </div>
-    </div>
-    <div class="main">
-      <div class="contain">
-        <el-form ref="form"
-                 :rules="rules"
-                 :model="form"
-                 label-width="auto">
-          <div v-show="tabActive==0">
-            <el-row >
-              <el-col class="el-col-40">
-                <el-form-item :label="'产品名称'"
-                              prop="productName">
-                  <el-input clearable
-                            v-model="form.productName"
-                            :placeholder="'请输入'"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col class="el-col-20">
-                <el-form-item :label="'产品编码'"
-                              prop="productCode">
-                  <el-input clearable
-
-                            v-model="form.productCode"
-                            :placeholder="'请输入'"></el-input>
-                </el-form-item>
-              </el-col>
-              <!-- <el-col class="el-col-20">
-                <el-form-item :label="'划线价'"
-                              prop="retailPrice">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d.]/g,'')"
-                            v-model="form.retailPrice"
-                            :placeholder="'请输入'"></el-input>
-                </el-form-item>
-              </el-col> -->
-              <!-- <el-col class="el-col-20">
-                <el-form-item :label="'发货类型'"
-                              prop="shippingChannel">
-                  <el-select clearable
-                             v-model="form.shippingChannel">
-                    <el-option v-for="item in fhTypeList"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col> -->
-              <el-col class="el-col-20">
-                <el-form-item :label="'保质期'"
-                              prop="shelfLife">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d]/g,'')"
-                            v-model="form.shelfLife"
-                            :placeholder="'请输入'">
-                    <i slot="suffix"
-                       class="neibu">{{'天'}} </i>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col class="el-col-20">
-                <el-form-item :label="'单位'"
-                              prop="unit">
-                  <el-select clearable
-                             v-model="form.unit">
-                    <el-option v-for="item in dwList"
-                               :key="item.pkId"
-                               :label="item.name"
-                               :value="item.pkId"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col class="el-col-20">
-                <el-form-item :label="'重量'"
-                              prop="weight">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d.]/g,'')"
-                            v-model="form.weight"
-                            :placeholder="'请输入'">
-                    <i slot="suffix"
-                       class="neibu">KG </i>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <!-- <el-col class="el-col-20">
-                <el-form-item :label="'邮费重量'"
-                              prop="postageWeight">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d.]/g,'')"
-                            v-model="form.postageWeight"
-                            :placeholder="'请输入'">
-                    <i slot="suffix"
-                       class="neibu">KG </i>
-                  </el-input>
-                </el-form-item>
-              </el-col> -->
-              <!-- <el-col class="el-col-20">
-                <el-form-item :label="'请选择产品属性'"
-                              prop="productAttr">
-                  <el-select clearable
-                             v-model="form.productAttr">
-                    <el-option v-for="item in productTypeList"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col> -->
-              <el-col class="el-col-20">
-                <el-form-item :label="'所属分类'"
-                              prop="pkClassify">
-                  <el-select clearable
-                             v-model="form.pkClassify">
-                    <el-option v-for="item in classifyList"
-                               :key="item.pkId"
-                               :label="item.name"
-                               :value="item.pkId"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <!-- <el-col class="el-col-20">
-                <el-form-item :label="'排列序号'"
-                              prop="sort">
-                  <el-input clearable
-                            oninput="value = value.replace(/[^\d]/g,'')"
-                            v-model="form.sort"
-                            :placeholder="'请输入'">
-                  </el-input>
-                </el-form-item>
-              </el-col> -->
-              <el-col class="el-col-20">
-                <el-form-item :label="'长'"
-                              prop="length">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d.]/g,'')"
-                            v-model="form.length"
-                            :placeholder="'请输入'">
-                    <i slot="suffix"
-                       class="neibu">CM </i>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col class="el-col-20">
-                <el-form-item :label="'宽'"
-                              prop="width">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d.]/g,'')"
-                            v-model="form.width"
-                            :placeholder="'请输入'">
-                    <i slot="suffix"
-                       class="neibu">CM </i>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col class="el-col-20">
-                <el-form-item :label="'高'"
-                              prop="height">
-                  <el-input clearable
-                            oninput="value=value.replace(/[^\d.]/g,'')"
-                            v-model="form.height"
-                            :placeholder="'请输入'">
-                    <i slot="suffix"
-                       class="neibu">CM </i>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <!-- <el-col class="el-col-20">
-                <el-form-item :label="'复购类型'">
-                  <el-select clearable
-                             v-model="form.repurchaseType">
-                    <el-option v-for="item in repurchaseTypeList"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col> -->
-              <!-- <el-col class="el-col-20">
-                <el-form-item label="产品基本信息">
-                  <el-select clearable
-                             v-model="form.pkProductBas">
-                    <el-option v-for="item in productList"
-                               :key="item.pkId"
-                               :label="item.productName"
-                               :value="item.pkId"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col> -->
-              <el-col class="el-col-40">
-                <el-form-item :label="'产品主图'"
-                              prop="cover">
-                  <!-- <el-upload :headers="headers"
-                             :class="{ uploadIconOne: showImg, uploadIcon: noneUploadImg }"
-                             :action="uploadImgUrl"
-                             :on-success="handlePictureSuccess"
-                             :on-change="uploadImgChange"
-                             list-type="picture-card"
-                             :limit="1"
-                             :on-remove="handleRemove">
-                    <i class="el-icon-plus"></i>
-                  </el-upload> -->
-                  <imageUpload v-model="form.cover" />
-                  <div class="jy">{{ '建议尺寸452×452，大小为200K' }}</div>
-                </el-form-item>
-              </el-col>
-             
-            </el-row>
-          </div>
-          <div v-show="tabActive==1">
-            <el-form-item :label="'规格'"
-                          prop="pkSpecsType">
-              <el-tag :key="item.pkId"
-                      v-for="item,index in ggList"
-                      closable
-                      class="elTag"
-                      v-show="item.checked"
-                      :disable-transitions="false"
-                      @close="handleClose(item.pkId)">
-                {{item.typeName}}
-              </el-tag>
-              <el-button class="button-new-tag"
-                         size="small"
-                         @click="openDiag=true">{{'添加'}}</el-button>
-            </el-form-item>
-          </div>
-          <!-- <div v-show="tabActive==2">
-            <el-row :gutter="40">
-              <el-col class="el-col-20">
-                <el-form-item :label="'抽奖礼品'"
-                              prop="isPrize">
-                  <el-select clearable
-                             v-model="form.isPrize">
-                    <el-option v-for="item in agreeList"
-                               :key="item.val"
-                               :label="item.text"
-                               :value="item.val"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col class="el-col-20">
-                <el-form-item :label="'特惠礼品'"
-                              prop="isGift">
-                  <el-select clearable
-                             v-model="form.isGift">
-                    <el-option v-for="item in agreeList"
-                               :key="item.val"
-                               :label="item.text"
-                               :value="item.val"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col class="el-col-20">
-                <el-form-item :label="'提货商品'"
-                              prop="isPickUp">
-                  <el-select clearable
-                             v-model="form.isPickUp">
-                    <el-option v-for="item in agreeList"
-                               :key="item.val"
-                               :label="item.text"
-                               :value="item.val"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col class="el-col-20">
-                <el-form-item :label="'合并发货'"
-                              prop="isMerge">
-                  <el-select clearable
-                             v-model="form.isMerge">
-                    <el-option v-for="item in agreeList"
-                               :key="item.val"
-                               :label="item.text"
-                               :value="item.val"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col class="el-col-20">
-                <el-form-item :label="'冷链运输'"
-                              prop="isFresh">
-                  <el-select clearable
-                             v-model="form.isFresh">
-                    <el-option v-for="item in agreeList"
-                               :key="item.val"
-                               :label="item.text"
-                               :value="item.val"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col class="el-col-20">
-                <el-form-item :label="'追溯编号'"
-                              prop="isBarCode">
-                  <el-select clearable
-                             v-model="form.isBarCode">
-                    <el-option v-for="item in agreeList"
-                               :key="item.val"
-                               :label="item.text"
-                               :value="item.val"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col class="el-col-20">
-                <el-form-item :label="'运输方式'"
-                              prop="ysList">
-                  <el-checkbox-group v-model="form.ysList"
-                                     @change="changeYsfs">
-                    <el-checkbox v-for="item,index in transportTypeList"
-                                 :key="item.value"
-                                 :label="item.value">{{item.label}}</el-checkbox>
-                  </el-checkbox-group>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div> -->
-        </el-form>
-      </div>
-      <div class="footer">
-        <el-button size="small"
-                   class="cancelBtn"> {{ '取消' }}</el-button>
-        <el-button size="small"
-                   v-hasButtons="['productBasicAddSure']"
-                   @click="submit('form')"
-                   style="background: #c8161d;border: none;"
-                   class="sureBtn"> {{ '确认' }}</el-button>
-      </div>
-    </div>
-    <el-dialog :title="'添加'"
-               :visible.sync="openDiag"
-               :close-on-click-modal="false"
-               width="30%"
-               center>
-      <div class="addCheck">
-        <el-checkbox-group v-model="form.checkList"
-                           class="check">
-          <el-checkbox v-for="item,index in ggList"
-                       class="check_i"
-                       :key="item.pkId"
-                       :label="item.pkId">{{item.typeName}}</el-checkbox>
-        </el-checkbox-group>
-      </div>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button @click="openDiag = false">{{'取消'}}</el-button>
-        <el-button type="primary"
-                   @click="checkTrue">{{'确认'}}</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { getToken } from '@/utils/auth'
-import * as api from '@/api/product.js'
-import ImageUpload from '@/components/ImageUpload'
-
-export default {
-  name: 'jcsz',
-  components: {
-    ImageUpload,
-  },
-  data() {
-    return {
-      rules: {
-        shippingChannel: [
-          { required: true, message: '请输入发货类型', trigger: 'change' },
-        ],
-        unit: [{ required: true, message: '请选择单位', trigger: 'change' }],
-        productName: [
-          { required: true, message: '请输入产品名称', trigger: 'blur' },
-        ],
-        retailPrice: [
-          { required: true, message: '请输入划线价', trigger: 'blur' },
-        ],
-        shelfLife: [
-          { required: true, message: '请输入保质期', trigger: 'blur' },
-        ],
-        weight: [{ required: true, message: '请输入重量', trigger: 'blur' }],
-        productCode: [
-          { required: true, message: '请输入产品编号', trigger: 'blur' },
-        ],
-        postageWeight: [
-          { required: true, message: '请输入邮费重量', trigger: 'blur' },
-        ],
-        productAttr: [
-          { required: true, message: '请选择产品属性', trigger: 'change' },
-        ],
-        pkClassify: [
-          { required: true, message: '请选择所属分类', trigger: 'change' },
-        ],
-        sort: [{ required: true, message: '请输入排列序号', trigger: 'blur' }],
-        length: [{ required: true, message: '请输入长', trigger: 'blur' }],
-        width: [{ required: true, message: '请输入宽', trigger: 'blur' }],
-        height: [{ required: true, message: '请输入高', trigger: 'blur' }],
-        cover: [
-          { required: true, message: '请上传产品主图', trigger: 'change' },
-        ],
-        pkSpecsType: [
-          { required: true, message: '请选择规格', trigger: 'change' },
-        ],
-        isPrize: [
-          { required: true, message: '抽奖礼品', trigger: 'change' },
-        ],
-        isGift: [
-          { required: true, message: '请选择特惠礼品', trigger: 'change' },
-        ],
-        isPickUp: [
-          { required: true, message: '请选择提货商品', trigger: 'change' },
-        ],
-        isMerge: [
-          { required: true, message: '请选择合并发货', trigger: 'change' },
-        ],
-        isFresh: [
-          { required: true, message: '请选择冷链运输', trigger: 'change' },
-        ],
-        isBarCode: [
-          { required: true, message: '请选择条码管理', trigger: 'change' },
-        ],
-        ysList: [
-          { required: true, message: '请选择运输方式', trigger: 'change' },
-        ],
-      },
-      ggList: [],
-      // 规格名称弹框
-      openDiag: false,
-      showImg: true, //默认展示
-      noneUploadImg: false, //
-      uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload',
-      headers: {
-        Authorization: getToken(),
-      },
-      form: {
-        productCode: '',
-        sptw: '',
-        checkList: [],
-        ysList: [],
-        sort: '',
-        postageWeight: '',
-        height: '',
-        width: '',
-        length: '',
-        weight: '',
-        shelfLife: '',
-        retailPrice: '',
-      },
-      tabActive: 0,
-      agreeList: [
-        {
-          text: '允许',
-          val: 0,
-        },
-        {
-          text: '禁止',
-          val: 1,
-        },
-      ],
-      topList: [
-        {
-          name: '基础设置',
-          id: 0,
-        },
-        {
-          name: '规格明细',
-          id: 1,
-        },
-        // {
-        //   name: '拓展设置',
-        //   id: 2,
-        // },
-      ],
-      productTypeList: [],
-      fhTypeList: [],
-      dwList: [],
-      classifyList: [],
-      transportTypeList: [],
-      repurchaseTypeList: [],
-      productList: [],
-    }
-  },
-  mounted() {
-    // 获取规格list
-    this.getGg()
-    // // // 产品属性枚举
-    // this.getProductType()
-    // // 发货类型
-    // this.getShipping()
-    // // 单位
-    this.getUnit()
-    // 复购类型
-    // this.getRepurchaseType()
-    // 所属分类
-    this.getClassifyAll()
-    // 运输方式
-    this.getTransportType()
-    // 获取产品编号
-    this.getProductCode()
-    // 获取排序
-    this.getSort()
-    // // 获取产品
-    // this.getProduct()
-  },
-  methods: {
-
-    // getProduct() {
-    //   api.productFind().then((res) => {
-    //     this.productList = res.data
-    //   })
-    // },
-    // getRepurchaseType() {
-    //   api.repurchaseType().then((res) => {
-    //     this.repurchaseTypeList = res.data
-    //   })
-    // },
-    getSort() {
-      api.getMaxSort().then((res) => {
-        this.form.sort = res.data
-      })
-    },
-    getProductCode() {
-      api.getProductCode().then((res) => {
-        this.form.productCode = res.msg
-      })
-    },
-    // 运输方式单独三个字段
-    changeYsfs(val) {
-      // 有陆运
-      if (val.indexOf(1) > -1) {
-        this.form.isLandTrans = 0
-      } else {
-        this.form.isLandTrans = 1
-      }
-      // 有空运
-      if (val.indexOf(2) > -1) {
-        this.form.isAirTrans = 0
-      } else {
-        this.form.isAirTrans = 1
-      }
-      // 海运
-      if (val.indexOf(3) > -1) {
-        this.form.isOceanTrans = 0
-      } else {
-        this.form.isOceanTrans = 1
-      }
-    },
-    // 运输方式
-    getTransportType() {
-      api.transportType().then((res) => {
-        this.transportTypeList = res.data
-      })
-    },
-    // 所属分类
-    getClassifyAll() {
-      api.classifyAll().then((res) => {
-        this.classifyList = res.data
-      })
-    },
-    // 选完规格
-    checkTrue() {
-      this.ggList.forEach((item) => {
-        item.checked = false
-      })
-      this.ggList.forEach((item) => {
-        this.form.checkList.forEach((child) => {
-          if (item.pkId == child) {
-            item.checked = true
-          }
-        })
-      })
-      this.openDiag = false
-      this.form.pkSpecsType = this.form.checkList
-    },
-    // 获取规格
-    getGg() {
-      api.findAll().then((res) => {
-        res.data.forEach((item) => {
-          item.checked = false
-        })
-        this.ggList = res.data
-      })
-    },
-    // // 产品属性枚举
-    // getProductType() {
-    //   api.productType().then((res) => {
-    //     this.productTypeList = res.data
-    //   })
-    // },
-    // // 发货类型
-    // getShipping() {
-    //   api.getShipping().then((res) => {
-    //     this.fhTypeList = res.data
-    //   })
-    // },
-    // // 单位
-    getUnit() {
-      api.unitAll().then((res) => {
-        this.dwList = res.data
-      })
-    },
-    // 移除规格
-    handleClose(pkId) {
-      // 引藏全规格中选中字段
-      this.ggList.forEach((item) => {
-        if (item.pkId == pkId) {
-          item.checked = false
-        }
-      })
-      // 移除表单选中
-      this.form.checkList.splice(this.form.checkList.indexOf(pkId), 1)
-      this.$forceUpdate()
-    },
-    submit(form) {
-      this.$refs[form].validate((valid) => {
-        if (valid) {
-          api.productSaveJxc(this.form).then((res) => {
-            if (res.code == 200) {
-              this.$message({
-                message: '添加成功',
-                type: 'success',
-              })
-              this.$router.replace({
-                path: 'productBasicList',
-              })
-            } else {
-              this.$message({
-                message: res.msg,
-                type: 'warning',
-                duration: 3000,
-              })
-            }
-          })
-        } else {
-          return false
-        }
-      })
-    },
-    // 切换tab
-    handleLink(id) {
-      this.tabActive = id
-    },
-    // uploadImgChange(file, fileList) {
-    //   this.noneUploadImg = fileList.length > 0
-    //   this.$refs.form.clearValidate('cover')
-    // },
-    //图片上传成功后的回调
-    // handlePictureSuccess(res, file) {
-    //   this.form.cover = res.data.url
-    // },
-    //图片上传删除
-    // handleRemove(file, fileList) {
-    //   this.form.cover = ''
-    //   this.noneUploadImg = fileList.length > 0
-    // },
-  },
-}
-</script>
-<style scoped lang="scss">
-::v-deep .el-select {
-  width: 100%;
-}
-.uploadIcon ::v-deep .el-upload--picture-card {
-  display: none !important; /* 上传按钮隐藏 */
-}
-.el-col-20 {
-  width: 20%;
-}
-.el-col-60 {
-  width: 60%;
-}
-.el-col-40 {
-  width: 40%;
-}
-.page {
-  padding-top: 20px;
-  background: #f9f9f9;
-}
-.topbox {
-  align-items: center;
-  padding: 0px 0 0px 0;
-  display: flex;
-  //   background: skyblue;
-  .levelList_i {
-    margin-left: 20px;
-    position: relative;
-    cursor: pointer;
-    // padding: 0 5px;
-    // width: 88px;
-    // height: 34px;
-    border-radius: 17px;
-    border: 1px solid #cccccc;
-    font-size: 12px;
-    font-family: MicrosoftYaHei;
-    text-align: center;
-    padding: 4px 15px;
-    // line-height: 32px;
-  }
-  .act {
-    color: #ffffff;
-    background: #c8161d;
-  }
-  .act1 {
-    border-bottom: 3px solid #1890ff !important;
-  }
-  .cha {
-    font-size: 16px;
-    color: #606266;
-    position: absolute;
-    top: 10px;
-  }
-  .li {
-    width: 40px;
-    margin: 0 auto;
-    border-bottom: 3px solid transparent;
-  }
-}
-.page {
-  height: calc(100vh - 50px);
-  overflow: hidden;
-  background: #f9f9f9;
-  padding-top: 20px;
-}
-
-.main {
-  display: flex;
-  flex-direction: column;
-  height: calc(100vh - 124px);
-  overflow: hidden;
-}
-.contain {
-  background: #ffffff;
-  border-radius: 8px;
-  box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
-  // margin: 10px 20px 0 20px;
-  flex: 1;
-  padding: 10px;
-}
-.footer {
-  height: 68px;
-  background: #ffffff;
-  box-shadow: 0px -3px 20px 0px rgba(204, 204, 204, 0.5);
-  margin: 0 0px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.thebtn1 {
-  background: #48b2fd;
-  color: #ffffff;
-  padding: 9px 45px;
-}
-.thebtn2 {
-  background: #f9f9f9;
-  color: #333;
-  padding: 9px 45px;
-}
-.neibu {
-  margin-right: 10px;
-  color: #666666;
-  font-style: normal;
-}
-.elTag {
-  margin-right: 10px;
-}
-.check {
-  display: flex;
-  flex-wrap: wrap;
-  text-align: center;
-  // justify-content: center;
-  .check_i {
-    width: 50%;
-    text-align: left;
-    margin-bottom: 10px;
-    margin-right: 0 !important;
-  }
-}
-.jy {
-  font-size: 10px;
-  font-family: PingFang SC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #999999;
-}
-.addCheck {
-  padding-left: 20px;
-}
-::v-deep .el-dialog__body {
-  border-top: 1px solid #eee;
-  border-bottom: 1px solid #eee;
-}
-::v-deep .el-form-item {
-  margin-bottom: 15px;
-}
-</style>
diff --git a/src/views/goodsManage/productBasicInfo/productBasicAdd/productDetail.vue b/src/views/goodsManage/productBasicInfo/productBasicAdd/productDetail.vue
deleted file mode 100644
index 2df6f9f..0000000
--- a/src/views/goodsManage/productBasicInfo/productBasicAdd/productDetail.vue
+++ /dev/null
@@ -1,805 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: kBank
- * @Date: 2022-10-31 13:55:20
--->
-<template>
-  <div class="page">
-    <div class="topbox">
-      <div class="levelList_i"
-           :class="tabActive == item.id ? 'act' : ''"
-           v-for="(item, index) in topList"
-           :key="index"
-           @click.prevent="handleLink(item.id)">
-        {{ item.name }}
-      </div>
-    </div>
-    <div class="main">
-      <div class="contain">
-        <el-form ref="form"
-                 :rules="rules"
-                 :model="form"
-                 label-width="80px">
-          <div v-show="tabActive==0">
-            <el-col class="el-col-40">
-              <el-form-item :label="'产品名称'"
-                            prop="productName">
-                <el-input clearable
-                          v-model="form.productName"
-                          :disabled="methods"
-                          :placeholder="'请输入'"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col class="el-col-20">
-              <el-form-item :label="'产品编号'"
-                            prop="productCode">
-                <el-input clearable
-                          v-model="form.productCode"
-                          disabled
-                          :placeholder="'请输入'"></el-input>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col class="el-col-20">
-              <el-form-item :label="'划线价'"
-                            prop="retailPrice">
-                <el-input clearable
-                          v-model="form.retailPrice"
-                          :disabled="methods"
-                          :placeholder="'请输入'"></el-input>
-              </el-form-item>
-            </el-col> -->
-            <!-- <el-col class="el-col-20">
-              <el-form-item :label="'发货类型'"
-                            prop="shippingChannel">
-                <el-select clearable
-                           v-model="form.shippingChannel"
-                           :disabled="methods">
-                  <el-option v-for="item in fhTypeList"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-            <el-col class="el-col-20">
-              <el-form-item label="保质期"
-                            prop="shelfLife">
-                <el-input clearable
-                          oninput="value=value.replace(/[^\d]/g,'')"
-                          v-model="form.shelfLife"
-                          :disabled="methods"
-                          :placeholder="'请输入'">
-                  <i slot="suffix"
-                     class="neibu">{{'天'}} </i>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col class="el-col-20">
-              <el-form-item :label=''单位''
-                            prop="unit">
-                <el-select clearable
-                           v-model="form.unit"
-                           :disabled="methods">
-                  <el-option v-for="item in dwList"
-                             :key="item.pkId"
-                             :label="item.name"
-                             :value="item.pkId"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col class="el-col-20">
-              <el-form-item :label="'重量'"
-                            prop="weight">
-                <el-input clearable
-                          oninput="value=value.replace(/[^\d.]/g,'')"
-                          v-model="form.weight"
-                          :disabled="methods"
-                          :placeholder="'请输入'">
-                  <i slot="suffix"
-                     class="neibu">KG </i>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col class="el-col-20">
-              <el-form-item :label="'邮费重量'"
-                            prop="postageWeight">
-                <el-input clearable
-                          oninput="value=value.replace(/[^\d.]/g,'')"
-                          v-model="form.postageWeight"
-                          :disabled="methods"
-                          :placeholder="'请输入'">
-                  <i slot="suffix"
-                     class="neibu">KG </i>
-                </el-input>
-              </el-form-item>
-            </el-col> -->
-            <!-- <el-col class="el-col-20">
-              <el-form-item :label="'产品属性'"
-                            prop="productAttr">
-                <el-select clearable
-                           v-model="form.productAttr"
-                           :disabled="methods">
-                  <el-option v-for="item in productTypeList"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-            <el-col class="el-col-20">
-              <el-form-item :label="'所属分类'"
-                            prop="pkClassify">
-                <el-select clearable
-                           v-model="form.pkClassify"
-                           :disabled="methods">
-                  <el-option v-for="item in classifyList"
-                             :key="item.pkId"
-                             :label="item.name"
-                             :value="item.pkId"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col class="el-col-20">
-              <el-form-item :label="'排列序号'"
-                            prop="sort">
-                <el-input clearable
-                          oninput="value = value.replace(/[^\d]/g,'')"
-                          v-model="form.sort"
-                          :disabled="methods"
-                          :placeholder="'请输入'">
-                </el-input>
-              </el-form-item>
-            </el-col>  -->
-            <el-col class="el-col-20">
-              <el-form-item :label="'长'"
-                            prop="length">
-                <el-input clearable
-                          oninput="value=value.replace(/[^\d.]/g,'')"
-                          v-model="form.length"
-                          :disabled="methods"
-                          :placeholder="'请输入'">
-                  <i slot="suffix"
-                     class="neibu">CM </i>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col class="el-col-20">
-              <el-form-item :label="'宽'"
-                            prop="width">
-                <el-input clearable
-                          oninput="value=value.replace(/[^\d.]/g,'')"
-                          v-model="form.width"
-                          :disabled="methods"
-                          :placeholder="'请输入'">
-                  <i slot="suffix"
-                     class="neibu">CM </i>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col class="el-col-20">
-              <el-form-item :label="'高'"
-                            prop="height">
-                <el-input clearable
-                          oninput="value=value.replace(/[^\d.]/g,'')"
-                          v-model="form.height"
-                          :disabled="methods"
-                          :placeholder="'请输入'">
-                  <i slot="suffix"
-                     class="neibu">CM </i>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col class="el-col-20">
-                <el-form-item :label="'复购类型'">
-                  <el-select clearable  :disabled="methods"
-                             v-model="form.repurchaseType">
-                    <el-option v-for="item in repurchaseTypeList"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col> -->
-            <el-col class="el-col-40">
-              <el-form-item :label="'产品主图'"
-                            prop="cover">
-                <el-upload :headers="headers"
-                           :disabled="methods"
-                           :class="{ uploadIconOne: showImg, uploadIcon: noneUploadImg }"
-                           :action="uploadImgUrl"
-                           :file-list="form.coverList"
-                           :on-success="handlePictureSuccess"
-                           :on-change="uploadImgChange"
-                           list-type="picture-card"
-                           :limit="1"
-                           :on-remove="handleRemove">
-                  <i class="el-icon-plus"></i>
-                </el-upload>
-                <div class="jy">建议尺寸452×452，大小为200K</div>
-              </el-form-item>
-            </el-col>
-          </div>
-          <div v-show="tabActive==1">
-            <el-form-item :label="'规格'"
-                          prop="pkSpecsType">
-              <el-tag :key="item.pkId"
-                      v-for="item,index in ggList"
-                      :closable="!methods"
-                      class="elTag"
-                      v-show="item.checked"
-                      :disable-transitions="false"
-                      @close="handleClose(item.pkId)">
-                {{item.typeName}}
-              </el-tag>
-              <el-button class="button-new-tag"
-                         v-show="!methods"
-                         size="small"
-                         @click="openDiag=true">{{'添加'}}</el-button>
-            </el-form-item>
-          </div>
-          <!-- <div v-show="tabActive==2">
-            <el-col class="el-col-20">
-              <el-form-item :label="'抽奖礼品'"
-                            prop="isPrize">
-                <el-select clearable
-                           v-model="form.isPrize"
-                           :disabled="methods">
-                  <el-option v-for="item in agreeList"
-                             :key="item.val"
-                             :label="item.text"
-                             :value="item.val"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col class="el-col-20">
-              <el-form-item :label="'特惠礼品'"
-                            prop="isGift">
-                <el-select clearable
-                           v-model="form.isGift"
-                           :disabled="methods">
-                  <el-option v-for="item in agreeList"
-                             :key="item.val"
-                             :label="item.text"
-                             :value="item.val"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col class="el-col-20">
-              <el-form-item :label="'提货商品'"
-                            prop="isPickUp">
-                <el-select clearable
-                           v-model="form.isPickUp"
-                           :disabled="methods">
-                  <el-option v-for="item in agreeList"
-                             :key="item.val"
-                             :label="item.text"
-                             :value="item.val"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col class="el-col-20">
-              <el-form-item :label="'合并发货'"
-                            prop="isMerge">
-                <el-select clearable
-                           v-model="form.isMerge"
-                           :disabled="methods">
-                  <el-option v-for="item in agreeList"
-                             :key="item.val"
-                             :label="item.text"
-                             :value="item.val"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col class="el-col-20">
-              <el-form-item :label="'冷链运输'"
-                            prop="isFresh">
-                <el-select clearable
-                           v-model="form.isFresh"
-                           :disabled="methods">
-                  <el-option v-for="item in agreeList"
-                             :key="item.val"
-                             :label="item.text"
-                             :value="item.val"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col class="el-col-20">
-              <el-form-item :label="'追溯编号'"
-                            prop="isBarCode">
-                <el-select clearable
-                           v-model="form.isBarCode"
-                           :disabled="methods">
-                  <el-option v-for="item in agreeList"
-                             :key="item.val"
-                             :label="item.text"
-                             :value="item.val"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col class="el-col-20">
-              <el-form-item :label="'运输方式'"
-                            prop="ysList">
-                <el-checkbox-group v-model="form.ysList"
-                                   :disabled="methods"
-                                   @change="changeYsfs">
-                  <el-checkbox v-for="item,index in transportTypeList"
-                               :key="item.value"
-                               :label="item.value">{{item.label}}</el-checkbox>
-                </el-checkbox-group>
-              </el-form-item>
-            </el-col>
-          </div> -->
-        </el-form>
-      </div>
-      <div class="footer"
-           v-show="!methods">
-        <el-button size="small"
-                   class="thebtn2"> {{ '取消' }}</el-button>
-        <el-button size="small"
-        v-hasButtons="['productBasicAddSure']"
-                   @click="submit('form')"
-                   class="thebtn1"> {{ '确认' }}</el-button>
-      </div>
-    </div>
-    <el-dialog :title="'添加'"
-               :visible.sync="openDiag"
-               :close-on-click-modal="false"
-               width="30%"
-               center>
-      <el-checkbox-group v-model="form.checkList"
-                         class="check">
-        <el-checkbox v-for="item,index in ggList"
-                     class="check_i"
-                     :key="item.pkId"
-                     :label="item.pkId">{{item.typeName}}</el-checkbox>
-      </el-checkbox-group>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button @click="openDiag = false">{{'取消'}}</el-button>
-        <el-button type="primary"
-                   @click="checkTrue">{{'确认'}}</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { getToken } from '@/utils/auth'
-import * as api from '@/api/product.js'
-import { productUpdateJxc, productSaveJxc } from '@/api/product.js'
-export default {
-  name: 'jcsz',
-  data() {
-    return {
-      rules: {
-        shippingChannel: [
-          { required: true, message: '请输入发货类型', trigger: 'change' },
-        ],
-        unit: [{ required: true, message: '请选择单位', trigger: 'change' }],
-        productName: [
-          { required: true, message: '请输入产品名称', trigger: 'blur' },
-        ],
-        productCode: [
-          { required: true, message: '请输入产品编号', trigger: 'blur' },
-        ],
-        retailPrice: [
-          { required: true, message: '请输入划线价', trigger: 'blur' },
-        ],
-        shelfLife: [
-          { required: true, message: '请输入保质期', trigger: 'blur' },
-        ],
-        weight: [{ required: true, message: '请输入重量', trigger: 'blur' }],
-        postageWeight: [
-          { required: true, message: '请输入邮费重量', trigger: 'blur' },
-        ],
-        productAttr: [
-          { required: true, message: '请选择产品属性', trigger: 'change' },
-        ],
-        pkClassify: [
-          { required: true, message: '请选择所属分类', trigger: 'change' },
-        ],
-        sort: [{ required: true, message: '请输入排列序号', trigger: 'blur' }],
-        length: [{ required: true, message: '请输入长', trigger: 'blur' }],
-        width: [{ required: true, message: '请输入宽', trigger: 'blur' }],
-        height: [{ required: true, message: '请输入高', trigger: 'blur' }],
-        cover: [
-          { required: true, message: '请上传产品主图', trigger: 'change' },
-        ],
-        pkSpecsType: [
-          { required: true, message: '请选择规格', trigger: 'change' },
-        ],
-        isPrize: [
-          { required: true, message: '抽奖礼品', trigger: 'change' },
-        ],
-        isGift: [
-          { required: true, message: '请选择特惠礼品', trigger: 'change' },
-        ],
-        isPickUp: [
-          { required: true, message: '请选择提货商品', trigger: 'change' },
-        ],
-        isMerge: [
-          { required: true, message: '请选择合并发货', trigger: 'change' },
-        ],
-        isFresh: [
-          { required: true, message: '冷链运输', trigger: 'change' },
-        ],
-        isBarCode: [
-          { required: true, message: '请选择条码管理', trigger: 'change' },
-        ],
-        ysList: [
-          { required: true, message: '请选择运输方式', trigger: 'change' },
-        ],
-      },
-      ggList: [],
-      // 规格名称弹框
-      openDiag: false,
-      showImg: true, //默认展示
-      noneUploadImg: false, //
-      uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload',
-      headers: {
-        Authorization: getToken(),
-      },
-      form: {
-        sort: '',
-        sptw: '',
-        checkList: [],
-        ysList: [],
-        coverList: [],
-        sort: '',
-        postageWeight: '',
-        height: '',
-        width: '',
-        length: '',
-        weight: '',
-        shelfLife: '',
-      },
-      tabActive: 0,
-      agreeList: [
-        {
-          text: '允许',
-          val: 0,
-        },
-        {
-          text: '禁止',
-          val: 1,
-        },
-      ],
-      topList: [
-        {
-          name: '基础设置',
-          id: 0,
-        },
-        {
-          name: '规格明细',
-          id: 1,
-        },
-        // {
-        //   name: '拓展设置',
-        //   id: 2,
-        // },
-      ],
-      productTypeList: [],
-      fhTypeList: [],
-      dwList: [],
-      classifyList: [],
-      transportTypeList: [],
-      productId: '',
-      methods: true,
-      wahtMethods: 0,
-      repurchaseTypeList: [],
-    }
-  },
-  mounted() {
-    this.productId = this.$route.query.id
-    this.methods = this.$route.query.methods ? false : true
-    this.wahtMethods = this.$route.query.methods
-    // 获取规格list
-    this.getGg()
-    // // 产品属性枚举
-    // this.getProductType()
-    // 发货类型
-    this.getShipping()
-    // 单位
-    this.getUnit()
-    // 所属分类
-    this.getClassifyAll()
-    // 运输方式
-    this.getTransportType()
-     // 复购类型
-    //  this.getRepurchaseType()
-  },
-  methods: {
-    // getRepurchaseType() {
-    //   api.repurchaseType().then((res) => {
-    //     this.repurchaseTypeList = res.data
-    //   })
-    // },
-    getProductCode() {
-      api.getProductCode().then((res) => {
-        this.form.productCode = res.msg
-      })
-    },
-    getAllData() {
-      api.productDetailtJxc({ productBasId: this.productId }).then((res) => {
-        this.form = res.data
-        if (res.data.cover) {
-          this.noneUploadImg = true
-        }
-        this.form.coverList = [{ url: res.data.cover }]
-        this.form = res.data
-        //  let ysList =
-        this.$set(this.form, 'ysList', [
-          res.data.isLandTrans == 0 ? 1 : '',
-          res.data.isAirTrans == 0 ? 2 : '',
-          res.data.isOceanTrans == 0 ? 3 : '',
-        ])
-        // this.form.checkList = this.form.pkSpecsType
-        this.$set(this.form, 'checkList', this.form.pkSpecsType)
-        this.ggList.forEach((item) => {
-          this.form.pkSpecsType.forEach((child) => {
-            if (item.pkId == child) {
-              // item.checked = true
-              this.$set(item, 'checked', true)
-            }
-          })
-        })
-        if (this.wahtMethods == 2) {
-          this.getProductCode()
-        }
-        this.$forceUpdate()
-      })
-    },
-    // 运输方式单独三个字段
-    changeYsfs(val) {
-      // 有陆运
-      if (val.indexOf(1) > -1) {
-        this.form.isLandTrans = 0
-      } else {
-        this.form.isLandTrans = 1
-      }
-      // 有空运
-      if (val.indexOf(2) > -1) {
-        this.form.isAirTrans = 0
-      } else {
-        this.form.isAirTrans = 1
-      }
-      // 海运
-      if (val.indexOf(3) > -1) {
-        this.form.isOceanTrans = 0
-      } else {
-        this.form.isOceanTrans = 1
-      }
-    },
-    // 运输方式
-    getTransportType() {
-      api.transportType().then((res) => {
-        this.transportTypeList = res.data
-      })
-    },
-    // 所属分类
-    getClassifyAll() {
-      api.classifyAll().then((res) => {
-        this.classifyList = res.data
-      })
-    },
-    // 选完规格
-    checkTrue() {
-      this.ggList.forEach((item) => {
-        item.checked = false
-      })
-      this.ggList.forEach((item) => {
-        this.form.checkList.forEach((child) => {
-          if (item.pkId == child) {
-            item.checked = true
-          }
-        })
-      })
-      this.openDiag = false
-      this.form.pkSpecsType = this.form.checkList
-    },
-    // 获取规格
-    getGg() {
-      api.findAll().then((res) => {
-        res.data.forEach((item) => {
-          item.checked = false
-        })
-        this.ggList = res.data
-        // 获取详情
-        this.getAllData()
-      })
-    },
-    // // 产品属性枚举
-    // getProductType() {
-    //   api.productType().then((res) => {
-    //     this.productTypeList = res.data
-    //   })
-    // },
-    // 发货类型
-    getShipping() {
-      api.getShipping().then((res) => {
-        this.fhTypeList = res.data
-      })
-    },
-    // 单位
-    getUnit() {
-      api.unitAll().then((res) => {
-        this.dwList = res.data
-      })
-    },
-    // 移除规格
-    handleClose(pkId) {
-      // 引藏全规格中选中字段
-      this.ggList.forEach((item) => {
-        if (item.pkId == pkId) {
-          item.checked = false
-        }
-      })
-      // 移除表单选中
-      this.form.checkList.splice(this.form.checkList.indexOf(pkId), 1)
-      this.$forceUpdate()
-    },
-    submit(form) {
-      let urlRequir = ''
-      let mssg = ''
-      if (this.wahtMethods == 1) {
-        urlRequir = productUpdateJxc
-        mssg = '修改成功'
-      } else {
-        urlRequir = productSaveJxc
-        mssg = '复制成功'
-      }
-      this.$refs[form].validate((valid) => {
-        if (valid) {
-          urlRequir(this.form).then((res) => {
-            if(res.code == 200){
-              this.$message({
-              message: mssg,
-              type: 'success',
-            })
-            this.$router.go(-1)
-            }
-          })
-        } else {
-          return false
-        }
-      })
-    },
-    // 切换tab
-    handleLink(id) {
-      this.tabActive = id
-    },
-    uploadImgChange(file, fileList) {
-      this.noneUploadImg = fileList.length > 0
-      this.$refs.form.clearValidate('cover');
-    },
-    //图片上传成功后的回调
-    handlePictureSuccess(res, file) {
-      this.form.cover = res.data.url
-    },
-    //图片上传删除
-    handleRemove(file, fileList) {
-      this.form.cover = ''
-      this.noneUploadImg = fileList.length > 0
-    },
-  },
-}
-</script>
-<style scoped lang="scss">
-::v-deep .el-select {
-  width: 100%;
-}
-.uploadIcon ::v-deep .el-upload--picture-card {
-  display: none !important; /* 上传按钮隐藏 */
-}
-.el-col-20 {
-  width: 20%;
-}
-.el-col-60 {
-  width: 60%;
-}
-.el-col-40 {
-  width: 40%;
-}
-.topbox {
-  align-items: center;
-  padding: 0px 0 0px 0;
-  display: flex; //   background: skyblue;
-  .levelList_i {
-    margin-left: 20px;
-    position: relative;
-    cursor: pointer;
-    padding: 3px 10px;
-    // width: 88px;
-    // height: 34px;
-    border-radius: 17px;
-    border: 1px solid #cccccc;
-    font-size: 14px;
-    font-family: MicrosoftYaHei;
-    text-align: center;
-    // line-height: 34px;
-  }
-  .act {
-    color: #ffffff;
-    background: #c8161d;
-  }
-  .act1 {
-    border-bottom: 3px solid #1890ff !important;
-  }
-  .cha {
-    font-size: 16px;
-    color: #606266;
-    position: absolute;
-    top: 10px;
-  }
-  .li {
-    width: 40px;
-    margin: 0 auto;
-    border-bottom: 3px solid transparent;
-  }
-}
-.page {
-  height: calc(100vh - 50px);
-  overflow: hidden;
-  background: #f9f9f9;
-  padding-top: 20px;
-}
-
-.main {
-  display: flex;
-  flex-direction: column;
-  height: calc(100vh - 124px);
-  overflow: hidden;
-}
-.contain {
-  background: #ffffff;
-  border-radius: 8px;
-  box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
-  // margin: 10px 20px 0 20px;
-  flex: 1;
-  padding-top: 20px;
-}
-.footer {
-  height: 68px;
-  background: #ffffff;
-  box-shadow: 0px -3px 20px 0px rgba(204, 204, 204, 0.5);
-  // margin: 0 20px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.thebtn1 {
-  background: #c8161d;
-  color: #ffffff;
-  padding: 9px 45px;
-}
-.thebtn2 {
-  background: #cccccc;
-  color: #ffffff;
-  padding: 9px 45px;
-}
-.neibu {
-  margin-right: 10px;
-  color: #666666;
-  font-style: normal;
-}
-.elTag {
-  margin-right: 10px;
-}
-.check {
-  display: flex;
-  flex-wrap: wrap;
-  text-align: center;
-  // justify-content: center;
-  .check_i {
-    width: 50%;
-    text-align: left;
-    margin-right: 0 !important;
-  }
-}
-.jy{
-  font-size: 10px;
-font-family: PingFang SC-Regular, PingFang SC;
-font-weight: 400;
-color: #999999;
-}
-</style>
diff --git a/src/views/goodsManage/productBasicInfo/productBasicList/index.vue b/src/views/goodsManage/productBasicInfo/productBasicList/index.vue
deleted file mode 100644
index 5d4b544..0000000
--- a/src/views/goodsManage/productBasicInfo/productBasicList/index.vue
+++ /dev/null
@@ -1,531 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: kBank
- * @Date: 2022-10-28 16:50:29
--->
-<template>
-  <div class="page">
-    <div class="main">
-      <div class="form_all">
-        <el-form ref="select"
-                 :model="select"
-                 label-width="auto">
-          <el-row :gutter="10">
-            <!-- 一层 -->
-            <el-col :span="4">
-              <el-form-item :label="'产品名称'">
-                <el-input clearable
-                          v-model="select.productName"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item :label="'产品编号'">
-                <el-input clearable
-                          v-model="select.productCode"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="'创建日期'">
-                <el-date-picker v-model="creationTime"
-                                @change="changeTime"
-                                value-format="yyyy-MM-dd"
-                                type="daterange"
-                                :range-separator="'至'"
-                                :start-placeholder="'开始日期'"
-                                :end-placeholder="'结束日期'">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-button type="primary"
-                         @click="getDataList"> {{ '搜索' }}</el-button>
-              <el-button type=""
-                         class="resetBtn"
-                         @click="reset"> {{ '重置' }}</el-button>
-            </el-col>
-          </el-row>
-        </el-form>
-
-      </div>
-      <div class="main_a">
-        <div class="mainbtn">
-          <el-button size="small"
-                     @click="openDig"
-                  
-                     class="addBtn">{{'添加'}}</el-button>
-          <el-button size="small"
-                     @click="handleExport"
-                   
-                     class="exportBtn"> {{ '导出' }}</el-button>
-          <el-button size="small"
-                     :disabled="isCopy"
-                     @click="toCopy"
-             
-                     class="copyBtn">{{'复制'}}</el-button>
-        </div>
-      </div>
-      <div class="maintable">
-        <el-table :data="tableData"
-        v-loading="loading"
-                  style="width: 100%"
-                  height="100%"
-                  :header-cell-style="{ background: '#EEEEEE' }"
-                  :row-class-name="tableRowClassName"
-                  @selection-change="handleSelectionChange">
-          <el-table-column type="selection"
-                           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="" />
-            </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-column align="center"
-                           prop="length"
-                           :label="'长'+'(CM)'">
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="width"
-                           :label="'宽'+'(CM)'">
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="height"
-                           :label="'高'+'(CM)'">
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="weight"
-                           :label="'重量'+'(KG)'">
-          </el-table-column>
-          <!-- <el-table-column align="center"
-                           prop="postageWeight"
-                           :label="'邮费重量'+'(KG)'">
-          </el-table-column> -->
-
-          <el-table-column align="center"
-                           prop="shelfLife"
-                           :label="'保质期(天)'">
-          </el-table-column>
-
-          <el-table-column align="center"
-                           prop="creationTime"
-                           :label="'创建日期'">
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="time"
-                           width="160"
-                           :label="'操作'"
-                           fixed="right">
-            <template slot-scope="scope">
-              <div class="btnHeng">
-                <el-button @click="toFixed(scope.row.pkId,1)"
-                           type="text"
-                           style="color:#F3A900"
-                           size="small">
-                  {{ '修改' }}
-                </el-button>
-                <el-button @click="toChecked(scope.row.pkId,0)"
-                           type="text"
-                           style="color:#48B2FD"
-                           size="small">
-                  {{ '查看' }}
-                </el-button>
-                <el-button @click="handleDelete(scope.row.pkId)"
-                           type="text"
-                           size="small"
-                           style="color: #C8161D">
-                  {{'删除'}}
-                </el-button>
-                <el-button @click="toCreate(scope.row.pkId)"
-                          v-if='scope.row.isShowCreateButton == 0'
-                           type="text"
-                           size="small"
-                           style="color: #53B11E">
-                  生成
-                </el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <pagination v-show="total>0"
-                :total="total"
-                :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize"
-                @pagination="getDataList" />
-  </div>
-</template>
-
-<script>
-import topBar from '@/components/topBar'
-import * as api from '@/api/product.js'
-import { accountSave, accountUpdate } from '@/api/configManage'
-import { getToken } from '@/utils/auth'
-export default {
-  name: 'ProductList',
-  components: {
-    topBar,
-  },
-  filters: {
-    isAgree(val, that) {
-      if (!val) {
-        return that.$t('ENU_POPUP_TYPE_1')
-      } else {
-        return that.$t('ENU_POPUP_TYPE_2')
-      }
-    },
-  },
-  data() {
-    return {
-      that: this,
-      // 所属分类
-      classifyList: [],
-      // 产品属性枚举
-      productTypeList: [],
-      // 发货类型
-      fhTypeList: [],
-      // 单位
-      dwList: [],
-      // 运输方式
-      transportTypeList: [],
-      // 折叠搜索框
-      isActive: false,
-      select: {},
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 50,
-      },
-      addOrEdit: '',
-      total: 0,
-      loading:false,
-      tableData: [],
-      countryList: [],
-      agreeList: [
-        {
-          text: '允许',
-          val: 0,
-        },
-        {
-          text: '禁止',
-          val: 1,
-        },
-      ],
-      form: {},
-      creationTime: [],
-      isCopy: true,
-      selPkId: '',
-    }
-  },
-  mounted() {
-    // 获取列表
-    this.getDataList()
-    // 发货类型
-    this.getShipping()
-    // 单位
-    this.getUnit()
-    // 所属分类
-    this.getClassifyAll()
-    // 运输方式
-    this.getTransportType()
-    //  产品属性枚举
-    this.getProductType()
-  },
-  methods: {
-    reset() {
-      this.select = {}
-      this.creationTime = []
-      this.getDataList()
-    },
-    changeTime(val) {
-      this.select.startCreateDate = val[0]
-      this.select.endCreateDate = val[1]
-    },
-    // 产品属性枚举
-    getProductType() {
-      api.productType().then((res) => {
-        this.productTypeList = res.data
-      })
-    },
-    // 运输方式
-    getTransportType() {
-      api.transportType().then((res) => {
-        this.transportTypeList = res.data
-      })
-    },
-    // 发货类型
-    getShipping() {
-      api.getShipping().then((res) => {
-        this.fhTypeList = res.data
-      })
-    },
-    // 单位
-    getUnit() {
-      api.unitAll().then((res) => {
-        this.dwList = res.data
-      })
-    },
-    // 所属分类
-    getClassifyAll() {
-      api.classifyAll().then((res) => {
-        this.classifyList = res.data
-      })
-    },
-    // 展开折叠
-    changeActive() {
-      this.isActive = !this.isActive
-    },
-    // 点击修改
-    toFixed(id) {
-      this.$router.push({
-        path: 'productBasicDetail',
-        query: {
-          id: id,
-          methods: 1,
-        },
-      })
-    },
-    // 删除
-    handleDelete(id) {
-      this.$confirm('确定删除?').then((_) => {
-        api.productDelJxc(id).then((res) => {
-          if (res.code == 200) {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-            })
-            this.getDataList()
-          }
-        })
-      })
-    },
-    openDig() {
-      this.$router.push({
-        path: 'productBasicAdd',
-      })
-    },
-    toCreate(id){
-      api.generateProduct({
-        pkProductBas:id
-      }).then((res) => {
-          if (res.code == 200) {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-            })
-            this.getDataList()
-          }
-        })
-      // this.$router.push({
-      //   path: '/goodsManage/productRelease/productDetail',
-      //   query: {
-      //     pkProductBas: id,
-      //     methods: 3,
-      //   },
-      // })
-    },
-    // 查看 0，编辑1,复制2
-    toChecked(id, index) {
-      this.$router.push({
-        path: 'productBasicDetail',
-        query: {
-          id: id,
-          methods: index,
-        },
-      })
-    },
-    upEdit(id, index) {
-      api
-        .productMove({
-          productId: id,
-          productMoveType: index,
-        })
-        .then((res) => {
-          this.getDataList()
-        })
-    },
-    topEdit(id) {
-      api
-        .floatingFoof({
-          productId: id,
-        })
-        .then((res) => {
-          this.getDataList()
-        })
-    },
-    // 获取列表
-    getDataList() {
-      this.loading = true
-      api
-        .productListJxc(Object.assign({}, this.queryParams, this.select))
-        .then((res) => {
-          res.rows.forEach((item) => {
-            // this.dwList.forEach((child) => {
-            //   if (child.pkId == item.unit) {
-            //     item.unitName = child.name
-            //   }
-            // })
-            this.productTypeList.forEach((child) => {
-              if (child.value == item.productAttr) {
-                item.productAttrName = child.label
-              }
-            })
-          })
-          this.loading = false
-          this.tableData = res.rows
-          this.total = res.total
-        })
-    },
-    toCopy() {
-      this.toChecked(this.selPkId, 2)
-    },
-    handleSelectionChange(val) {
-      if (val.length > 0) {
-        this.selPkId = val[0].pkId
-        this.isCopy = false
-      } else {
-        this.isCopy = true
-      }
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.$confirm('是否确认导出所有数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then((_) => {
-        this.download(
-          '/scm/manage/product-bas/export',
-          Object.assign({}, this.queryParams, this.select),
-          `产品列表-${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 scoped lang="scss">
-::v-deep .el-table .warning-row {
-  background: #f9f9f9;
-}
-
-::v-deep .el-table .success-row {
-  background: #ffffff;
-}
-::v-deep .el-table thead {
-  color: #000000;
-}
-::v-deep .el-select {
-  width: 100%;
-}
-::v-deep .el-date-editor.el-input,
-.el-date-editor.el-input__inner {
-  width: 100%;
-}
-.uploadIcon ::v-deep .el-upload--picture-card {
-  display: none !important; /* 上传按钮隐藏 */
-}
-.page {
-  padding: 20px;
-  background: #f9f9f9;
-  font-size: 14px;
-  .main {
-    display: flex;
-    flex-direction: column;
-    // background: #ffffff;
-    border-radius: 8px;
-    box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
-    .form_all {
-      padding: 0 20px;
-      margin-bottom: 10px;
-      background: #fff;
-      border-radius: 8px;
-    }
-    .main_a {
-      display: flex;
-      padding: 0px 20px 3px 0;
-      justify-content: space-between;
-      align-items: center;
-      background: #fff;
-      border-radius: 8px;
-      .mainbtn {
-        .thebtn1 {
-          background: #3181e5;
-          color: #ffffff;
-        }
-        .thebtn2 {
-          background: #4391fd;
-          color: #ffffff;
-        }
-        .thebtn3 {
-          background: #6962f6;
-          color: #ffffff;
-        }
-      }
-      .maintitle {
-        font-size: 10px;
-        font-family: MicrosoftYaHei;
-        color: #999999;
-      }
-    }
-    .maintable {
-      flex: 1;
-      overflow-y: auto;
-    }
-  }
-  .tem {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    img {
-      width: 28px;
-      height: 20px;
-      margin-right: 3px;
-    }
-  }
-  .isRed {
-    color: #ed1d25;
-  }
-  .isGreen {
-    color: #1ab62b;
-  }
-  .bgImg {
-    width: 48px;
-    height: 48px;
-  }
-}
-.openClose {
-  margin-right: 10px;
-  color: #666666;
-  text-align: center;
-}
-.btnHeng {
-  display: flex;
-}
-.btnHeng ::v-deep .el-button {
-  padding: 0;
-}
-</style>