From 85fb620624273ffd5b84c9b2e18a1e4def45eb2e Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 29 Dec 2023 16:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/distrilbutionBillLading.vue     |   24 +-
 .../stockup/distributionStockupDetails.vue    | 2116 +++++++++--------
 .../turndelivery/deliveryDiscuss.vue          |   41 +-
 3 files changed, 1155 insertions(+), 1026 deletions(-)

diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 5de97d6d..f7df7407 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container v-loading="Selfpickuploading" element-loading-text="正在处理中...">
     <div class="avue-crud" :style="`height:` + height + ';overflow:auto;'">
       <el-form :disabled="view" ref="form" :model="form" label-width="120px" :rules="rules">
         <!-- 表单字段 -->
@@ -597,12 +597,14 @@ import { getListOne } from '@/api/distribution/distributionStockArticle';
 import dayjs from 'dayjs';
 import { detail } from '@/api/flow/flow';
 import { nextTick, ref } from 'vue';
-
+import { useStore } from 'vuex';
+const $store = useStore();
 export default {
   data() {
     return {
       dialogImg: false,
       Imgurl: undefined,
+      Selfpickuploading: false, //页面加载
       OrdercolumnList: [
         {
           prop: 'serviceNumber',
@@ -2471,6 +2473,7 @@ export default {
         }
       }
     },
+    // 最后提交
     async handleSubmit() {
       const zeroOrderList = this.dataList.filter(val => val.isZero === '1');
       if (this.$route.query.type !== '2') {
@@ -2496,8 +2499,9 @@ export default {
             });
         }
       }
-
+      this.Selfpickuploading = true; //开启加载效果
       this.$refs.form.validate(async valid => {
+        
         if (valid) {
           if (!this.form.id) {
             // if (this.fileListSell.length === 0) {
@@ -2579,7 +2583,8 @@ export default {
                 _billPackageEntityList = [..._billPackageEntityList, ...val.billPackageEntityList];
             });
             submitFormData.billPackageEntityList = _billPackageEntityList;
-            add(submitFormData).then(() => {
+            add(submitFormData).then((res) => {
+              console.log(res,'提交返回值');
               this.box = false;
               this.onLoad(this.page);
               this.$message({
@@ -2587,8 +2592,10 @@ export default {
                 message: '操作成功!',
               });
               this.contextmenuFlag = false;
-              this.$store.commit('DEL_TAG_CURRENT');
-              this.$router.push(this.tagWel);
+              this.Selfpickuploading = false; //关闭加载效果
+              console.log(this.Selfpickuploading, '当前状态');
+              this.$router.push('/distribution/inventory/distrilbutionBillLadingList');
+              $store.commit('DEL_TAG_CURRENT');
             });
           } else {
             console.log('111 :>> ', 111);
@@ -2689,8 +2696,9 @@ export default {
                 type: 'success',
                 message: '操作成功!',
               });
-              this.$store.commit('DEL_TAG_CURRENT');
-              this.$router.push(this.tagWel);
+              this.Selfpickuploading = false; //关闭加载效果
+              this.$router.push('/distribution/inventory/distrilbutionBillLadingList');
+              $store.commit('DEL_TAG_CURRENT');
             });
             return;
           }
diff --git a/src/views/distribution/stockup/distributionStockupDetails.vue b/src/views/distribution/stockup/distributionStockupDetails.vue
index 5d46e19c..4e916ecc 100644
--- a/src/views/distribution/stockup/distributionStockupDetails.vue
+++ b/src/views/distribution/stockup/distributionStockupDetails.vue
@@ -1,7 +1,6 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-
       <el-row>
         <el-tabs
           type="border-card"
@@ -12,137 +11,164 @@
         >
           <el-tab-pane label="预约列表" name="reservation">
             <tablecmt
-          :columnList="columnListarrs.columnReservation"
-          :tableData="data3"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-        >
-          <template #default="slotProps">
-          </template>
-        </tablecmt>
+              :columnList="columnListarrs.columnReservation"
+              :tableData="data3"
+              :loading="loading"
+              @inputTxt="inputsc"
+              @timeCheck="timesc"
+              @btnCheck="btnsc"
+              @selectCheck="selectsc"
+              @selection="selectionChange"
+            >
+              <template #default="slotProps"> </template>
+            </tablecmt>
 
-            <div class="avue-crud__pagination" style="width:100%">
+            <div class="avue-crud__pagination" style="width: 100%">
               <!-- 分页模块 -->
-              <el-pagination align="right"
-                             background
-                             @size-change="sizeChange"
-                             @current-change="currentChange"
-                             :current-page="page3.currentPage"
-                             :page-sizes="[30, 50,80, 120]"
-                             :page-size="page3.pageSize"
-                             layout="total, sizes, prev, pager, next, jumper"
-                             :total="page3.total">
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange"
+                @current-change="currentChange"
+                :current-page="page3.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="page3.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page3.total"
+              >
               </el-pagination>
             </div>
-
           </el-tab-pane>
           <el-tab-pane label="订单列表" name="library">
             <tablecmt
-          :columnList="columnListarrs.columnStockOrder"
-          :tableData="dataPare"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-        >
-          <template #default="slotProps">
-          </template>
-        </tablecmt>
-            <div class="avue-crud__pagination" style="width:100%">
+              :columnList="columnListarrs.columnStockOrder"
+              :tableData="dataPare"
+              :loading="loading"
+              @inputTxt="inputsc"
+              @timeCheck="timesc"
+              @btnCheck="btnsc"
+              @selectCheck="selectsc"
+              @selection="selectionChange"
+            >
+              <template #default="slotProps"> </template>
+            </tablecmt>
+            <div class="avue-crud__pagination" style="width: 100%">
               <!-- 分页模块 -->
-              <el-pagination align="right"
-                             background
-                             @size-change="sizeChange"
-                             @current-change="currentChange"
-                             :current-page="page.currentPage"
-                             :page-sizes="[30, 50,80, 120]"
-                             :page-size="page.pageSize"
-                             layout="total, sizes, prev, pager, next, jumper"
-                             :total="page.total">
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange"
+                @current-change="currentChange"
+                :current-page="page.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page.total"
+              >
               </el-pagination>
             </div>
-
           </el-tab-pane>
           <el-tab-pane label="备货包件" name="outbound">
-            <el-button type="primary" style="margin-bottom: 10px;padding: 10px 20px;" v-if =isStockUp  @click="handleStockUp(row,'1')">备货</el-button>
+            <el-button
+              type="primary"
+              style="margin-bottom: 10px; padding: 10px 20px"
+              v-if="isStockUp"
+              @click="handleStockUp(row, '1')"
+              >备货</el-button
+            >
             <tablecmt
-          :columnList="columnListarrs.columnStockingBag"
-          :tableData="data1"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-        >
-          <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-view" v-if="!slotProps.scope?.row?.stockupStatus" @click="handleStockUp(slotProps.scope.row,'2')">备货</el-text>
-            <el-button type="primary" text icon="el-icon-view"  @click="handleQRCode(slotProps.scope.row)">查看包条码</el-button>
+              :columnList="columnListarrs.columnStockingBag"
+              :tableData="data1"
+              :loading="loading"
+              @inputTxt="inputsc"
+              @timeCheck="timesc"
+              @btnCheck="btnsc"
+              @selectCheck="selectsc"
+              @selection="selectionChange"
+            >
+              <template #default="slotProps">
+                <el-text
+                  type="primary"
+                  text
+                  icon="el-icon-view"
+                  v-if="!slotProps.scope?.row?.stockupStatus"
+                  @click="handleStockUp(slotProps.scope.row, '2')"
+                  >备货</el-text
+                >
+                <el-button
+                  type="primary"
+                  text
+                  icon="el-icon-view"
+                  @click="handleQRCode(slotProps.scope.row)"
+                  >查看包条码</el-button
+                >
+              </template>
+            </tablecmt>
 
-          </template>
-        </tablecmt>
-
-            <div class="avue-crud__pagination" style="width:100%">
+            <div class="avue-crud__pagination" style="width: 100%">
               <!-- 分页模块 -->
-              <el-pagination align="right"
-                             background
-                             @size-change="sizeChange"
-                             @current-change="currentChange"
-                             :current-page="page1.currentPage"
-                             :page-sizes="[30, 50,80, 120]"
-                             :page-size="page1.pageSize"
-                             layout="total, sizes, prev, pager, next, jumper"
-                             :total="page1.total">
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange"
+                @current-change="currentChange"
+                :current-page="page1.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="page1.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page1.total"
+              >
               </el-pagination>
             </div>
           </el-tab-pane>
           <el-tab-pane label="库存品" name="enter">
+            <el-button type="primary" icon="el-icon-view" @click="handleBatchDetail('2')"
+              >批量打印</el-button
+            >
 
-            <el-button type="primary" icon="el-icon-view"  @click="handleBatchDetail('2')">批量打印</el-button>
-
-          <tablecmt
-          :columnList="columnListarrs.columnInventory"
-          :tableData="data2"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-         >
-          <template #default="slotProps">
-
-            <el-text type="primary" text icon="el-icon-view"  @click="handleDetail(slotProps.scope.row)">明细</el-text>
-
-          </template>
-        </tablecmt>
+            <tablecmt
+              :columnList="columnListarrs.columnInventory"
+              :tableData="data2"
+              :loading="loading"
+              @inputTxt="inputsc"
+              @timeCheck="timesc"
+              @btnCheck="btnsc"
+              @selectCheck="selectsc"
+              @selection="selectionChange"
+            >
+              <template #default="slotProps">
+                <el-text
+                  type="primary"
+                  text
+                  icon="el-icon-view"
+                  @click="handleDetail(slotProps.scope.row)"
+                  >明细</el-text
+                >
+              </template>
+            </tablecmt>
 
-            <div class="avue-crud__pagination" style="width:100%">
+            <div class="avue-crud__pagination" style="width: 100%">
               <!-- 分页模块 -->
-              <el-pagination align="right"
-                             background
-                             @size-change="sizeChange"
-                             @current-change="currentChange"
-                             :current-page="page2.currentPage"
-                             :page-sizes="[30, 50,80, 120]"
-                             :page-size="page2.pageSize"
-                             layout="total, sizes, prev, pager, next, jumper"
-                             :total="page2.total">
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange"
+                @current-change="currentChange"
+                :current-page="page2.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="page2.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page2.total"
+              >
               </el-pagination>
             </div>
           </el-tab-pane>
         </el-tabs>
-
       </el-row>
       <el-dialog title="包条码" :visible.sync="dialogPack" width="1050px" v-model="dialogPack">
-
-        <el-button type="primary" icon="el-icon-view"  @click="handleBatchDetail('1')">批量打印</el-button>
+        <el-button type="primary" icon="el-icon-view" @click="handleBatchDetail('1')"
+          >批量打印</el-button
+        >
 
         <tablecmt
           :columnList="columnListarrs.columnInventoryBatch"
@@ -155,32 +181,38 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-
-            <el-text type="primary" text icon="el-icon-view"  @click="handlePrintDetail(slotProps.scope.row)">打印</el-text>
-
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-view"
+              @click="handlePrintDetail(slotProps.scope.row)"
+              >打印</el-text
+            >
           </template>
         </tablecmt>
 
-        <div class="avue-crud__pagination" style="width:100%">
+        <div class="avue-crud__pagination" style="width: 100%">
           <!-- 分页模块 -->
-          <el-pagination align="right"
-                         background
-                         @size-change="sizeChange"
-                         @current-change="currentChange"
-                         :current-page="page2.currentPage"
-                         :page-sizes="[30, 50,80, 120]"
-                         :page-size="page2.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="page2.total">
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page2.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="page2.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page2.total"
+          >
           </el-pagination>
         </div>
 
-<!--        <div v-for="item in packageCodeList">-->
-<!--          <span>{{item}}</span>-->
-<!--        </div>-->
+        <!--        <div v-for="item in packageCodeList">-->
+        <!--          <span>{{item}}</span>-->
+        <!--        </div>-->
         <span slot="footer" class="dialog-footer">
           <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-<!--          <el-button type="primary" @click="printTemplate">打 印</el-button>-->
+          <!--          <el-button type="primary" @click="printTemplate">打 印</el-button>-->
           <el-button type="primary" @click="dialogPack = false">确 定</el-button>
           <el-button @click="dialogPack = false">取 消</el-button>
         </span>
@@ -206,26 +238,32 @@
       </el-dialog>
       <el-dialog v-model="dialogHand" title="系统备货">
         <el-form :model="form">
-          <el-form-item label="备货区域" :label-width="formLabelWidth" >
-            <el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')">
+          <el-form-item label="备货区域" :label-width="formLabelWidth">
+            <el-select
+              v-model="form.goodsAreaId"
+              clearable
+              placeholder="请选择备货区编号"
+              @change="getForklift($event, '3')"
+            >
               <el-option
                 v-for="item in goodsAreaIdData"
                 :key="item.dictKey"
                 :label="item.dictValue"
-                :value="item.dictKey">
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
         </el-form>
         <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogHand = false">取消</el-button>
-        <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-        <el-button type="primary" @click="callFordelivery()"> 确定 </el-button>
-      </span>
+          <span class="dialog-footer">
+            <el-button @click="dialogHand = false">取消</el-button>
+            <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+            <el-button type="primary" @click="callFordelivery()"> 确定 </el-button>
+          </span>
         </template>
       </el-dialog>
-    <!--  <el-row>
+      <!--  <el-row>
         <div class="avue-crud__pagination" style="width:100%">
           &lt;!&ndash; 分页模块 &ndash;&gt;
           <el-pagination align="right"
@@ -258,11 +296,11 @@
           </el-form-item>
         </el-form>
         <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogFormCustomer = false">取消</el-button>
-        <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-        <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
-      </span>
+          <span class="dialog-footer">
+            <el-button @click="dialogFormCustomer = false">取消</el-button>
+            <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+            <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
+          </span>
         </template>
       </el-dialog>
     </div>
@@ -277,10 +315,13 @@ import {
   update,
   remove,
   getDetailStockupOwn,
-  getDetailReservationOwn, getDetailOrderOwn, getDetailInventoryOwn, getListUser
+  getDetailReservationOwn,
+  getDetailOrderOwn,
+  getDetailInventoryOwn,
+  getListUser,
 } from '@/api/distribution/distributionStockup';
-import option from "@/option/distribution/distributionStockup";
-import { mapGetters } from "vuex";
+import option from '@/option/distribution/distributionStockup';
+import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getParcelListOwn } from '@/api/distribution/distributionParcelList';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
@@ -288,568 +329,643 @@ import { getStockDetail } from '@/api/distribution/distributionStock';
 import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { getLodop } from '@/utils/LodopFuncs';
 import dayjs from 'dayjs';
-import { getDisStockList,getPrintDetail } from '@/api/distribution/disStockListDetail';
+import { getDisStockList, getPrintDetail } from '@/api/distribution/disStockListDetail';
 
 export default {
-  data () {
+  data() {
     return {
-      dialogVisible:false,
-      dialogPack:false,
-      html:'',
-      columnListarrs:{
-      columnReservation:[
-        {
-          prop: 'consignee',
-          label: '收货人',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'deliveryPhone',
-          label: '收货电话',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'deliveryAddress',
-          label: '收货地址',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'mallName',
-          label: '收货单位',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'stockArticleId',
-          label: '订单自编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'stockupStatusName',
-          label: '备货状态',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'pallet',
-          label: '托盘码',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'goodsAllocation',
-          label: '货位信息',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-      ],
-      columnStockOrder:[
-        // {
-        //   prop: '',
-        //   label: '序号',
-        //   type: 0,
-        //   values: '',
-        //   width: 55,
-        //   checkarr: [],
-        //   fixed: true,
-        // },
-        {
-          prop: 'orderCode',
-          label: '订单自编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'descriptionGoods',
-          label: '货物名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'reservationNum',
-          label: '备货件数',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'number',
-          label: '已备数量',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'stockupStatusName',
-          label: '备货状态',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'stockupDate',
-          label: '备货时间',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'goodsAllocation',
-          label: '库位信息',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'stockupArea',
-          label: '备货区',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-      ],
-      columnStockingBag:[
-        {
-          prop: '',
-          label: '序号',
-          type: 0,
-          values: '',
-          width: '50',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderPackageCode',
-          label: '包条码',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'firsts',
-          label: '一级品',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'second',
-          label: '二级品',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'thirdProduct',
-          label: '三级品',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'materialName',
-          label: '物料名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'stockupStatusName',
-          label: '备货状态',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'stockupDate',
-          label: '备货时间',
-          type: 5,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'pallet',
-          label: '托盘码',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'goodsAllocation',
-          label: '库位信息',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'stockupArea',
-          label: '备货区',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: '',
-          label: '操作',
-          type: 6,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: 'right',
-          hide: true,
-        },
-      ],
-      columnInventory:[
-        {
-          prop: '',
-          label: '序号',
-          type: 0,
-          values: '',
-          width: 55,
-          checkarr: [],
-          fixed: true,
-        },
-        {
-          prop: 'sku',
-          label: 'SKU',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderCode',
-          label: '订单编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'descriptionGoods',
-          label: '物料名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'cargoUnit',
-          label: '单位',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'reservationNum',
-          label: '备货数',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'number',
-          label: '已备数量',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'stockupStatusName',
-          label: '备货状态',
-          type: 5,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'stockupDate',
-          label: '备货时间',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'pallet',
-          label: '托盘码',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'goodsAllocation',
-          label: '库位信息',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'stockupArea',
-          label: '备货区',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: '',
-          label: '操作',
-          type: 6,
-          values: '',
-          width: '230',
-          checkarr: [],
-          fixed: 'right',
-          hide: true,
-        },
-
-      ],
-      columnInventoryBatch:[
-        {
-          prop: '',
-          label: '序号',
-          type: 0,
-          values: '',
-          width: 55,
-          checkarr: [],
-          fixed: true,
-        },
-        {
-          prop: 'sku',
-          label: 'SKU',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderCode',
-          label: '订单编号',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'descriptionGoods',
-          label: '物料名称',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'cargoUnit',
-          label: '单位',
-          type: 1,
-          values: '',
-          width: '100',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'stockPackageCode',
-          label: '包条码',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'brandName',
-          label: '品牌',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: '',
-          label: '操作',
-          type: 6,
-          values: '',
-          width: '230',
-          checkarr: [],
-          fixed: 'right',
-          hide: true,
-        },
-
-      ],
+      dialogVisible: false,
+      dialogPack: false,
+      html: '',
+      columnListarrs: {
+        columnReservation: [
+          {
+            prop: 'consignee',
+            label: '收货人',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'deliveryPhone',
+            label: '收货电话',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'deliveryAddress',
+            label: '收货地址',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'mallName',
+            label: '收货单位',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'stockArticleId',
+            label: '订单自编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'stockupStatusName',
+            label: '备货状态',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'pallet',
+            label: '托盘码',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'goodsAllocation',
+            label: '货位信息',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'startTimeStocking',
+            label: '备货开始时间',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'endTimeStocking',
+            label: '备货结束时间',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'stockOrderQuantity',
+            label: '备货订单数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'reserveQuantity',
+            label: '备货库存品数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+        ],
+        columnStockOrder: [
+          // {
+          //   prop: '',
+          //   label: '序号',
+          //   type: 0,
+          //   values: '',
+          //   width: 55,
+          //   checkarr: [],
+          //   fixed: true,
+          // },
+          {
+            prop: 'orderCode',
+            label: '订单自编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'descriptionGoods',
+            label: '货物名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'reservationNum',
+            label: '备货件数',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'number',
+            label: '已备数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          // {
+          //   prop: 'stockupStatusName',
+          //   label: '备货状态',
+          //   type: 2,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          //   head: false,
+          // },
+          // {
+          //   prop: 'stockupDate',
+          //   label: '备货时间',
+          //   type: 2,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          //   head: false,
+          // },
+          {
+            prop: 'goodsAllocation',
+            label: '库位信息',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'stockupArea',
+            label: '备货区',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+        ],
+        columnStockingBag: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: '50',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'orderPackageCode',
+            label: '包条码',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'firsts',
+            label: '一级品',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'second',
+            label: '二级品',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'thirdProduct',
+            label: '三级品',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'materialName',
+            label: '物料名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'stockupStatusName',
+            label: '备货状态',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'stockupDate',
+            label: '备货时间',
+            type: 5,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'pallet',
+            label: '托盘码',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'goodsAllocation',
+            label: '库位信息',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'stockupArea',
+            label: '备货区',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: 'right',
+            hide: true,
+          },
+        ],
+        columnInventory: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: 55,
+            checkarr: [],
+            fixed: true,
+          },
+          {
+            prop: 'sku',
+            label: 'SKU',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'orderCode',
+            label: '订单编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'descriptionGoods',
+            label: '物料名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'cargoUnit',
+            label: '单位',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'reservationNum',
+            label: '备货数',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'number',
+            label: '已备数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          // {
+          //   prop: 'stockupStatusName',
+          //   label: '备货状态',
+          //   type: 5,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          //   head: false,
+          // },
+          {
+            prop: 'stockupDate',
+            label: '备货时间',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'pallet',
+            label: '托盘码',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'goodsAllocation',
+            label: '库位信息',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'stockupArea',
+            label: '备货区',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'startTimeStocking',
+            label: '备货开始时间',
+            type: 5,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'endTimeStocking',
+            label: '备货结束时间',
+            type: 5,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'stockStatus',
+            label: '备货状态',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '230',
+            checkarr: [],
+            fixed: 'right',
+            hide: true,
+          },
+        ],
+        columnInventoryBatch: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: 55,
+            checkarr: [],
+            fixed: true,
+          },
+          {
+            prop: 'sku',
+            label: 'SKU',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'orderCode',
+            label: '订单编号',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'descriptionGoods',
+            label: '物料名称',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'cargoUnit',
+            label: '单位',
+            type: 1,
+            values: '',
+            width: '100',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'stockPackageCode',
+            label: '包条码',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'brandName',
+            label: '品牌',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '230',
+            checkarr: [],
+            fixed: 'right',
+            hide: true,
+          },
+        ],
       },
       height: 0,
       activeName: 'reservation',
@@ -870,29 +986,29 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 分页信息
       page1: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 分页信息
       page2: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 分页信息
       page3: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
-      formCall: {},// 通知
+      formCall: {}, // 通知
       formService: {}, // 服务
       formCustomer: {}, // 客户
       // 选择行
@@ -917,124 +1033,120 @@ export default {
       deptId: '', //部门id
       dialogFormService: false,
       formLabelWidth: '120px',
-      handler:true, //首次
-      trade:false, // 商
-      municipal:true, // 市
-      taker:true, // 自提
+      handler: true, //首次
+      trade: false, // 商
+      municipal: true, // 市
+      taker: true, // 自提
       packageCodeList: [], // 自提
-    }
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
-
   },
-  watch:{
-    '$route.query.id':{
+  watch: {
+    '$route.query.id': {
       handler(newVal, oldVal) {
         // console.log(newVal, oldVal);
         this.init();
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   computed: {
-    ...mapGetters(["permission"]),
+    ...mapGetters(['permission']),
     permissionList() {
       return {
         addBtn: this.validData(this.permission.basicdataBrandCategory_add, false),
         viewBtn: this.validData(this.permission.basicdataBrandCategory_view, false),
         delBtn: this.validData(this.permission.basicdataBrandCategory_delete, false),
-        editBtn: this.validData(this.permission.basicdataBrandCategory_edit, false)
+        editBtn: this.validData(this.permission.basicdataBrandCategory_edit, false),
       };
     },
-    ids () {
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
     //批量打印
-    handleBatchDetail(type){
-      console.log("selectionList",this.selectionList);
-      if(this.selectionList.length == 0){
-        this.$message.warning("至少选择一条数据！！")
-        return ;
+    handleBatchDetail(type) {
+      console.log('selectionList', this.selectionList);
+      if (this.selectionList.length == 0) {
+        this.$message.warning('至少选择一条数据！！');
+        return;
       }
 
-      const _flag = this.selectionList.every(val => !(val.stockupStatusName === '待备货'))
+      const _flag = this.selectionList.every(val => !(val.stockupStatusName === '待备货'));
 
-      if (_flag) return this.$message.warning('有待备货数据, 无法打印')
+      if (_flag) return this.$message.warning('有待备货数据, 无法打印');
 
-      if(type== '1'){
+      if (type == '1') {
         //包条码批量
-        let checkcode=[]
-        this.selectionList.map(item=>{
-          checkcode.push(item.id)
-        })
+        let checkcode = [];
+        this.selectionList.map(item => {
+          checkcode.push(item.id);
+        });
         let qr = {
           ids: checkcode.join(','),
-          type: "2"
+          type: '2',
         };
-        this.html=''
-        getPrintDetail(qr).then( res =>{
-          console.log(",./");
+        this.html = '';
+        getPrintDetail(qr).then(res => {
+          console.log(',./');
           this.dialogVisible = true;
-          this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
-        })
-      }else if(type== '2'){
+          this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
+        });
+      } else if (type == '2') {
         //包条码批量
         let myMap = [];
-        this.selectionList.map(item=>{
-         if(!!item.stocklist){
-           myMap.push(item.stocklist);
-         }
-        })
+        this.selectionList.map(item => {
+          if (!!item.stocklist) {
+            myMap.push(item.stocklist);
+          }
+        });
         let qr = {
-          ids: myMap.join(","),
-          type: "3"
+          ids: myMap.join(','),
+          type: '3',
         };
-        console.log("><><>>",qr);
+        console.log('><><>>', qr);
         //库存品订单批量
-        this.html=''
-        getPrintDetail(qr).then( res =>{
+        this.html = '';
+        getPrintDetail(qr).then(res => {
           // console.log(",./");
           this.dialogVisible = true;
-          this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
-        })
-
+          this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
+        });
       }
-
     },
     //单独打印
-    handlePrintDetail(row){
-      console.log("单个答应》》》",row);
-      row.type = "1";
-      this.html=''
-      getPrintDetail(row).then( res =>{
-        console.log(",./");
+    handlePrintDetail(row) {
+      console.log('单个答应》》》', row);
+      row.type = '1';
+      this.html = '';
+      getPrintDetail(row).then(res => {
+        console.log(',./');
         this.dialogVisible = true;
-        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
-      })
-
+        this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
+      });
     },
     //查看库存品明细
-    handleDetail(row){
-      console.log("row>><><><",row);
+    handleDetail(row) {
+      console.log('row>><><><', row);
       this.dialogPack = true;
       //查询信息
       let po = {
         stockListId: row.stockListId,
         reservationId: row.reservationId,
-      }
-      let s =[];
-      getDisStockList(po).then( res =>{
-        console.log("res>>>>库存包件码",res.data.data);
+      };
+      let s = [];
+      getDisStockList(po).then(res => {
+        console.log('res>>>>库存包件码', res.data.data);
         res.data.data.forEach(i => {
-          if(!!i){
+          if (!!i) {
             let a = {};
             a.sku = i.sku;
             a.id = i.id;
@@ -1049,28 +1161,27 @@ export default {
           }
         });
         this.packageCodeList = s;
-      })
+      });
     },
-    showdrawer(value){
-      this.drawerShow=value
+    showdrawer(value) {
+      this.drawerShow = value;
     },
     /**
      * 弹窗的勾选回调，用于更改头部数组
      * 固定搭配，只需要更换   columnList
      */
-    setnewcolum(newarr, headarr,type) {
+    setnewcolum(newarr, headarr, type) {
       // console.log(newarr,'+++++++++++')
-      if(type==1){
+      if (type == 1) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
-      }else if(type==2){
+        this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
+      } else if (type == 2) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
-      }else if(type==3){
+        this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
+      } else if (type == 3) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+        this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
       }
-
     },
     selectionsc(value) {
       console.log(value);
@@ -1102,12 +1213,12 @@ export default {
     },
     timesc(index, row) {
       console.log(index, row);
-      if (!!index){
+      if (!!index) {
         index = dayjs(index).format('YYYY-MM-DD');
       }
-      this.query[row.prop] =  index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
@@ -1129,7 +1240,7 @@ export default {
     //打印
     printTemplate() {
       let LODOP = getLodop();
-      console.log("LODOP>>>>>",LODOP);
+      console.log('LODOP>>>>>', LODOP);
       // console.log("this.ids>>>>>",this.selectionList);
       // if (this.selectionList.length === 0){
       //   this.$message.warning("请选择至少一条数据");
@@ -1142,7 +1253,7 @@ export default {
         // console.log(templateData);
         LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
         LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
-        LODOP.SET_PRINT_STYLEA(0,"TextNeatRow",true);//允许标点溢出，且英文单词拆开
+        LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
         // // 设置打印整宽且不变形
         LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
         // // 设置打印后自动关闭
@@ -1151,7 +1262,6 @@ export default {
         LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
         // LODOP.PREVIEW(); //预览(预览打印无脚标)
         LODOP.PRINT(); //直接打印
-
       });
     },
     //查看包条码
@@ -1164,157 +1274,159 @@ export default {
       let qr = {
         ids: row.id,
       };
-      this.html=''
+      this.html = '';
       showOrderPackgeCode(qr).then(res => {
         // this.orderPackageCode = res.data
         console.log(res.data);
-        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
-
+        this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
       });
 
       this.dialogVisible = true;
     },
     //系统备货确定
-    callFordelivery(){
+    callFordelivery() {
       let c = false;
       if (this.selectionList.length > 0) {
         let ids = this.selectionList.map(i => i.id).join(',');
-        this.selectionList.forEach( i =>{
-          if(!!i.stockupStatus){
+        this.selectionList.forEach(i => {
+          if (!!i.stockupStatus) {
             c = true;
           }
-        })
-        this.form.ids = ids.split(",");
-      }else{
-        this.form.ids =this.form.ids.split(",");
+        });
+        this.form.ids = ids.split(',');
+      } else {
+        this.form.ids = this.form.ids.split(',');
       }
-      if(c){
-        this.$message.warning("有已备货的数据！！")
-        return ;
+      if (c) {
+        this.$message.warning('有已备货的数据！！');
+        return;
       }
       this.form.stockupId = this.$route.query.id;
-      getStockDetail( Object.assign(this.form)).then(res =>{
+      getStockDetail(Object.assign(this.form)).then(res => {
         this.$message({
-          type: "success",
-          message: "操作成功!"
+          type: 'success',
+          message: '操作成功!',
         });
         this.getStockUpParcelsList(this.page1);
         this.form = {};
         this.dialogHand = false;
       });
-
     },
     //选择
-    getForklift(row,ty){
-      switch (ty){
+    getForklift(row, ty) {
+      switch (ty) {
         case '3':
-          let f = this.goodsAreaIdData.find(i =>i.dictKey == row)
+          let f = this.goodsAreaIdData.find(i => i.dictKey == row);
           this.form.stockupArea = f.dictValue;
           break;
       }
     },
     //备货区
-    async getStorageArea(){
-      let params ={
-        department: this.deptId
-      }
-      stockUp(params).then(res =>{
+    async getStorageArea() {
+      let params = {
+        department: this.deptId,
+      };
+      stockUp(params).then(res => {
         // console.log("res>>>",res.data.data);
-        let fo =[];
-        res.data.data.forEach(i =>{
+        let fo = [];
+        res.data.data.forEach(i => {
           let v = {
             dictKey: i.id,
-            dictValue: i.name +'-'+i.headline
-          }
-          fo.push(v)
-        })
+            dictValue: i.name + '-' + i.headline,
+          };
+          fo.push(v);
+        });
         this.goodsAreaIdData = fo;
-      })
+      });
     },
-    handleStockUp(row,type){
-      getListUser().then(res =>{ //查询当前人信息
-        console.log("res>>>",res.data.data);
+    handleStockUp(row, type) {
+      getListUser().then(res => {
+        //查询当前人信息
+        console.log('res>>>', res.data.data);
         this.deptId = res.data.data.deptId;
         this.getStorageArea();
-      })
-    console.log("备货数据！！",row);
-    switch (type){
-      case '1':
-        if(this.selectionList.length === 0){
-          this.$message.warning("至少选择一条数据！！！");
-          return;
-        }
-        let a = false;
-        this.selectionList.some( i =>{
-          if(!!i.stockupStatus){
-          a=true;
-          return ;
+      });
+      console.log('备货数据！！', row);
+      switch (type) {
+        case '1':
+          if (this.selectionList.length === 0) {
+            this.$message.warning('至少选择一条数据！！！');
+            return;
           }
-        });
-        if(a){
-          this.$message.warning("有已备货数据！！！");
-          return ;
-        }
-        break;
-      case '2':
-        this.form.ids = row.id;
-        break;
-    }
+          let a = false;
+          this.selectionList.some(i => {
+            if (!!i.stockupStatus) {
+              a = true;
+              return;
+            }
+          });
+          if (a) {
+            this.$message.warning('有已备货数据！！！');
+            return;
+          }
+          break;
+        case '2':
+          this.form.ids = row.id;
+          break;
+      }
       this.dialogHand = true;
     },
-    handleClick (tab, event)  {
-      console.log(tab, event)
+    handleClick(tab, event) {
+      console.log(tab, event);
       console.log(tab.props.name);
       this.leibiao = tab.props.name;
-      if( this.leibiao == 'library'){
+      if (this.leibiao == 'library') {
         //订单
         this.getOrderList(this.page);
-      }else if( this.leibiao == 'outbound'){
+      } else if (this.leibiao == 'outbound') {
         //包件
         this.getStockUpParcelsList(this.page1);
-      }else if( this.leibiao == 'enter'){
+      } else if (this.leibiao == 'enter') {
         //库存品
         this.getInventoryList(this.page2);
       }
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 570);
-      getDictionaryBiz('distribution_type').then(res => { //配送类型
+      getDictionaryBiz('distribution_type').then(res => {
+        //配送类型
         this.distributionType = res.data.data;
       });
       // console.log("配送方式123", this.deliveryWayList);
-      getDictionaryBiz('delivery_way').then(res => { //配送方式
+      getDictionaryBiz('delivery_way').then(res => {
+        //配送方式
         this.deliveryWayList = res.data.data;
-        console.log("配送方式123", this.deliveryWayList);
+        console.log('配送方式123', this.deliveryWayList);
       });
-      getDictionaryBiz('stockup_status').then(res => { //配送方式
+      getDictionaryBiz('stockup_status').then(res => {
+        //配送方式
         this.stockupStatusList = res.data.data;
       });
-      getDictionaryBiz('addvalue_serve_type').then(res => { //服务类型
+      getDictionaryBiz('addvalue_serve_type').then(res => {
+        //服务类型
         this.serveTypeList = res.data.data;
       });
       this.onLoad(this.page);
-
     },
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       this.onLoad(this.page);
     },
-    searchReset () {
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    handleSubmit () {
+    handleSubmit() {
       if (!this.form.id) {
         add(this.form).then(() => {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
       } else {
@@ -1322,48 +1434,48 @@ export default {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
-        })
+        });
       }
     },
 
     //全部
-    handleEntire(){
+    handleEntire() {
       this.handler = true;
       this.taker = true;
       this.trade = false;
-
     },
     //商配
-    handleTrade(){
+    handleTrade() {
       // this.handler = true;
       this.trade = true;
     },
     //商配
-    handleMunicipal(){
+    handleMunicipal() {
       // this.handler = true;
       // this.taker = true;
     },
     //自提
-    handlePickUpStore(){
+    handlePickUpStore() {
       this.loading = true;
       // console.log("this.query",this.query);
       let params = {};
       this.query.typeService = '1';
-      getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-        this.handler = false;
-        this.taker = false;
-      });
+      getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+          this.handler = false;
+          this.taker = false;
+        }
+      );
     }, //自提的通知
-    handleInform(index){
-
+    handleInform(index) {
       this.loading = true;
       // console.log("this.query",this.query);
       let params = {};
@@ -1377,45 +1489,47 @@ export default {
           break;
       }
       this.query.typeService = '1';
-      getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-        this.handler = false;
-        this.taker = false;
-      });
+      getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+          this.handler = false;
+          this.taker = false;
+        }
+      );
     },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
-      this.box = true
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
+      this.box = true;
     },
-    handleEdit (row) {
-      this.title = '编辑'
-      this.box = true
+    handleEdit(row) {
+      this.title = '编辑';
+      this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleView (row) {
-      this.title = '查看'
+    handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleDelete () {
+    handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -1424,16 +1538,16 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -1441,62 +1555,55 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    beforeClose (done) {
-      done()
+    beforeClose(done) {
+      done();
       this.form = {};
       this.view = false;
     },
-    selectionChange (list) {
+    selectionChange(list) {
       // console.log("添加阿斯顿发生",list);
       this.selectionList = list;
     },
-    selectionClear () {
+    selectionClear() {
       this.selectionList = [];
       // this.$refs.table.clearSelection();
     },
-    currentChange (currentPage) {
-      if(!!this.leibiao && this.leibiao == 'library'){
+    currentChange(currentPage) {
+      if (!!this.leibiao && this.leibiao == 'library') {
         this.page.currentPage = currentPage;
         this.getOrderList(this.page);
-
-      }else if(!!this.leibiao && this.leibiao == 'outbound'){
+      } else if (!!this.leibiao && this.leibiao == 'outbound') {
         this.page1.currentPage = currentPage;
         this.getStockUpParcelsList(this.page1);
-      }
-      else if(!!this.leibiao && this.leibiao == 'enter'){
+      } else if (!!this.leibiao && this.leibiao == 'enter') {
         this.page2.currentPage = currentPage;
         this.getInventoryList(this.page2);
-      }
-      else {
+      } else {
         this.page3.currentPage = currentPage;
         this.getReservationList(this.page3);
       }
     },
-    sizeChange (pageSize) {
-      if(!!this.leibiao && this.leibiao == 'library'){
+    sizeChange(pageSize) {
+      if (!!this.leibiao && this.leibiao == 'library') {
         this.page.pageSize = pageSize;
         this.getOrderList(this.page);
-
-      }else if(!!this.leibiao && this.leibiao == 'outbound'){
+      } else if (!!this.leibiao && this.leibiao == 'outbound') {
         this.page1.pageSize = pageSize;
         this.getStockUpParcelsList(this.page1);
-      }
-      else if(!!this.leibiao && this.leibiao == 'enter'){
+      } else if (!!this.leibiao && this.leibiao == 'enter') {
         this.page2.pageSize = pageSize;
         this.getInventoryList(this.page2);
-      }
-      else{
+      } else {
         this.page3.pageSize = pageSize;
         this.getReservationList(this.page3);
       }
-
     },
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
       this.query.id = this.$route.query.id;
       // getDetailStockupOwn(this.$route.query.id).then(res => {
@@ -1524,11 +1631,13 @@ export default {
 
       this.getReservationList(page);
       this.loading = false;
-    } ,
+    },
     //查询预约列表
-   async getReservationList(page){
-       let a =await getDetailReservationOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
-     console.log("......",a.data);
+    async getReservationList(page) {
+      let a = await getDetailReservationOwn(page.currentPage, page.pageSize, {
+        id: this.$route.query.id,
+      });
+      console.log('......', a.data);
       const data = a.data.data;
       this.data3 = data.records;
       // if(!!this.data3 && this.data3.length > 0){
@@ -1540,90 +1649,106 @@ export default {
       //   })
       // }
 
-     this.page3.total = a.data.data.total;
-     this.loading = false;
-     this.selectionClear();
+      this.page3.total = a.data.data.total;
+      this.loading = false;
+      this.selectionClear();
     },
     //查询包件列表
-   async getStockUpParcelsList(page){
-      let a = await getParcelListOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
-     // console.log("包件...",a.data.data);
-       const data = a.data.data;
-       if(data.records.length > 0){
-         // console.log("数据》《》《",data.records[0]);
-         if(!!data.records[0]){
-           this.data1 = data.records;
-           // console.log("数据》《》《》",this.data1);
-           if(this.data1[0] != null ){
-           this.data1.forEach(i =>{
-             if(i != null ){
-               console.log("><><><>>>",i);
-               if(!i.stockupStatus){
-                 i.stockupStatusName = "待备货";
-                 this.isStockUp = true;
-               }else{
-                 i.stockupStatusName = "已备货";
-               }
-             }
-           })
-           }
-         }
+    async getStockUpParcelsList(page) {
+      let a = await getParcelListOwn(page.currentPage, page.pageSize, { id: this.$route.query.id });
+      // console.log("包件...",a.data.data);
+      const data = a.data.data;
+      if (data.records.length > 0) {
+        // console.log("数据》《》《",data.records[0]);
+        if (!!data.records[0]) {
+          this.data1 = data.records;
+          // console.log("数据》《》《》",this.data1);
+          if (this.data1[0] != null) {
+            this.data1.forEach(i => {
+              if (i != null) {
+                console.log('><><><>>>', i);
+                if (!i.stockupStatus) {
+                  i.stockupStatusName = '待备货';
+                  this.isStockUp = true;
+                } else {
+                  i.stockupStatusName = '已备货';
+                }
+              }
+            });
+          }
+        }
 
-         this.page1.total = a.data.data.total;
-       }
-     this.loading = false;
-     this.selectionClear();
+        this.page1.total = a.data.data.total;
+      }
+      this.loading = false;
+      this.selectionClear();
     },
     //查询订单列表
-   async getOrderList(page){
-      let a =await getDetailOrderOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
-     // console.log("订单...",a.data);
+    async getOrderList(page) {
+      let a = await getDetailOrderOwn(page.currentPage, page.pageSize, {
+        id: this.$route.query.id,
+      });
+      // console.log("订单...",a.data);
       const data = a.data.data;
       this.dataPare = data.records;
-      this.dataPare.forEach(i =>{
-        let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
-        if(!!b){
+      this.dataPare.forEach(i => {
+        let b = this.stockupStatusList.find(a => a.dictKey == i.stockupStatus);
+        if (!!b) {
           i.stockupStatusName = b.dictValue;
         }
-      })
-     this.page.total = a.data.data.total;
-     this.loading = false;
-     this.selectionClear();
+      });
+      this.page.total = a.data.data.total;
+      this.loading = false;
+      this.selectionClear();
     },
     //查询库存品列表
-   async getInventoryList(page){
-      let a =await getDetailInventoryOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
-     // console.log("库存品...",a.data);
+    async getInventoryList(page) {
+      let a = await getDetailInventoryOwn(page.currentPage, page.pageSize, {
+        id: this.$route.query.id,
+      });
+      console.log("库存品...",a);
       const data = a.data.data;
+      
+      data.records.forEach(item => {
+        console.log(item,'循环的值');
+        if (item.stockStatus == '1') {
+          item.stockStatus = '待备货';
+        } else if (item.stockStatus == '2') {
+          item.stockStatus = '备货中';
+        } else if (item.stockStatus == '3') {
+          item.stockStatus = '备货完成';
+        } else {
+          item.stockStatus = '';
+        }
+      });
       this.data2 = data.records;
-      this.data2.forEach(i =>{
-        let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
-        if(!!b){
+      this.data2.forEach(i => {
+        let b = this.stockupStatusList.find(a => a.dictKey == i.stockupStatus);
+        if (!!b) {
           i.stockupStatusName = b.dictValue;
         }
-      })
-     this.page2.total = a.data.data.total;
-     this.loading = false;
-     this.selectionClear();
+      });
+      this.page2.total = a.data.data.total;
+      this.loading = false;
+      this.selectionClear();
     },
     //转换类型
-    getOwnServer(row,name,list){
+    getOwnServer(row, name, list) {
       // console.log(">>>>>",row,name,list);
       // console.log(">>>>>",row);
       // console.log(">>>>>",name);
       // console.log(">>>>>",list);
-      row.forEach( i =>{
+      row.forEach(i => {
         // console.log(i,"-=-=-=-");
-        let a = list.find( s => s.dictKey == i);
+        let a = list.find(s => s.dictKey == i);
         // console.log("aaaa",a);
-        if(!!a){
+        if (!!a) {
           name += a.dictValue;
         }
-
       });
       return name;
     },
-  }
+  },
 };
 </script>
 <style scoped>
@@ -1640,4 +1765,3 @@ export default {
   margin-right: 10px;
 }
 </style>
-
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index d526223f..025d1d05 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -2,7 +2,7 @@
   <div :class="kind ? 'orderPage' : 'orderPageS'">
     <el-tabs
       v-loading="editLoading"
-      element-loading-text="编辑内容加载中..."
+      element-loading-text="正在加载中..."
       type="border-card"
       class="order-table"
       @tab-click="tabClick"
@@ -820,6 +820,7 @@ import {
   getZeroOrderDetail,
 } from '@/api/distribution/distributionStockArticle'; //API
 import { getVehicleList } from '@/api/basicdata/basicdataVehicle'; //车辆信息
+import { useStore } from 'vuex';
 import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; //司机信息
 import { ElMessage, type UploadProps } from 'element-plus';
 import {
@@ -840,6 +841,10 @@ import type { FormProps } from 'element-plus';
 import { updateEntryNum, entryNum } from '@/api/distribution/distributionParcelNumber';
 const route = useRoute();
 const router = useRouter();
+// 获取vuex仓库
+const $store = useStore();
+console.log($store,'仓库');
+
 // 选项卡
 const numTab = ref([
   {
@@ -1933,25 +1938,7 @@ const soclear = () => {
   SearchFu();
 };
 
-// function scrollToElementWithPartialId(partialId) {
-//     // 首先清空之前所有元素的颜色样式
-//     document.querySelectorAll('[id]').forEach(function(el) {
-//         el.style.backgroundColor = ''; // 移除背景颜色
-//         el.style.color = ''; // 移除文字颜色
-//     });
-
-//     // 现在开始搜索含有 partialId 的元素
-//     const allElements = document.querySelectorAll(`[id*="${partialId}"]`);
-//     if (allElements.length > 0) {
-//         // 获取第一个匹配的元素
-//         const targetElement = allElements[0];
-//         // 添加背景颜色和文字颜色
-//         targetElement.style.backgroundColor = '#ff0000'; // 设置背景颜色为红色
-//         targetElement.style.color = '#fff'; // 设置文字颜色为白色
-//         // 将匹配元素滚动到视野区域
-//         targetElement.scrollIntoView();
-//     }
-// }
+
 function scrollToElementWithinTableRow(partialIdString) {
   // 首先清空之前所有元素的颜色样式
   const tableRows = document.querySelectorAll('tr');
@@ -2704,6 +2691,8 @@ const moveUpVehictle = row => {
 
 // 最后提交订单
 const SubmitCommercial = () => {
+
+
   //   kind为假就说明目前是在外协页面
   console.log(kind.value);
   if (kind.value) {
@@ -2715,6 +2704,7 @@ const SubmitCommercial = () => {
   if (!state.value) {
     return;
   }
+
   // 如果订单下面没有选择包件就默认给每个订单包件下面添加packageListInfo字段为空数组
   dataInfo.value.forEach(item => {
     if (!item.packageListInfo) {
@@ -2724,6 +2714,7 @@ const SubmitCommercial = () => {
   DataSubmit.value.stockArticle = dataInfo.value; //订单列表
   // 提交
   // 编辑修改
+  editLoading.value = true;//开启提交加载
   if (RouteId.value) {
     if (!kind.value) {
       delete DataSubmit.value.allocationInfo; //如果为外协删掉此参数
@@ -2733,15 +2724,21 @@ const SubmitCommercial = () => {
     DataSubmitRenamed.stockupInfo = DataSubmit.value.stockup; //把原来的参数赋值给新对象名字,这里用于修改对象名字
     DataSubmitRenamed.id = RouteId.value; //修改提交的时候带上参数ID
     updateDeliveryList(DataSubmitRenamed).then(res => {
+      editLoading.value = false;//关闭提交加载
       console.log(res, '修改之后提交的返回值');
-      router.push('/distribution/deliverylist/distributionDeliveryListdis');
+      $store.commit('DEL_TAG_CURRENT'); //关闭当前页面
+      router.push('/distribution/inventory/distrilbutionBillLadingList');
+     
     });
   } else {
     // 新增信息
     deliveryBusinessTask(DataSubmit.value).then(res => {
       console.log(res, '新增之后的返回值');
       //   提交之后进行跳转
-      router.push('/distribution/deliverylist/distributionDeliveryListdis');
+      editLoading.value = false;//关闭提交加载
+      $store.commit('DEL_TAG_CURRENT'); //关闭当前页面
+      router.push('/distribution/inventory/distrilbutionBillLadingList');
+      
     });
   }