diff --git a/src/main.js b/src/main.js
index f9625454..e3e39afe 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,7 +12,7 @@ import Avue from '@smallwei/avue';
 import '@smallwei/avue/lib/index.css';
 import crudCommon from '@/mixins/crud.js';
 import globalc from '@/api/basicdata/globalc.js'
-import { getScreen } from './utils/util';
+import { getScreen,getHtmls } from './utils/util';
 import functions from './utils/functions'
 import './permission';
 import error from './error';
@@ -55,6 +55,7 @@ app.provide('functions',functions)
 app.config.globalProperties.$globalc = globalc;
 app.config.globalProperties.website = website;
 app.config.globalProperties.getScreen = getScreen;
+app.config.globalProperties.getHtmls = getHtmls;
 app.use(error);
 app.use(i18n);
 
diff --git a/src/option/distribution/distrilbutionBillLading.js b/src/option/distribution/distrilbutionBillLading.js
index bfec2bc6..90ade6f7 100644
--- a/src/option/distribution/distrilbutionBillLading.js
+++ b/src/option/distribution/distrilbutionBillLading.js
@@ -123,7 +123,6 @@ export default {
       label: "总件数",
       prop: "quantity",
     },
-
     // {
     //   label: "已提件数",
     //   prop: "pickUpTime",
@@ -1015,4 +1014,221 @@ export default {
       search: true,
     },
   ],
+  columnOrder: [
+    {
+      prop: 'serviceNumber',
+      label: '服务号',
+      width: '150',
+      head: false,
+    },
+    {
+      prop: 'waybillNumber ',
+      label: '运单号',
+      width: '150',
+      head: false,
+    },
+    {
+      prop: 'orderCode',
+      label: '订单自编号',
+      width: '150',
+
+    },
+    {
+      prop: 'mallName',
+      label: '商场名称',
+
+      width: '180',
+
+    },
+    {
+      prop: 'descriptionGoods',
+      label: '货物名称',
+
+      width: '180',
+
+    },
+    {
+      prop: 'warehouse',
+      label: '所在仓库',
+
+      width: '180',
+
+    },
+    {
+      prop: 'warehouseEntryTime',
+      label: '入库时间',
+
+      width: '180',
+
+    },
+    {
+      prop: 'warehouseEntryTimeEnd',
+      label: '最新入库时间',
+
+      width: '180',
+
+    },
+    {
+      prop: 'storeTime',
+      label: '在库时间',
+
+      width: '180',
+
+    },
+    {
+      prop: 'totalNumber',
+      label: '订单总件数',
+
+      width: '150',
+
+    },
+    {
+      prop: 'consigneeUnit',
+      label: '收货单位',
+
+      width: '150',
+
+    }, {
+      prop: 'consigneePerson',
+      label: '收货人',
+      width: '150',
+
+    }, {
+      prop: 'handQuantity',
+      label: '在库件数',
+      width: '150',
+
+    }, {
+      prop: 'availableQuantity',
+      label: '可用数量',
+      width: '150',
+    },
+    {
+      prop: 'notReceived',
+      label: '未入库数量',
+
+      width: '150',
+    },  {
+      prop: 'sortingQuantity',
+      label: '分拣数量',
+      width: '150',
+    },  {
+      prop: 'deliveryQuantity',
+      label: '配送数量',
+
+      width: '150',
+    }, {
+      prop: 'transferQuantity',
+      label: '中转数量',
+
+      width: '150',
+
+    }, {
+      prop: 'signinQuantity',
+      label: '签收数量',
+
+      width: '150',
+
+    },{
+      prop: 'groundingStatusName',
+      label: '上架状态',
+
+      width: '150',
+
+    },{
+      prop: 'allocation',
+      label: '货区-货位-货架',
+
+      width: '150',
+
+    },{
+      prop: 'resource',
+      label: '订单来源',
+
+      width: '150',
+
+    },
+    {
+      prop: 'trays',
+      label: '所在托盘',
+
+      width: '150',
+
+    },
+    {
+      prop: 'freezeStatusName',
+      label: '冻结状态',
+
+      width: '150',
+    },
+    {
+      prop: 'orderStatusName',
+      label: '订单状态',
+
+      width: '150',
+
+    },
+    {
+      prop: 'reservationStatusName',
+      label: '预约状态',
+
+      width: '150',
+
+    },
+    {
+      prop: 'stockupStatusName',
+      label: '备货状态',
+
+      width: '150',
+
+    },
+    {
+      prop: 'completeSetName',
+      label: '是否齐套',
+
+      width: '150',
+
+    },
+    {
+      prop: 'notification',
+      label: '通知状态',
+      width: '150',
+    },
+    {
+      prop: 'customerName',
+      label: '顾客名字',
+
+      width: '150',
+
+    },
+    {
+      prop: 'customerTelephone',
+      label: '顾客电话',
+
+      width: '150',
+
+    },
+    {
+      prop: 'customerAddress',
+      label: '顾客地址',
+
+      width: '150',
+
+    },
+    {
+      prop: 'fee',
+      label: '增值服务',
+
+      width: '150',
+
+    }, {
+      prop: 'createUserName',
+      label: '创建人',
+      width: '150',
+    }, {
+      prop: 'createTime',
+      label: '创建时间',
+      width: '150',
+    },
+  ],
 }
diff --git a/src/utils/util.js b/src/utils/util.js
index 0cdfc477..3964fa8c 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -277,13 +277,13 @@ export const openWindow = (url, title, w, h) => {
   const width = window.innerWidth
     ? window.innerWidth
     : document.documentElement.clientWidth
-    ? document.documentElement.clientWidth
-    : screen.width;
+      ? document.documentElement.clientWidth
+      : screen.width;
   const height = window.innerHeight
     ? window.innerHeight
     : document.documentElement.clientHeight
-    ? document.documentElement.clientHeight
-    : screen.height;
+      ? document.documentElement.clientHeight
+      : screen.height;
 
   const left = width / 2 - w / 2 + dualScreenLeft;
   const top = height / 2 - h / 2 + dualScreenTop;
@@ -291,13 +291,13 @@ export const openWindow = (url, title, w, h) => {
     url,
     title,
     'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=yes, copyhistory=no, width=' +
-      w +
-      ', height=' +
-      h +
-      ', top=' +
-      top +
-      ', left=' +
-      left
+    w +
+    ', height=' +
+    h +
+    ', top=' +
+    top +
+    ', left=' +
+    left
   );
 
   // Puts focus on the newWindow
@@ -314,6 +314,18 @@ export const getScreen = isCollapse => {
   }
 };
 
+export const getHtmls = (arrs, htmldemo) => {
+  let html = ''
+  arrs.map(item => {
+    let strhtml = JSON.parse(JSON.stringify(htmldemo));
+    for (let key in item) {
+      let str = '${' + key + '}';
+      strhtml = strhtml.replace(str, item[key]);
+    }
+    html += strhtml;
+  });
+  return html
+}
 /**
  * 获取顶部地址栏地址
  */
diff --git a/src/utils/watermark.js b/src/utils/watermark.js
index e6c0a824..3a6701ea 100644
--- a/src/utils/watermark.js
+++ b/src/utils/watermark.js
@@ -11,8 +11,8 @@ let setWatermark = (str) => {
     }
 
     let can = document.createElement('canvas')
-    can.width = 600
-    can.height = 600
+    can.width = 700
+    can.height = 650
 
     let cans = can.getContext('2d')
     cans.rotate(-15 * Math.PI / 150)
@@ -25,8 +25,8 @@ let setWatermark = (str) => {
     let div = document.createElement('div')
     div.id = id
     div.style.pointerEvents = 'none'
-    div.style.top = '10px'
-    div.style.left = '10px'
+    div.style.top = '50px'
+    div.style.left = '60px'
     div.style.position = 'fixed'
     div.style.zIndex = '1000000'
     div.style.width = document.documentElement.clientWidth + 'px'
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index dc0c5edb..5b997bb0 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -1774,20 +1774,6 @@ export default {
         const data = res.data.data;
         console.log(">>>>>>>",data.records);
         this.page.total = data.total;
-        // data.records.some(i =>{
-        //   if(i.notification == '1'){
-        //     i.notification = '未通知'
-        //   }else{
-        //     i.notification = '已通知'
-        //   }
-        //   if(i.state == '1'){
-        //     i.stateName = '待预约'
-        //   }else if(i.state == '2'){
-        //     i.stateName = '已预约'
-        //   }else if(i.state == '7'){
-        //     i.stateName = '已完成'
-        //   }
-        // });
         this.data = data.records;
         this.data = this.data.map(i => {
           const notificationMap = {
@@ -1795,31 +1781,10 @@ export default {
             '2': "未通知",
             default: "无"
           };
-          // const stateMap = {
-          //   '1': "待预约",
-          //   '2': "已预约",
-          //   '7': " 已完成",
-          //   default: "无"
-          // };
-          // const freezeStatusMap = {
-          //   0: "未冻结",
-          //   1: "已冻结",
-          //   default: "无"
-          // };
           const nuMap = {
             '-1': "0"
           };
-          // const groundingStatusMap = {
-          //   0: "未上架",
-          //   1: "部分上架",
-          //   2: "已上架",
-          //   3: "已下架",
-          //   default: "无"
-          // };
-          // i.stateName = stateMap[i.state] || stateMap.default;
           i.notification = notificationMap[i.notification] || notificationMap.default;
-          // i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
-          // i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
           i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
           i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
           i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 99f3169e..0dd02bc1 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -3,95 +3,117 @@
     <div class="avue-crud">
       <el-row :hidden="!search" style="margin-bottom: 1%">
         <!-- 列表模块 -->
-        <el-table ref="table" v-loading="loading"
-                  :data="data"
-                  style="width: 100%"
-                  :border="option.border">
-<!--          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
-<!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
-<!--          <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">-->
-<!--          </el-table-column>-->
-          <template v-for="(item,index) in option.columnBasic">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          :data="data"
+          style="width: 100%"
+          :border="option.border"
+        >
+          <!--          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
+          <!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
+          <!--          <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">-->
+          <!--          </el-table-column>-->
+          <template v-for="(item, index) in option.columnBasic">
             <!-- table字段 -->
-            <el-table-column v-if="item.hide!==true"
-                             :prop="item.prop"
-                             :label="item.label"
-                             :width="item.width"
-                             :key="index">
+            <el-table-column
+              v-if="item.hide !== true"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+              :key="index"
+            >
             </el-table-column>
           </template>
         </el-table>
       </el-row>
       <el-row style="margin-bottom: 1%">
         <!-- 列表模块 -->
-        <el-table ref="table" v-loading="loading"
-                  @selection-change="selectionChange"
-                  :data="data"
-                  style="width: 100%"
-                  :border="option.border">
-<!--          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
-<!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
-<!--          <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">-->
-<!--          </el-table-column>-->
-          <template v-for="(item,index) in option.columnTakeOver">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          @selection-change="selectionChange"
+          :data="data"
+          style="width: 100%"
+          :border="option.border"
+        >
+          <!--          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
+          <!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
+          <!--          <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">-->
+          <!--          </el-table-column>-->
+          <template v-for="(item, index) in option.columnTakeOver">
             <!-- table字段 -->
-            <el-table-column v-if="item.hide!==true"
-                             :prop="item.prop"
-                             :label="item.label"
-                             :width="item.width"
-                             :key="index">
+            <el-table-column
+              v-if="item.hide !== true"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+              :key="index"
+            >
             </el-table-column>
           </template>
           <!-- 操作栏模块 -->
           <el-table-column prop="menu" label="操作" :width="220" align="center">
-            <template #="{row}">
-<!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
-              <el-button type="primary" text icon="el-icon-edit" @click="handleCallDelivery('3',row)">编辑</el-button>
+            <template #="{ row }">
+              <!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
+              <el-button
+                type="primary"
+                text
+                icon="el-icon-edit"
+                @click="handleCallDelivery('3', row)"
+                >编辑</el-button
+              >
               <!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
             </template>
           </el-table-column>
         </el-table>
-
-
       </el-row>
       <el-row style="margin-bottom: 1%">
         <!-- 列表模块 -->
-        <el-table ref="table" v-loading="loading"
-                  @selection-change="selectionChange"
-                  :data="data"
-                  style="width: 100%"
-                  :border="option.border">
-<!--          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
-<!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
-<!--          <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">-->
-<!--          </el-table-column>-->
-          <template v-for="(item,index) in option.columnTakeClice">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          @selection-change="selectionChange"
+          :data="data"
+          style="width: 100%"
+          :border="option.border"
+        >
+          <!--          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
+          <!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
+          <!--          <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">-->
+          <!--          </el-table-column>-->
+          <template v-for="(item, index) in option.columnTakeClice">
             <!-- table字段 -->
-            <el-table-column v-if="item.hide!==true"
-                             :prop="item.prop"
-                             :label="item.label"
-                             :width="item.width"
-                             :key="index">
+            <el-table-column
+              v-if="item.hide !== true"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+              :key="index"
+            >
             </el-table-column>
           </template>
-<!--          &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
-<!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
-<!--            <template #="{row}">-->
-<!--&lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
-<!--              <el-button type="primary" text icon="el-icon-edit" @click="handleCallDelivery('3',row)">编辑</el-button>-->
-<!--              &lt;!&ndash;              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <!--          &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
+          <!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
+          <!--            <template #="{row}">-->
+          <!--&lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
+          <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleCallDelivery('3',row)">编辑</el-button>-->
+          <!--              &lt;!&ndash;              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
         </el-table>
-
-
       </el-row>
-        <h3>包件信息</h3>
+      <h3>包件信息</h3>
       <div style="float: right" v-if="dataMaterial">
-        <el-button type="primary" text icon="el-icon-view" @click="handleMaterialList()">补充物料信息</el-button>
-
+        <el-button type="primary" text icon="el-icon-view" @click="handleMaterialList()"
+          >补充物料信息</el-button
+        >
+      </div>
+      <div class="plck">
+        <el-button type="primary" @click="allhandleQRCode">批量查看二维码</el-button>
       </div>
       <el-row>
+        
         <!-- 列表模块 -->
         <tablecmt
           :columnList="columnList"
@@ -104,16 +126,35 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-<!--            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
-<!--            <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
-            <el-button type="primary" text icon="el-icon-view" @click="handleTrajectory(slotProps.scope.row)">查看轨迹</el-button>
-            <el-button type="primary" text icon="el-icon-view" @click="handleQRCode(slotProps.scope.row)">查看二维码</el-button>
-            <el-button type="primary" text icon="el-icon-view" v-if="slotProps.scope.row.materialId == '' || slotProps.scope.row.materialId == '-1'" @click="handleMaterial(slotProps.scope.row)">补充物料信息</el-button>
+            <!--            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
+            <!--            <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
+            <el-button
+              type="primary"
+              text
+              icon="el-icon-view"
+              @click="handleTrajectory(slotProps.scope.row)"
+              >查看轨迹</el-button
+            >
+            <el-button
+              type="primary"
+              text
+              icon="el-icon-view"
+              @click="handleQRCode(slotProps.scope.row)"
+              >查看二维码</el-button
+            >
+            <el-button
+              type="primary"
+              text
+              icon="el-icon-view"
+              v-if="slotProps.scope.row.materialId == '' || slotProps.scope.row.materialId == '-1'"
+              @click="handleMaterial(slotProps.scope.row)"
+              >补充物料信息</el-button
+            >
           </template>
         </tablecmt>
 
         <!-- 列表模块 -->
-       <!-- <el-table ref="table" v-loading="loading"
+        <!-- <el-table ref="table" v-loading="loading"
                   @selection-change="selectionChange"
                   :data="dataPare"
                   :height="height"
@@ -145,26 +186,30 @@
         </el-table>-->
       </el-row>
       <el-row>
-        <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="page.currentPage"
-                         :page-sizes="[10, 20, 30, 40, 50, 100]"
-                         :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="[10, 20, 30, 40, 50, 100]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
           </el-pagination>
         </div>
       </el-row>
       <!-- 物料选择模块 -->
-      <el-dialog :title="titleMaterial"
-                 v-model="materialBox"
-                 width="40%"
-                 :before-close="beforeClose"
-                 append-to-body>
+      <el-dialog
+        :title="titleMaterial"
+        v-model="materialBox"
+        width="70%"
+        :before-close="beforeClose"
+        append-to-body
+      >
         <el-form :disabled="view" ref="form" :model="formMaterial" label-width="80px">
           <el-form-item label="物料名称" prop="typeService">
             <el-select
@@ -175,7 +220,7 @@
               placeholder="请输入物料名称"
               remote-show-suffix
               :remote-method="remoteMethodName"
-              @change="getMethodName($event,'1')"
+              @change="getMethodName($event, '1')"
               :loading="loading"
             >
               <el-option
@@ -195,7 +240,7 @@
               placeholder="请输入物料编码"
               remote-show-suffix
               :remote-method="remoteMethodCode"
-              @change="getMethodName($event,'2')"
+              @change="getMethodName($event, '2')"
               :loading="loading"
             >
               <el-option
@@ -213,19 +258,21 @@
                 v-for="item in logpmUnit"
                 :key="item.dictKey"
                 :label="item.dictValue"
-                :value="item.dictKey">
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="SKU" prop="mallName">
-            <el-input v-model="formMaterial.sku" placeholder="请输入SKU"/>
+            <el-input v-model="formMaterial.sku" placeholder="请输入SKU" />
           </el-form-item>
-
         </el-form>
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitMethod">提 交</el-button>
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitMethod"
+              >提 交</el-button
+            >
             <el-button icon="el-icon-circle-close" @click="materialBox = false">取 消</el-button>
           </span>
         </template>
@@ -248,23 +295,17 @@
           </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>
 
-      <el-dialog
-        title="二维码"
-        :visible.sync="dialogVisible"
-        width="640px"
-        v-model="dialogVisible">
-        <div >
-          <div v-html="html">
-
-          </div>
+      <el-dialog title="二维码" :visible.sync="dialogVisible" width="730px" v-model="dialogVisible">
+        <div>
+          <div v-html="html"></div>
 
           <!-- <div v-for="(item,index) in qrCodeObj">
             <el-row>
@@ -275,8 +316,8 @@
           </div> -->
         </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="ddd">导 出</el-button>-->
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
           <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
           <el-button @click="dialogVisible = false">取 消</el-button>
         </span>
@@ -292,6 +333,11 @@
 </template>
 
 <script>
+
+import {
+  Search
+} from '@element-plus/icons-vue'
+
 import {
   getList,
   getDetail,
@@ -299,14 +345,14 @@ import {
   update,
   remove,
   addStock,
-  showOrderPackgeCode
+  showOrderPackgeCode,
 } from '@/api/distribution/distributionStockArticle';
 import { getListOwn, updateParcelList } from '@/api/distribution/distributionParcelList';
-import { addCallDelivery } from "@/api/distribution/distrilbutionCallDelivery";
-import { addClient } from "@/api/distribution/distributionClientMessage";
-import { addService } from "@/api/distribution/distributionServiceLog";
-import option from "@/option/distribution/distributionStockArticle";
-import { mapGetters } from "vuex";
+import { addCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
+import { addClient } from '@/api/distribution/distributionClientMessage';
+import { addService } from '@/api/distribution/distributionServiceLog';
+import option from '@/option/distribution/distributionStockArticle';
+import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getListMaterial } from '@/api/basic/basicMaterial';
 import { getLodop } from '@/utils/LodopFuncs';
@@ -314,7 +360,7 @@ import { getStockTemplate } from '@/api/distribution/distributionStockArticle';
 import dayjs from 'dayjs';
 
 export default {
-  data () {
+  data() {
     return {
       height: 0,
       // 弹框标题
@@ -334,19 +380,19 @@ export default {
       titleMaterial: '',
       optionsName: [],
       optionsCode: [],
-      logpmUnit:[],
+      logpmUnit: [],
       // 是否展示弹框
       materialBox: false,
       // 分页信息
       page: {
         currentPage: 1,
         pageSize: 10,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
       formMaterial: {},
-      formCall: {},// 通知
+      formCall: {}, // 通知
       formService: {}, // 服务
       formCustomer: {}, // 客户
       materialQRCode: {}, // 客户
@@ -360,16 +406,16 @@ export default {
       dataMaterial: false,
       distributionType: [],
       dialogTableVisible: false,
-      dialogVisible:false, //二维码控制
-      qrCodeObj:[], //二维码图片
+      dialogVisible: false, //二维码控制
+      qrCodeObj: [], //二维码图片
       dialogFormVisible: false,
       dialogFormCustomer: false,
       dialogFormService: false,
       formLabelWidth: '120px',
-      handler:true, //首次
-      trade:false, // 商
-      municipal:true, // 市
-      taker:true, // 自提
+      handler: true, //首次
+      trade: false, // 商
+      municipal: true, // 市
+      taker: true, // 自提
       columnListedit: [],
       drawerShow: false,
       columnList: [
@@ -483,7 +529,8 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        }, {
+        },
+        {
           prop: 'firsts',
           label: '一级品',
           type: 2,
@@ -492,7 +539,8 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        }, {
+        },
+        {
           prop: 'second',
           label: '二级品',
           type: 2,
@@ -501,7 +549,8 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        }, {
+        },
+        {
           prop: 'thirdProduct',
           label: '三级品',
           type: 2,
@@ -562,23 +611,23 @@ export default {
           hide: true,
         },
       ],
-      html:null // 页面包条码内容
-    }
+      html: null, // 页面包条码内容
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
     this.onLoad(this.page);
     /**
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
-      // let checkList=[]
-      // this.columnList.map(item => {
-      //     item.head = false;
-      // });
-    let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
-    let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
-    let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
+    // let checkList=[]
+    // this.columnList.map(item => {
+    //     item.head = false;
+    // });
+    let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
+    let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
+    let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
     if (checkListnewarr) {
       this.columnList.map(item => {
         item.head = false;
@@ -590,14 +639,14 @@ export default {
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.head){
-          arr.push(item.label)
+        if (item.head) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'checkList',arr)
+      this.$functions.setStorage(window.location.pathname + 'checkList', arr);
     }
     if (flexListnewarr) {
       this.columnList.map(item => {
@@ -606,22 +655,22 @@ export default {
       flexListnewarr.map(ite => {
         this.columnList.map(item => {
           if (ite == item.label) {
-            if(item.type==6){
+            if (item.type == 6) {
               item.fixed = 'right';
-            }else{
+            } else {
               item.fixed = true;
             }
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.fixed){
-          arr.push(item.label)
+        if (item.fixed) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'flexList',arr)
+      this.$functions.setStorage(window.location.pathname + 'flexList', arr);
     }
     if (sortlistnewarr) {
       this.columnList.map(item => {
@@ -634,128 +683,125 @@ export default {
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.sortable){
-          arr.push(item.label)
+        if (item.sortable) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'sortlist',arr)
+      this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
     }
   },
-  watch:{
-    '$route.query.id':{
+  watch: {
+    '$route.query.id': {
       handler(newVal, oldVal) {
         // console.log(newVal, oldVal);
         this.onLoad(this.page);
         this.onLoadOwn(this.page);
       },
       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: {
-    handleMaterialList(){
-      if(this.selectionList.length === 0){
-        this.$message.warning("请选择需要补充的包件!!!");
-        return ;
-      }else{
+    handleMaterialList() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择需要补充的包件!!!');
+        return;
+      } else {
         let a = false;
-        this.selectionList.forEach(i =>{
-          console.log("现在的数据》》》》  ",i);
-          if(!!i.materialId && i.materialId != '-1'){
+        this.selectionList.forEach(i => {
+          console.log('现在的数据》》》》  ', i);
+          if (!!i.materialId && i.materialId != '-1') {
             a = true;
           }
-
-        })
-        if(a){
-          this.$message.warning("有包含物料的包件信息，请去除，在勾选！！！");
-          return ;
+        });
+        if (a) {
+          this.$message.warning('有包含物料的包件信息，请去除，在勾选！！！');
+          return;
         }
-        this.titleMaterial = "补充物料"
+        this.titleMaterial = '补充物料';
         this.materialBox = true;
       }
-
     },
-    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("11111",value);
+      console.log('11111', value);
     },
     delectsolt(scope) {
       const { row } = scope;
-      console.log("2222222",row);
+      console.log('2222222', row);
     },
     editsolt(scope) {
       const { row } = scope;
-      console.log("33333",row);
+      console.log('33333', row);
     },
     btnsc(index, row) {
-      console.log("4444444",index, row);
+      console.log('4444444', index, row);
     },
     selectsc(index, row) {
       console.log(index, row);
-      if(row.prop ==='orderPackageFreezeStatusName'){
+      if (row.prop === 'orderPackageFreezeStatusName') {
         this.queryPage['orderPackageFreezeStatus'] = index;
-      }else  if(row.prop ==='orderPackageReservationStatusName'){
+      } else if (row.prop === 'orderPackageReservationStatusName') {
         this.queryPage['orderPackageReservationStatus'] = index;
-      }else if(row.prop ==='orderPackageGroundingStatusName'){
+      } else if (row.prop === 'orderPackageGroundingStatusName') {
         this.queryPage['orderPackageGroundingStatus'] = index;
-      }else if(row.prop ==='orderPackageStockupStatusName'){
+      } else if (row.prop === 'orderPackageStockupStatusName') {
         this.queryPage['orderPackageStockupStatus'] = index;
-      }else if(row.prop ==='orderPackageStatusName'){
+      } else if (row.prop === 'orderPackageStatusName') {
         this.queryPage['orderPackageStatus'] = index;
-      }else{
+      } else {
         this.queryPage[row.prop] = index;
       }
       this.onLoadOwn(this.page);
     },
     timesc(index, row) {
       console.log(index, row);
-      if (!!index){
+      if (!!index) {
         index = dayjs(index).format('YYYY-MM-DD');
       }
-      this.queryPage[row.prop] =  index
-      if (!index){
-        delete this.queryPage[row.prop]
+      this.queryPage[row.prop] = index;
+      if (!index) {
+        delete this.queryPage[row.prop];
       }
       this.onLoadOwn(this.page);
     },
@@ -765,30 +811,30 @@ export default {
       this.queryPage[row.prop] = index;
       this.onLoadOwn(this.page);
     },
-    printTemplate(){
-      let lodop = getLodop();
-      // console.log("this.ids>>>>>",this.ids);
+    printTemplate() {
+      let LODOP = getLodop();
+      console.log("LODOP>>>>>",LODOP);
       // console.log("this.ids>>>>>",this.selectionList);
       // if (this.selectionList.length === 0){
       //   this.$message.warning("请选择至少一条数据");
       //   return;
       // }
-      getStockTemplate({id: this.materialQRCode.id }).then(res=>{
-        console.log("返回的数据",res.data.data);
+      getStockTemplate({ id: this.materialQRCode.id }).then(res => {
+        console.log('返回的数据', res.data.data);
         let templateData = res.data.data;
         // let templateData = "res.data.data";
         // console.log(templateData);
-        LODOP.PRINT_INITA(1,1,900,660,"测试预览功能");
-        LODOP.SET_PRINT_MODE("WINDOW_DEFPRINTER","Godex G500");
+        LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
+        LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
         // // 设置打印后自动关闭
-        LODOP.SET_PRINT_MODE("AUTO_CLOSE_PREWINDOW", 1);
+        LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
         // // data就是一段html文本
-        LODOP.ADD_PRINT_HTM("0%","0%","100%","100%",templateData);
+        LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
         LODOP.PREVIEW(); //预览(预览打印无脚标)
-      })
+      });
     },
     //提交物品数据
-    handleSubmitMethod(){
+    handleSubmitMethod() {
       // console.log(">>>",this.formMaterial);
 
       const regex = /^\d+$/;
@@ -796,74 +842,77 @@ export default {
       let asm = {
         // id: this.formMaterial.id,
         // materialId: this.formMaterial.materialId,
-      }
+      };
       if (regex.test(this.formMaterial.materialId)) {
         // console.log("全是数字");
-        asm.materialId =  this.formMaterial.materialId
+        asm.materialId = this.formMaterial.materialId;
       } else {
         // console.log("包含非数字字符");
         asm.materialId = this.formMaterial.materialCode;
       }
-      if(this.selectionList.length > 0){
-        this.selectionList.forEach(i =>{
+      if (this.selectionList.length > 0) {
+        this.selectionList.forEach(i => {
           id.push(i.id);
         });
-        console.log("shuju>>>>",this.selectionList.length);
-      }else{
+        console.log('shuju>>>>', this.selectionList.length);
+      } else {
         id.push(this.formMaterial.id);
       }
       asm.ids = id;
-      console.log(">>>",asm);
+      console.log('>>>', asm);
       updateParcelList(asm).then(() => {
         this.materialBox = false;
         this.onLoadOwn(this.page);
         this.$message({
-          type: "success",
-          message: "操作成功!"
+          type: 'success',
+          message: '操作成功!',
         });
         this.formMaterial = {};
-      })
-
+      });
     },
-    getMethodName(row,num){
+    getMethodName(row, num) {
       // console.log("名称选择事件",row);
       switch (num) {
         case '1':
-          let a = this.optionsName.find( i => i.id == row);
+          let a = this.optionsName.find(i => i.id == row);
           this.formMaterial.materialCode = a.productCode;
           this.formMaterial.materialUnit = a.logpmUnit;
           this.formMaterial.sku = a.sku;
           break;
         case '2':
-          let b = this.optionsCode.find( i => i.id == row);
+          let b = this.optionsCode.find(i => i.id == row);
           this.formMaterial.materialId = b.name;
           this.formMaterial.materialUnit = b.logpmUnit;
-          this.formMaterial.sku = b.sku ;
+          this.formMaterial.sku = b.sku;
           break;
       }
     },
 
-    async remoteMethodName (query){
+    async remoteMethodName(query) {
       if (query) {
         this.loading = true;
         //查询物料数据
-        let asd = await getListMaterial(this.page.currentPage,this.page.pageSize,{ name: query }).then();
-        console.log("物料信息",asd.data.data);
-        this.optionsName =asd.data.data.records;
+        let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, {
+          name: query,
+        }).then();
+        console.log('物料信息', asd.data.data);
+        this.optionsName = asd.data.data.records;
         this.loading = false;
       } else {
         this.optionsName = [];
       }
     },
-    async remoteMethodCode (query){
+    async remoteMethodCode(query) {
       if (query) {
-        this.loading = true
-        let asd = await getListMaterial(this.page.currentPage,this.page.pageSize,{ productCode: query }).then();
-        console.log("物料编号信息",asd.data.data);
-        this.optionsCode =asd.data.data.records;
+        this.loading = true;
+        let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, {
+          productCode: query,
+        }).then();
+        console.log('物料编号信息', asd.data.data);
+        this.optionsCode = asd.data.data.records;
         this.loading = false;
       } else {
-        this.optionsCode = []
+        this.optionsCode = [];
       }
     },
     /*handleMoke(){
@@ -881,7 +930,7 @@ export default {
         }
       });
     },*/
-   /* handleStockList(){
+    /* handleStockList(){
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
         return;
@@ -914,161 +963,162 @@ export default {
       //   });
     },*/
     //确定通知提货按钮
-    callFordelivery(inde){
+    callFordelivery(inde) {
       switch (inde) {
         case '1':
           console.log(this.formCall);
-          this.formCall.waybillNumber  = this.ids;
+          this.formCall.waybillNumber = this.ids;
           addCallDelivery(this.formCall).then(() => {
             this.$message({
-              type: "success",
-              message: "操作成功!"
+              type: 'success',
+              message: '操作成功!',
             });
             this.dialogFormVisible = false;
-            this.formCall={}
+            this.formCall = {};
           });
           break;
         case '2':
           // console.log("服务类型",this.formService);
-          addService(this.formService).then(() =>{
+          addService(this.formService).then(() => {
             this.$message({
-              type: "success",
-              message: "操作成功!"
+              type: 'success',
+              message: '操作成功!',
             });
             this.dialogFormService = false;
-            this.formService={}
-          })
+            this.formService = {};
+          });
           break;
         case '3':
           // console.log("客户信息！！！",this.formCustomer);
           this.formCustomer.stockArticleId = this.$route.query.id;
-          console.log("客户信息！！！",this.formCustomer);
-          addClient(this.formCustomer).then(() =>{
+          console.log('客户信息！！！', this.formCustomer);
+          addClient(this.formCustomer).then(() => {
             this.$message({
-              type: "success",
-              message: "操作成功!"
+              type: 'success',
+              message: '操作成功!',
             });
             this.dialogFormCustomer = false;
-            this.formCustomer={}
+            this.formCustomer = {};
             this.onLoad(this.page);
-          })
+          });
           break;
       }
     },
     //提货跳转
-    handlebill(row){
-      console.log(">>>>",this.ids);
+    handlebill(row) {
+      console.log('>>>>', this.ids);
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
       this.$router.push({
         path: '/distribution/inventory/distrilbutionBillLading',
-        query:{
+        query: {
           id: this.ids,
-
-
-        }
+        },
       });
     },
     //通知提货
-    handleCallDelivery(ind,row){
+    handleCallDelivery(ind, row) {
       switch (ind) {
-          case '1':
-            let ids = [];
-            this.selectionList.forEach(ele => {
-              ids.push(ele.orderCode);
-            });
-            this.formCall.waybill = ids;
-            this.dialogFormVisible = true;
-            break;
-            case '2':
-
-              this.dialogFormService = true;
-            break;
-            case '3':
-              this.dialogFormCustomer = true;
-              console.log("<><>",row);
-              this.formCustomer.name = row.customerName;
-              this.formCustomer.phone = row.customerTelephone;
-              this.formCustomer.address = row.customerAddress;
-            break;
+        case '1':
+          let ids = [];
+          this.selectionList.forEach(ele => {
+            ids.push(ele.orderCode);
+          });
+          this.formCall.waybill = ids;
+          this.dialogFormVisible = true;
+          break;
+        case '2':
+          this.dialogFormService = true;
+          break;
+        case '3':
+          this.dialogFormCustomer = true;
+          console.log('<><>', row);
+          this.formCustomer.name = row.customerName;
+          this.formCustomer.phone = row.customerTelephone;
+          this.formCustomer.address = row.customerAddress;
+          break;
       }
-
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 580);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
       });
-      getDictionaryBiz('logpm_unit').then(res => { //单位
+      getDictionaryBiz('logpm_unit').then(res => {
+        //单位
         this.logpmUnit = res.data.data;
       });
       getDictionaryBiz('order_package_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
-        this.checkcColumnList("orderPackageStatusName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });
+        this.checkcColumnList('orderPackageStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
       });
       getDictionaryBiz('order_package_grounding_status').then(res => {
-        this.checkcColumnList("orderPackageGroundingStatusName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });
+        this.checkcColumnList('orderPackageGroundingStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
       });
       getDictionaryBiz('order_package_freeze_status').then(res => {
-        this.checkcColumnList("orderPackageFreezeStatusName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });
+        this.checkcColumnList('orderPackageFreezeStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
       });
       getDictionaryBiz('order_package_stockup_status').then(res => {
-        this.checkcColumnList("orderPackageStockupStatusName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });
+        this.checkcColumnList('orderPackageStockupStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
       });
       getDictionaryBiz('order_package_reservation_status').then(res => {
-        this.checkcColumnList("orderPackageReservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });
+        this.checkcColumnList('orderPackageReservationStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
       });
-
     },
-    checkcColumnList(prop,columnList){
-      for(var a = 0; a < columnList.length; a++){
-        if(columnList[a].prop===prop){
-          console.log("1111111111111",columnList[a]);
+    checkcColumnList(prop, columnList) {
+      for (var a = 0; a < columnList.length; a++) {
+        if (columnList[a].prop === prop) {
+          console.log('1111111111111', columnList[a]);
           return columnList[a];
         }
       }
     },
-    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 {
@@ -1076,129 +1126,147 @@ 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 = {};
       this.query.typeService = '1';
       switch (index) {
-          case '1':
-            this.query.notification = index;
-            break;
-          case '2':
-            this.query.notification = index;
-            break;
+        case '1':
+          this.query.notification = index;
+          break;
+        case '2':
+          this.query.notification = index;
+          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;
       });
     },
-    handleMaterial(row){
-      console.log("row>>>",row);
-      this.titleMaterial = "补充物料"
+    handleMaterial(row) {
+      console.log('row>>>', row);
+      this.titleMaterial = '补充物料';
       this.materialBox = true;
       this.formMaterial.id = row.id;
     },
-    handleQRCode (row) {
+    allhandleQRCode(){
+      console.log(this.selectionList)
+      if(this.selectionList.length==0){
+        this.$message.error({message:'请先选择包件'})
+        return
+      }
+      let checkcode=[]
+      this.selectionList.map(item=>{
+        checkcode.push(item.id)
+        // checkcode.push(item.orderPackageCode)
+      })
+      // return
+      let qr = {
+        ids: checkcode.join(','),
+        // qrCodes: checkcode.join(','),
+      };
+      showOrderPackgeCode(qr).then(res => {
+        // this.orderPackageCode = res.data
+        console.log(res.data);
+        this.html=''
+        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+        
+      });
+
+      this.dialogVisible = true;
+    },
+    handleQRCode(row) {
       // this.title = '查看'
       // this.view = true;
       // this.box = true;
       this.materialQRCode = row;
- 
-      let qr ={
-        id : row.id,
-        qrCode: row.orderPackageCode
-      }
-      showOrderPackgeCode(qr).then(res => {
 
-        this.orderPackageCode = res.data
-        
-        this.arrs.map(item=>{
-			  let strhtml=JSON.parse(JSON.stringify(this.htmls))
-			  for(let key in item){
-				  strhtml=strhtml.replace(`{{${key}}}`,item[key])
-			  }
-			  console.log(strhtml);
-			  this.html+=strhtml
-		})
+      let qr = {
+        ids: row.id,
+      };
+      showOrderPackgeCode(qr).then(res => {
+        // this.orderPackageCode = res.data
+        console.log(res.data);
+        this.html=''
+        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
         
       });
 
       this.dialogVisible = true;
-
-
     },
-    handleTrajectory (row) {
-      console.log(">>>>",row);
-      this.$message.warning("暂无法显示！！！");
+    handleTrajectory(row) {
+      console.log('>>>>', row);
+      this.$message.warning('暂无法显示！！！');
       // this.title = '查看'
       // this.view = true;
       // this.box = true;
@@ -1207,15 +1275,15 @@ export default {
       //   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);
@@ -1224,16 +1292,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);
@@ -1241,33 +1309,33 @@ 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) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
       this.query.id = this.$route.query.id;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
@@ -1277,37 +1345,45 @@ export default {
         this.loading = false;
         this.selectionClear();
       });
-    } ,
-    onLoadOwn (page, params = {}) {
+    },
+    onLoadOwn(page, params = {}) {
       this.loading = true;
       this.dataMaterial = false;
-      params ={
-        stockArticleId : this.$route.query.id
-      }
-      getListOwn(page.currentPage, page.pageSize,  Object.assign(params, this.queryPage)).then(res => {
-        console.log("包件明细》》》》》",res.data.data);
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.dataPare = data.records;
-        this.dataPare.some( i =>{
-          if(i.conditions == '1'){
-            i.conditions = '定制品'
-          }else{
-            i.conditions = '库存品'
-          }
-          if(i.materialId == '' || i.materialId == '-1'){
-            //有
-            this.dataMaterial = true;
-          }
-        })
-        this.loading = false;
-        this.selectionClear();
-      });
-    }
-  }
+      params = {
+        stockArticleId: this.$route.query.id,
+      };
+      getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.queryPage)).then(
+        res => {
+          console.log('包件明细》》》》》', res.data.data);
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.dataPare = data.records;
+          this.dataPare.some(i => {
+            if (i.conditions == '1') {
+              i.conditions = '定制品';
+            } else {
+              i.conditions = '库存品';
+            }
+            if (i.materialId == '' || i.materialId == '-1') {
+              //有
+              this.dataMaterial = true;
+            }
+          });
+          this.loading = false;
+          this.selectionClear();
+        }
+      );
+    },
+  },
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
+.plck{
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  margin-bottom: 20px;
+}
 .el-button--text {
   margin-right: 15px;
 }
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 7fcc64f8..0b9bb353 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -198,13 +198,15 @@
             <el-form-item label="物品明细" prop="certificateType">
               <el-tabs type="border-card" style="width: 100%">
                 <el-tab-pane label="定制品">
+                  <el-button type="primary" link icon="el-icon-view" @click="handleAddOrder">新 增</el-button>
                   <el-table ref="table" v-loading="loading"
                             @selection-change="selectionChange"
                             :data="dataList"
                             style="width: 100%"
                             :border="option.border">
+                    <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center"></el-table-column>
+                    <template v-for="(item,index) in option.columnOrder">
 
-                    <template v-for="(item,index) in option.columnList">
                       <!-- table字段 -->
                       <el-table-column v-if="item.hide!==true"
                                        :prop="item.prop"
@@ -214,13 +216,13 @@
                       </el-table-column>
                     </template>
                     <!-- 操作栏模块 -->
-                    <!--                <el-table-column prop="menu" label="操作" :width="220" align="center">-->
-                    <!--                  <template #="{row}">-->
-                    <!--                    <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
-                    <!--                    <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
-                    <!--                    <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
-                    <!--                  </template>-->
-                    <!--                </el-table-column>-->
+                                    <el-table-column prop="menu"  fixed="right" label="操作" :width="220" align="center">
+                                      <template #="{row}">
+<!--                                        <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
+<!--                                        <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
+                                        <el-button type="primary" text icon="el-icon-delete" @click="rowOrder(row)">移除</el-button>
+                                      </template>
+                                    </el-table-column>
                   </el-table>
                 </el-tab-pane>
                 <el-tab-pane label="库存品">
@@ -264,7 +266,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="提货证件" prop="totalCost" label-width ='120px'>
+            <el-form-item label="提货证件"  label-width ='120px'>
               <el-upload
                 v-model:file-list="fileListSell"
                 class="upload-demo"
@@ -286,7 +288,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="文员确定图片" prop="totalCost" label-width ='120px'>
+            <el-form-item label="文员确定图片"  label-width ='120px'>
               <el-upload
                 v-model:file-list="fileListClerk"
                 class="upload-demo"
@@ -308,7 +310,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="库管签收图片" prop="totalCost" label-width ='120px'>
+            <el-form-item label="库管签收图片"  label-width ='120px'>
               <el-upload
                 v-model:file-list="fileListLibrary"
                 class="upload-demo"
@@ -390,6 +392,46 @@
       </span>
       </template>
     </el-dialog>
+    <el-dialog v-model="dialogFormOrderVisible" title="添加订单" style="width: 80%  ">
+
+      <tablecmt
+        ref="multipleTable"
+        :columnList="columnList"
+        :tableData="dataOrder"
+        :loading="loading"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @btnCheck="btnsc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+     <!--     <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>
+          <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
+        </template>
+      </tablecmt>
+      <div class="avue-crud__pagination" style="width:100%">
+        <!-- 分页模块 -->
+        <el-pagination align="right"
+                       background
+                       @size-change="sizeChangeStock"
+                       @current-change="currentChangeStock"
+                       :current-page="pageOrder.currentPage"
+                       :page-sizes="[10, 20, 30, 40, 50, 100]"
+                       :page-size="pageOrder.pageSize"
+                       layout="total, sizes, prev, pager, next, jumper"
+                       :total="pageOrder.total">
+        </el-pagination>
+      </div>
+
+      <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogFormOrderVisible = false">取消</el-button>
+        <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+        <el-button type="primary" @click="callFordeliveryOrder('1')"> 确定 </el-button>
+      </span>
+      </template>
+    </el-dialog>
 
   </basic-container>
 </template>
@@ -403,11 +445,13 @@ import { getDictionaryBiz } from '@/api/system/dict';
 import { getToken } from '@/utils/auth';
 import { getListStockList } from '@/api/distribution/distributionStockList';
 import { getListOne} from "@/api/distribution/distributionStockArticle";
+import dayjs from 'dayjs';
 
 export default {
   data () {
     return {
       dialogFormVisible: false,
+      dialogFormOrderVisible: false, //订单详细
       height: 0,
       // 弹框标题
       title: '',
@@ -416,17 +460,23 @@ export default {
       // 是否显示查询
       search: true,
       // 加载中
-      loading: true,
+      loading: false,
       // 是否为查看模式
       view: false,
       // 查询信息
       query: {},
+      dataOrder: [],
       // 分页信息
       page: {
         currentPage: 1,
         pageSize: 10,
         total: 40
       },
+      pageOrder: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
       // 分页信息
       pageStock: {
         currentPage: 1,
@@ -437,6 +487,7 @@ export default {
       form: {},
       // 选择行
       selectionList: [],
+      stockupDate: [], // 时间
       selectionListStock: [],// 库存品选择
       // 表单配置
       option: option,
@@ -485,8 +536,439 @@ export default {
         totalCost: [
           { required: true, message: '请输入费用合计', trigger: 'change' }
         ],
-
+        deliveryDocuments: [
+          { required: true, message: '请上传提货证件', trigger: 'change' }
+        ],
       },
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber ',
+          label: '运单号',
+          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,
+        },
+        {
+          prop: 'mallName',
+          label: '商场名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '货物名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'warehouse',
+          label: '所在仓库',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'warehouseEntryTime',
+          label: '入库时间',
+          type: 4,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'warehouseEntryTimeEnd',
+          label: '最新入库时间',
+          type: 4,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeTime',
+          label: '在库时间',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'totalNumber',
+          label: '订单总件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'consigneeUnit',
+          label: '收货单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'consigneePerson',
+          label: '收货人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'handQuantity',
+          label: '在库件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'availableQuantity',
+          label: '可用数量',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'notReceived',
+          label: '未入库数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },  {
+          prop: 'sortingQuantity',
+          label: '分拣数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },  {
+          prop: 'deliveryQuantity',
+          label: '配送数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'transferQuantity',
+          label: '中转数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'signinQuantity',
+          label: '签收数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'groundingStatusName',
+          label: '上架状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'allocation',
+          label: '货区-货位-货架',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'resource',
+          label: '订单来源',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'trays',
+          label: '所在托盘',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'freezeStatusName',
+          label: '冻结状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [
+            {
+              value: '1',
+              label: '已冻结',
+            },
+            {
+              value: '0',
+              label: '未冻结',
+            },
+          ],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'orderStatusName',
+          label: '订单状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'reservationStatusName',
+          label: '预约状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupStatusName',
+          label: '备货状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'completeSetName',
+          label: '是否齐套',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [
+            {
+              value: '2',
+              label: '是',
+            },
+            {
+              value: '1',
+              label: '否',
+            },
+          ],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'brand',
+        //   label: '品牌',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: 'typeServerName',
+        //   label: '服务类型',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'notification',
+          label: '通知状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [
+            {
+              value: '2',
+              label: '已通知',
+            },
+            {
+              value: '1',
+              label: '未通知',
+            },
+          ],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'customerName',
+          label: '顾客名字',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'customerTelephone',
+          label: '顾客电话',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'customerAddress',
+          label: '顾客地址',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'fee',
+          label: '增值服务',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'createUserName',
+          label: '创建人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'createTime',
+          label: '创建时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'inventoryDate',
+        //   label: '最新盘点时间',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // }, {
+        //   prop: 'inventoryPerson',
+        //   label: '盘点人',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: '',
+        //   label: '操作',
+        //   type: 6,
+        //   values: '',
+        //   width: '230',
+        //   checkarr: [],
+        //   fixed: 'right',
+        //   hide: true,
+        // },
+        // 更多列的配置...
+      ],
+      columnListedit: [],
     }
   },
   mounted () {
@@ -498,6 +980,81 @@ export default {
     }else{
       this.onLoad(this.page);
     }
+    /**
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+      // let checkList=[]
+      // this.columnList.map(item => {
+      //     item.head = false;
+      // });
+    let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
+    let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
+    let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
+    if (checkListnewarr) {
+      this.columnList.map(item => {
+        item.head = false;
+      });
+      checkListnewarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            item.head = true;
+          }
+        });
+      });
+    }else{
+      let arr=[]
+      this.columnList.map(item => {
+        if(item.head){
+          arr.push(item.label)
+        }
+      });
+      this.$functions.setStorage(window.location.pathname+'checkList',arr)
+    }
+    if (flexListnewarr) {
+      this.columnList.map(item => {
+        item.fixed = false;
+      });
+      flexListnewarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            if(item.type==6){
+              item.fixed = 'right';
+            }else{
+              item.fixed = true;
+            }
+          }
+        });
+      });
+    }else{
+      let arr=[]
+      this.columnList.map(item => {
+        if(item.fixed){
+          arr.push(item.label)
+        }
+      });
+      this.$functions.setStorage(window.location.pathname+'flexList',arr)
+    }
+    if (sortlistnewarr) {
+      this.columnList.map(item => {
+        item.sortable = false;
+      });
+      sortlistnewarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            item.sortable = true;
+          }
+        });
+      });
+    }else{
+      let arr=[]
+      this.columnList.map(item => {
+        if(item.sortable){
+          arr.push(item.label)
+        }
+      });
+      this.$functions.setStorage(window.location.pathname+'sortlist',arr)
+    }
   },
   watch:{
     '$route.query.id':{
@@ -508,7 +1065,7 @@ export default {
           this.getDetailOen();
         }else{
           this.onLoad(this.page);
-          this.onLoadOwn(this.page);
+          // this.onLoadOwn(this.page);
         }
       },
       deep: true,
@@ -542,6 +1099,78 @@ export default {
     }
   },
   methods: {
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+    setnewcolum(newarr, headarr,type) {
+      // console.log(newarr,'+++++++++++')
+      if(type==1){
+        this.columnList = newarr;
+        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.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+      }
+
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log(index, row);
+      if(row.prop ==='freezeStatusName'){
+        this.query['freezeStatus'] = index;
+      }else if(row.prop ==='completeSetName'){
+        this.query['completeSet'] = index;
+      }else if(row.prop ==='reservationStatusName'){
+        this.query['reservationStatus'] = index;
+      }else if(row.prop ==='groundingStatusName'){
+        this.query['groundingStatus'] = index;
+      }else if(row.prop ==='stockupStatusName'){
+        this.query['stockupStatus'] = index;
+      }else if(row.prop ==='orderStatusName'){
+        this.query['orderStatus'] = index;
+      }else if(row.prop ==='typeName'){
+        this.query['typeService'] = index;
+      }else{
+        this.query[row.prop] = index;
+      }
+      this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+      if (!!index){
+        index = dayjs(index).format('YYYY-MM-DD');
+      }
+      this.query[row.prop] =  index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
+    },
     //查询提货详情信息
     getDetailOen(){
       getDetail(this.$route.query.id).then(res =>{
@@ -615,6 +1244,57 @@ export default {
       })
       this.data.splice(id1, 1)
 
+    },
+    //移除数据
+    rowOrder (row) {
+      console.log(">>?>?><?",row);
+      this.dataList.forEach( i =>{
+        if(i.id === row.id){
+          this.dataList
+        }
+      })
+      let id1 = this.dataList.findIndex(item => {
+        if (item.id == row.id) {
+          return true
+        }
+      })
+      this.dataList.splice(id1, 1)
+    },
+    //订单选择确定
+    callFordeliveryOrder(){
+      let st = false;
+      let sts = false;
+      let consigneePerson = '';
+      let consigneeMobile = '';
+      this.selectionList.some( i =>{
+        if(i.reservationStatusName === "已预约"){ st = true; this.$message.warning(i.orderCode+"已预约，请勿重复预约！！！"); }
+        if(!consigneePerson && !consigneeMobile){
+          consigneeMobile = i.consigneeMobile;
+          consigneePerson = i.consigneePerson;
+        }else{
+          if(consigneeMobile != i.consigneeMobile && consigneePerson != i.consigneePerson ){ sts = true; }
+        }
+      })
+      if(st){
+        return ;
+      }
+      if(sts){
+        this.$message.warning("收货人不相同，请选择相同的收货人！！！");
+        return ;
+      }
+
+      let isa= false;
+      this.selectionList.some( i =>{
+        let a = this.dataList.filter((ele) => ele.id == i.id ).length >= 1
+        // console.log("asdgfasdv",a);
+        if(!a){
+          this.dataList.push(i);
+        }
+      })
+      if(!isa){
+        this.dialogFormOrderVisible = false;
+      }
+
     },
     //确定
     callFordelivery(inde){
@@ -702,6 +1382,58 @@ export default {
       getDictionaryBiz('certificate_type').then(res => {
         this.certificateType = res.data.data;
       });
+      getDictionaryBiz('distribution_type').then(res => {
+        this.distributionType = res.data.data;
+      });
+      getDictionaryBiz('logpm_unit').then(res => { //单位
+        this.logpmUnit = res.data.data;
+      });
+      getDictionaryBiz('order_status').then(res => {
+        this.deliveryOrderStatus = res.data.data;
+        this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('basic_grounding').then(res => {
+        this.checkcColumnList("groundingStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('freeze_status').then(res => {
+        this.checkcColumnList("freezeStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+      getDictionaryBiz('stockup_status').then(res => {
+        this.checkcColumnList("stockupStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+
+      });
+      getDictionaryBiz('order_reservation_status').then(res => {
+        this.checkcColumnList("reservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+
+    },
+    checkcColumnList(prop,columnList){
+      for(var a = 0; a < columnList.length; a++){
+        if(columnList[a].prop===prop){
+          console.log("1111111111111",columnList[a]);
+          return columnList[a];
+        }
+      }
     },
     searchHide () {
       this.search = !this.search;
@@ -741,10 +1473,11 @@ export default {
        this.$refs.form.validate( async valid=>{
          if (valid) {
            if (!this.form.id) {
+             if(this.fileListSell.length === 0) {this.$message.warning("请上传提货证件！！！"); return;}
              let fei = new Map();
              await this.bianLier(this.costListName,this.clientType,this.costList,fei);
              this.form.fei = Object.fromEntries(fei);
-             this.form.stockArticleId = this.$route.query.id;
+             this.form.stockArticleId = !this.$route.query.id ? null : this.$route.query.id; //订单ID
              this.form.stockDTOList = this.data;
              let o = [];
              if(this.fileListClerk.length > 0){
@@ -780,8 +1513,16 @@ export default {
                });
              }
              this.form.printList = o.length > 0 ? o : [];
+             if(this.dataList.length === 0 && this.data.length === 0 ){
+               this.$message.warning("请填写需要自提的物品！！");
+             }
+             if(this.dataList.length > 0){
+               let a = this.dataList.map(i =>i.id);
+               console.log("aaaaa",a);
+               this.form.stockArticleId =  this.form.stockArticleId != null ? this.form.stockArticleId+a.join(',') :  a.join(',');
+             }
 
-             // console.log("this.form",this.form);
+             console.log("this.form",this.form);
              add(this.form).then(() => {
                this.box = false;
                this.onLoad(this.page);
@@ -893,7 +1634,75 @@ export default {
         this.form = res.data.data;
       });
     },
+    //查询自提订单
+    handleAddOrder(){
+      this.selectionList = [];
+      this.dialogFormOrderVisible = true;
+      //查询自提订单
+      this.onLoadOrder(this.pageOrder);
+    },
+    toggleSelection(rows) {
+      if (rows) {
+        rows.forEach(row => {
+          this.$refs.multipleTable.toggleRowSelection(row);
+        });
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    onLoadOrder (page, params = {}) {
+      this.loading = true;
+      if(this.stockupDate.length > 0){
+        let startDate = this.stockupDate[0];
+        let entDate = this.stockupDate[1];
+        params.startDate = this.getTime(startDate.toString());
+        params.entDate = this.getTime(entDate.toString());
+      }
+      params.genre = 1;
+      params.typeService = 3;
+      getListOne(page.currentPage, page.pageSize, Object.assign(params)).then(res => {
+        const data = res.data.data;
+        console.log(">>>>>>>",data.records);
+        this.pageOrder.total = data.total;
+        this.dataOrder = data.records;
+        this.dataOrder = this.dataOrder.map(i => {
+          const notificationMap = {
+            '1': "已通知",
+            '2': "未通知",
+            default: "无"
+          };
+          const nuMap = {
+            '-1': "0"
+          };
+          i.notification = notificationMap[i.notification] || notificationMap.default;
+          i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
+          i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
+          i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
+          i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
+          i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
+          i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
+          i.notReceived = parseInt( i.totalNumber) - parseInt( i.handQuantity );
+          return i;
+        });
+        this.dataOrder.forEach(i =>{
+         let asas =  this.dataList.find( l => l.id == i.id);
+         if(!!asas){
+           console.log("存在的数据》》》",asas);
+           this.selectionList.push(i.id);
+
+         }
+
+        })
+        this.$nextTick(() => {
+          this.toggleSelection(this.selectionList)
+        })
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    //库存品
     handleAddView (row) {
+      this.selectionList = [];
       this.dialogFormVisible = true;
       this.onLoadList(this.pageStock);
     },
@@ -975,14 +1784,18 @@ export default {
     },
 
     onLoad (page, params = {}) {
-      this.loading = true;
-      params.id = this.$route.query.id;
-      getListOne(page.currentPage, page.pageSize, params).then(res => {
-        const data = res.data.data;
-        console.log(">>>>>>>>>===",data);
-        this.loading = false;
-        this.selectionClear();
-      });
+      // this.loading = true;
+      // params.id = this.$route.query.id;
+      // getListOne(page.currentPage, page.pageSize, params).then(res => {
+      //   const data = res.data.data;
+      //   console.log("订单详细>>>>>>>>>===",data);
+      //
+      //
+      //
+      //
+      //   this.loading = false;
+      //   this.selectionClear();
+      // });
     } ,
     //库存品
     onLoadList (page, params = {}) {
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index f3ac8d0d..eab47302 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -3,12 +3,57 @@
     <div class="avue-crud" >
       <el-row>
         <el-col :span="5">
-          <span style="margin-bottom: 2%;font-size: 20px"> 已通知：500单/1000件 </span>
+          <span style="margin-bottom: 2%;font-size: 20px"> 待提货：{{page.total}}单/{{page.total}}件 </span>
         </el-col>
         <el-col :span="10">
-          <span style="margin-bottom: 2%;font-size: 20px">  未通知：500单/1000件</span>
+          <span style="margin-bottom: 2%;font-size: 20px">  已提货：{{page.total}}单/{{page.total}}件</span>
         </el-col>
-
+      </el-row>
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <el-form-item label="订单自编号:">
+            <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
+          </el-form-item>
+          <el-form-item label="入库时间:">
+            <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
+            <el-date-picker
+              v-model="stockupDate"
+              type="datetimerange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+            />
+          </el-form-item>
+          <!--         <el-form-item label="货物名称:">
+                     <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
+                   </el-form-item>
+                   <el-form-item label="仓库:">
+                     <el-input v-model="query.warehouse" placeholder="请输入仓库"></el-input>
+                   </el-form-item>
+                   <el-form-item label="是否齐套:">
+                     <el-input v-model="query.completeSet" placeholder="请输入是否齐套"></el-input>
+                   </el-form-item>
+                   <el-form-item label="品牌:">
+                     <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
+                   </el-form-item>
+                   <el-form-item label="服务类型:">
+                     <el-input v-model="query.typeService" placeholder="请输入服务类型"></el-input>
+                   </el-form-item>-->
+          <!--          <el-form-item label="类型;1 预约单  2库存单:">-->
+          <!--            <el-input v-model="query.genre" placeholder="请输入类型;1 预约单  2库存单"></el-input>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="状态;1 配送 2 待配送:">-->
+          <!--            <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></el-input>-->
+          <!--          </el-form-item>-->
+          <!-- 查询按钮 -->
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+          </el-form-item>
+        </el-form>
       </el-row>
 
       <!--<el-row :hidden="!search" style="padding:6px 18px">
@@ -33,6 +78,7 @@
           <div class="avue-crud__left">
            <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
+            <el-button type="primary" icon="el-icon-plus" @click="handleBillAdd">创建自提</el-button>
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">自提签收</el-button>
 
           </div>
@@ -57,10 +103,11 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>
-            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"
-              >删除</el-button
-            >
+<!--            <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
+            <el-button size="small" @click="handleLike(slotProps.scope)">查看</el-button>
+            <el-button type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)">编辑提货信息</el-button>
+            <el-button size="small" type="danger" icon="el-icon-edit" text @click="delectsolt(slotProps.scope)">删除</el-button>
+            <el-button size="small" type="danger" icon="el-icon-edit" text @click="delectsolt(slotProps.scope)">签收</el-button>
           </template>
         </tablecmt>
       </el-row>
@@ -584,6 +631,7 @@ export default {
       view: false,
       // 查询信息
       query: {},
+      stockupDate:[],
       // 分页信息
       page: {
         currentPage: 1,
@@ -603,6 +651,35 @@ export default {
       distributionType: [],
       costListName: [],
       certificateType: [],
+      shortcuts :[
+        {
+          text: '最近一周',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            return [start, end]
+          },
+        },
+        {
+          text: '最近一个月',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            return [start, end]
+          },
+        },
+        {
+          text: '最近三个月',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            return [start, end]
+          },
+        },
+      ]
 
     }
   },
@@ -666,7 +743,7 @@ export default {
         this.columnList = newarr;
         this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
       }
-      
+
     },
     selectionsc(value) {
       console.log(value);
@@ -761,6 +838,7 @@ export default {
     },
     searchReset () {
       this.query = {};
+      this.stockupDate = [];
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
@@ -784,7 +862,6 @@ export default {
 
           }
         }
-
       }
     },
      async handleSubmit () {
@@ -821,6 +898,33 @@ export default {
       this.form = {}
       this.box = true
     },
+    handleBillAdd () {
+      this.$router.push({
+        path: '/distribution/inventory/distrilbutionBillLading',
+        query:{
+          type: '1'
+        }
+      });
+    },
+    //查询详细
+    handleLike(){
+      this.$message.warning("!!!");
+    },
+    handleEdits (row) {
+      // this.title = '编辑'
+      // this.box = true
+      // getDetail(row.id).then(res => {
+      //   this.form = res.data.data;
+      // });
+      this.$router.push({
+        path: '/distribution/inventory/distrilbutionBillLading',
+        query:{
+          id: row.row.id,
+          name: '编辑提货单',
+          type: '2'
+        }
+      });
+    },
     handleEdit (row) {
       this.title = '编辑'
       this.box = true
@@ -897,6 +1001,12 @@ export default {
     },
     onLoad (page, params = {}) {
       this.loading = true;
+      if(this.stockupDate.length > 0){
+        let startDate = this.stockupDate[0];
+        let entDate = this.stockupDate[1];
+        params.startDate = this.getTime(startDate.toString());
+        params.entDate = this.getTime(entDate.toString());
+      }
       getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         console.log("???????",data);
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index 86b307ff..4da16469 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -264,7 +264,7 @@ export default {
         },
         {
           prop: 'stockupUser',
-          label: '备货人',
+          label: '操作人',
           type: 2,
           values: '',
           width: '150',
@@ -279,22 +279,22 @@ export default {
           values: '',
           width: '180',
           checkarr: [
-            {
-              label: '未备货',
-              value: '1',
-            },
-            {
-              label: '待备货',
-              value: '2',
-            },
-            {
-              label: '备货中',
-              value: '3',
-            },
-            {
-              label: '已备货',
-              value: '4',
-            },
+            // {
+            //   label: '未备货',
+            //   value: '1',
+            // },
+            // {
+            //   label: '待备货',
+            //   value: '2',
+            // },
+            // {
+            //   label: '备货中',
+            //   value: '3',
+            // },
+            // {
+            //   label: '已备货',
+            //   value: '4',
+            // },
           ],
           fixed: false,
           sortable: true,
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index 7b0f07ba..d630a1d1 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -291,16 +291,16 @@ export default {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'stockupUser',
-          label: '备货人',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'stockupUser',
+        //   label: '操作人',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'stockupStatusName',
           label: '备货状态',
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index 15ddd1ef..50206ab5 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -273,16 +273,16 @@ export default {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'stockupUser',
-          label: '备货人',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'stockupUser',
+        //   label: '备货人',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'stockupStatusName',
           label: '备货状态',
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index 5568826a..55864091 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -72,11 +72,11 @@
 <!--              </el-icon>-->
 <!--            </el-button>-->
 <!--            <div v-if="bianjiKz"  class="bianji">-->
-              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑提货信息</el-button>
+<!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑提货信息</el-button>-->
               <el-button type="primary" text icon="el-icon-edit" @click="handleBeiHuo(slotProps.scope)">编辑备货信息</el-button>
 <!--            </div>-->
 <!--            <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
-            <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">打印</el-button>
+            <el-button type="primary" text icon="el-icon-edit" @click="handlePrint(slotProps.scope)">打印</el-button>
           </template>
         </tablecmt>
       </el-row>
@@ -263,16 +263,16 @@ export default {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'stockupUser',
-          label: '备货人',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'stockupUser',
+        //   label: '备货人',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'pickUpTime',
           label: '备货时间',
@@ -882,6 +882,9 @@ export default {
         })
       }
     },
+    handlePrint(row){
+      this.$message.warning("！！！");
+    },
     handleAdd () {
       this.title = '新增'
       this.form = {}
diff --git a/vite.config.js b/vite.config.js
index 4c8aa969..0bc800de 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -12,7 +12,7 @@ export default ({ mode, command }) => {
       port: 2888,
       proxy: {
         '/api': {
-          target: 'http://192.168.10.200:8888',
+          target: 'http://192.168.10.75:8777',
           //target: 'http://test3.javablade.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),