diff --git a/src/api/basicdata/basicdataGoodsArea.js b/src/api/basicdata/basicdataGoodsArea.js
index a8e278bb..ff2aa322 100644
--- a/src/api/basicdata/basicdataGoodsArea.js
+++ b/src/api/basicdata/basicdataGoodsArea.js
@@ -41,6 +41,24 @@ export const remove = (ids) => {
     }
   })
 }
+export const disable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsArea/disable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+export const enable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsArea/enable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
 
 export const add = (row) => {
   return request({
diff --git a/src/api/basicdata/basicdataGoodsShelf.js b/src/api/basicdata/basicdataGoodsShelf.js
index 765e3b1c..4208c9d1 100644
--- a/src/api/basicdata/basicdataGoodsShelf.js
+++ b/src/api/basicdata/basicdataGoodsShelf.js
@@ -31,6 +31,24 @@ export const remove = (ids) => {
     }
   })
 }
+export const disable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsShelf/disable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+export const enable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsShelf/enable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
 
 export const add = (row) => {
   return request({
diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js
index 374eb33d..a3f8915b 100644
--- a/src/api/distribution/distributionStockArticle.js
+++ b/src/api/distribution/distributionStockArticle.js
@@ -11,6 +11,17 @@ export const getList = (current, size, params) => {
     }
   })
 }
+export const getListStockArticleWhole = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockArticle/listWhole',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
 
 /**
  * 查询客户的订单列表
@@ -213,7 +224,7 @@ export const selectDiscussStockArticleInfoList = (current, size, params,delivery
   })
 }
 
-export const selectUpdateAvailableStockArticle = (current, size,params) => {
+export const selectUpdateAvailableStockArticle = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/reservation/selectUpdateAvailableStockArticle',
     method: 'get',
diff --git a/src/option/basicdata/basicdataGoodsArea.js b/src/option/basicdata/basicdataGoodsArea.js
index 4d8d94de..50ffc6e4 100644
--- a/src/option/basicdata/basicdataGoodsArea.js
+++ b/src/option/basicdata/basicdataGoodsArea.js
@@ -57,16 +57,10 @@ export default {
       label: "货区名称",
       prop: "headline",
     },
-    {
-      label: "创建人名称",
-      prop: "createUserName",
-      display: false,
-      hide: true,
-    },
     {
       label: "货区状态",
       prop: "enableStatus",
-      hide:true,
+      hide:false,
     },
     // {
     //   label: "预留1",
diff --git a/src/option/basicdata/basicdataGoodsShelf.js b/src/option/basicdata/basicdataGoodsShelf.js
index b91b32c4..9c664b36 100644
--- a/src/option/basicdata/basicdataGoodsShelf.js
+++ b/src/option/basicdata/basicdataGoodsShelf.js
@@ -117,7 +117,7 @@ export default {
     {
       label: "启用状态",
       prop: "enableStatus",
-      hide:true,
+      hide:false,
     },
     // {
     //   label: "货位名称",
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 45617fcc..782e14b3 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -908,6 +908,24 @@ export default [
       },
     ],
   },
+  {
+    path: '/basicdata/team/basicdataTeamStaff',
+    component: Layout,
+    redirect: '/team/basicdataTeamStaffl',
+    children: [
+      {
+        path: '/basicdata/team/basicdataTeamStaff',
+        name: '班组列表',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          id: route.query.id
+        }),
+        component: () => import('@/views/basicdata/team/basicdataTeamStaff.vue'),
+      },
+    ],
+  },
   // {
   //   path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
   //   component: Layout,
diff --git a/src/views/basicdata/team/basicdataTeamGroup.vue b/src/views/basicdata/team/basicdataTeamGroup.vue
index 72898c0e..b4ffeb73 100644
--- a/src/views/basicdata/team/basicdataTeamGroup.vue
+++ b/src/views/basicdata/team/basicdataTeamGroup.vue
@@ -41,7 +41,7 @@
                   :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="50" align="center">
+          <el-table-column v-if="option.index" label="序号" type="index" width="70" align="center">
           </el-table-column>
           <template v-for="(item,index) in option.column">
             <!-- table字段 -->
@@ -56,6 +56,7 @@
           <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-view" @click="handleList(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>
@@ -330,6 +331,20 @@ export default {
        }
 
     },
+    //人员列表
+    handleList(row){
+
+      console.log("班组信息",row);
+      this.$router.push({
+        path: '/basicdata/team/basicdataTeamStaff',
+        query: {
+          id: row.id,
+          name: '班组人员 - ' + row.groupName,
+          type: '2'
+        }
+      });
+
+    },
    async handleEdit (row) {
       //查询仓库信息
       await this.getWarehouseList();
diff --git a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
index 32f1e190..3db46012 100644
--- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
+++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
@@ -53,6 +53,8 @@
           <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="danger" icon="el-icon-delete" @click="handleDisable" plain>禁 用</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleEnable" plain>启 用</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -102,7 +104,9 @@
               <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
               <el-button type="primary" text icon="el-icon-view" @click="handleExport(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>
+              <el-button type="primary" text icon="el-icon-delete"   @click="rowDel(row)">删除</el-button>
+<!--              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='启用'"  @click="rowDis(row)">禁用</el-button>-->
+<!--              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='禁用'" @click="rowEna(row)">启用</el-button>-->
             </template>
           </el-table-column>
         </el-table>
@@ -182,18 +186,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
-           <el-col :span="12">
-             <el-form-item label="仓库:" prop="warehouseId" v-if="isShow" label-width="110px">
-               <el-select v-model="form.warehouseId" filterable  placeholder="请选择仓库" style="width: 70%" >
-                 <el-option
-                         v-for="item in allWarehouse"
-                         :key="item.id"
-                         :label="item.name"
-                         :value="item.id">
-                 </el-option>
-               </el-select>
-             </el-form-item>
-           </el-col>
+<!--           <el-col :span="12">-->
+<!--             <el-form-item label="仓库:" prop="warehouseId" v-if="isShow" label-width="110px">-->
+<!--               <el-select v-model="form.warehouseId" filterable  placeholder="请选择仓库" style="width: 70%" >-->
+<!--                 <el-option-->
+<!--                         v-for="item in allWarehouse"-->
+<!--                         :key="item.id"-->
+<!--                         :label="item.name"-->
+<!--                         :value="item.id">-->
+<!--                 </el-option>-->
+<!--               </el-select>-->
+<!--             </el-form-item>-->
+<!--           </el-col>-->
           </el-row>
         </el-form>
         <!-- 表单按钮 -->
@@ -209,7 +213,7 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/basicdata/basicdataGoodsArea";
+import { getList, getDetail, add, update, remove,enable ,disable} from "@/api/basicdata/basicdataGoodsArea";
 import option from "@/option/basicdata/basicdataGoodsArea";
 import { mapGetters } from "vuex";
 import {getDictionaryBiz} from '@/api/system/dict';
@@ -279,12 +283,9 @@ export default {
   },
   created() {
     this.getListInfo();
-
-
   },
   mounted () {
     this.init();
-    this.onLoad(this.page);
   },
   computed: {
     ...mapGetters(["permission"]),
@@ -308,6 +309,7 @@ export default {
 
       getDictionaryBiz( 'enable_status').then(res => {
         this.enableStatus = res.data.data;
+        this.onLoad(this.page);
       });
       //仓库列表信息
       getWarehouseList().then(res=>{
@@ -430,7 +432,7 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
+      this.$confirm("确定将选择仓库删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -447,6 +449,50 @@ export default {
           });
         });
     },
+    handleDisable () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择仓库禁用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return disable(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    handleEnable () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择仓库启用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return enable(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
     rowDel (row) {
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
@@ -464,6 +510,40 @@ export default {
           });
         });
     },
+    rowDis (row) {
+      this.$confirm("确定将选择仓库禁用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return disable(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    rowEna (row) {
+      this.$confirm("确定将选择仓库启用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return enable(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
     beforeClose (done) {
       done()
       this.form = {};
@@ -490,25 +570,26 @@ export default {
         const data = res.data.data;
         data.records.forEach(item=>{
           //货区状态字典值回显
-          // this.enableStatus.forEach(status=>{
-          //   status.dictKey = parseInt(status.dictKey);
-          //   if (item.enableStatus === status.dictKey){
-          //     item.enableStatus = status.dictValue;
-          //   }
-          // })
-          console.log(">>>>>>>",item);
-          if (item.enableStatus===1)
-            item.enableState =true;
-            else
-              item.enableState=false;
-
-          //是否备货区区状态字典值回显
-          this.areaTypeData.forEach(areaType=>{
-            areaType.dictKey = parseInt(areaType.dictKey);
-            if (item.areaType === areaType.dictKey){
-              item.areaType = areaType.dictValue;
+          this.enableStatus.forEach(status=>{
+            if (item.enableStatus == status.dictKey){
+              item.enableStatus = status.dictValue;
             }
+            console.log("item.enableStatus>>>>>",item.enableStatus);
+            console.log(" status.dictKey>>>>>", status.dictKey);
           })
+
+          // if (item.enableStatus===1)
+          //   item.enableState =true;
+          //   else
+          //     item.enableState=false;
+
+          //是否备货区区状态字典值回显
+          // this.areaTypeData.forEach(areaType=>{
+          //   areaType.dictKey = parseInt(areaType.dictKey);
+          //   if (item.areaType === areaType.dictKey){
+          //     item.areaType = areaType.dictValue;
+          //   }
+          // })
         })
         this.page.total = data.total;
         this.data = data.records;
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index 13d9dba8..17e23bc1 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -51,6 +51,8 @@
           <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="danger" icon="el-icon-delete" @click="handleDisable" plain>禁 用</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleEnable" plain>启 用</el-button>
             <!--            <el-button type="danger" icon="el-icon-delete" @click="aaa" plain>导出二维码</el-button>-->
             <!--            <el-button type="danger" icon="el-icon-delete" @click="viewQrCode" plain>查看二维码</el-button>-->
 
@@ -105,6 +107,8 @@
               <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
               <el-button type="primary" text icon="el-icon-edit" @click="addAllocation(row)">编 辑 货 位</el-button>
               <el-button type="primary" text icon="el-icon-edit" @click="locationList(row)">货 位 列 表</el-button>
+<!--              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='启用'"  @click="rowDis(row)">禁用</el-button>-->
+<!--              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='禁用'" @click="rowEna(row)">启用</el-button>-->
               <!--              <el-button type="primary" text icon="el-icon-edit" @click="enableStatus(row)">-->
               <!--                <span v-if="row.enableStatus === '启用'">禁用</span>-->
               <!--                <span v-else>启用</span>-->
@@ -144,31 +148,31 @@
           <!-- 表单字段 -->
 
           <el-row>
-            <el-col :span="12" v-if="idShowStatus && !allocation" >
-              <el-form-item label="启用状态:"  prop="enableStatus" label-width="100px" >
-                <!--            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>-->
-                <el-select v-model="form.enableStatus" clearable  placeholder="请选择货区状态"  style="width: 88%" >
-                  <el-option
-                    v-for="item in enableStatusData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12"  v-if="idShowStatus && !allocation" >
-              <el-form-item label="货架状态:" prop="goodsShelfStatus" label-width="100px" >
-                <el-select v-model="form.goodsShelfStatus" clearable  placeholder="请选择货架状态"  style="width: 88%" >
-                  <el-option
-                    v-for="item in goodsShelfStatusData"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="12" v-if="idShowStatus && !allocation" >-->
+<!--              <el-form-item label="启用状态:"  prop="enableStatus" label-width="100px" >-->
+<!--                &lt;!&ndash;            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>&ndash;&gt;-->
+<!--                <el-select v-model="form.enableStatus" clearable  placeholder="请选择货区状态"  style="width: 88%" >-->
+<!--                  <el-option-->
+<!--                    v-for="item in enableStatusData"-->
+<!--                    :key="item.dictKey"-->
+<!--                    :label="item.dictValue"-->
+<!--                    :value="item.dictKey">-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12"  v-if="idShowStatus && !allocation" >-->
+<!--              <el-form-item label="货架状态:" prop="goodsShelfStatus" label-width="100px" >-->
+<!--                <el-select v-model="form.goodsShelfStatus" clearable  placeholder="请选择货架状态"  style="width: 88%" >-->
+<!--                  <el-option-->
+<!--                    v-for="item in goodsShelfStatusData"-->
+<!--                    :key="item.dictKey"-->
+<!--                    :label="item.dictValue"-->
+<!--                    :value="item.dictKey">-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="12" v-if="!allocation">
               <el-form-item label="货架名称:" prop="goodsShelfName"  label-width="100px" >
                 <el-input v-model="form.goodsShelfName" placeholder="请输入货架名称" style="width: 88%;"/>
@@ -300,7 +304,7 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,getPrintTemplate,addAllocation } from "@/api/basicdata/basicdataGoodsShelf";
+import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,getPrintTemplate,addAllocation,disable,enable } from "@/api/basicdata/basicdataGoodsShelf";
 import {getList as allgetList,update as allupdate} from "@/api/basicdata/basicdataGoodsAllocation";
 import option from "@/option/basicdata/basicdataGoodsShelf";
 import { mapGetters } from "vuex";
@@ -399,7 +403,7 @@ export default {
             type: "cascader",
             labelWidth:'100',
             clearable:true,
-            placeholder:'仓库/货区/货架',
+            placeholder:'仓库/货区',
             dicUrl: '/api/logpm-basicdata/goodsAllocation/getNode',
             // dicData:dicData ,
             props: {
@@ -619,12 +623,8 @@ export default {
         this.goodsShelfStatusData = res.data.data;
       });
       getGoodsAreaNodeList().then(res=>{
-        console.log("res>>>>>>>>>>>>>>",res);
-
         const data = this.formatCascaderData(res.data.data);
-        console.log("data>>>>>>>>>>>>>>",data);
         this.optioner = data
-        console.log(">>>>>>>>>>>>>>>>optioner",this.optioner);
       })
       getTemplateData("9").then(res=>{
         console.log(res.data.data);
@@ -812,7 +812,7 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
+      this.$confirm("确定将选择货架删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -829,6 +829,84 @@ export default {
           });
         });
     },
+    handleDisable () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据禁用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return disable(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    handleEnable () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择货架启用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return enable(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    rowDis (row) {
+      this.$confirm("确定将选择货架禁用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return disable(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    rowEna (row) {
+      this.$confirm("确定将选择货架启用?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return enable(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
     //结合模板生成二维码
     viewQrCode(){
       if (this.selectionList.length === 0) {
@@ -968,14 +1046,14 @@ export default {
         }
         Object.assign(this.query,ids)
       }
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query )).then(res=>{
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res=>{
         const data = res.data.data;
         console.log(">>>>>",data);
         data.records.forEach((item,index)=>{
-          if (item.enableStatus===1){
-            item.enableState=true;
+          if (item.enableStatus==1){
+            item.enableStatus='启用';
           }else {
-            item.enableState=false;
+            item.enableStatus='禁用';
           }
           this.goodsShelfStatusData.forEach(goodsShelfStatus=>{
             if (item.goodsShelfStatus === goodsShelfStatus.sort){
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 4cd37000..62b48801 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -346,7 +346,7 @@ export default {
         },
         {
           prop: 'typeName',
-          label: '配送种类',
+          label: '配送类型',
           type: 1,
           values: '',
           width: '180',
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 8b8a3747..c3c2ce93 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -70,43 +70,43 @@
                 </el-col>
             </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"
-            >
-              <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-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>
-              </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>-->
-            </el-table>
-          </el-row>
+                    <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>
+                    </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>-->
+                </el-table>
+            </el-row>
 
             <el-divider>订单列表</el-divider>
             <!--      <el-row>-->
@@ -131,8 +131,8 @@
                               style="width: 100%"
                               :border="option.border"
                     >
-<!--                        align="center"-->
-                        <el-table-column type="expand" v-if="option.expand" ></el-table-column>
+                        <!--                        align="center"-->
+                        <el-table-column type="expand" v-if="option.expand"></el-table-column>
                         <template v-for="(item,index) in option.column">
                             <!-- table字段 -->
                             <el-table-column v-if="item.hide!==true"
@@ -141,17 +141,18 @@
                                              :show-overflow-tooltip="true"
                                              :width="item.width"
                                              :key="index">
-<!--                                :align="center"-->
+                                <!--                                :align="center"-->
 
                             </el-table-column>
                         </template>
                         <!-- 操作栏模块 -->
-<!--                        align="center"-->
-                        <el-table-column prop="menu" label="操作" :width="250" >
+                        <!--                        align="center"-->
+                        <el-table-column prop="menu" label="操作" :width="250">
                             <template #="{row}">
                                 <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查 看
                                 </el-button>
-                                <el-button type="primary" text icon="el-icon-view" @click="handleCallDelivery('3', row)">编 辑收货人信息
+                                <el-button type="primary" text icon="el-icon-view"
+                                           @click="handleCallDelivery('3', row)">编 辑
                                 </el-button>
                                 <!--                                <el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>-->
                                 <el-button type="primary" text icon="el-icon-view" @click="handleOne(row)"
@@ -179,8 +180,8 @@
                               style="width: 100%"
                               :border="option.border"
                     >
-<!--                        align="center"-->
-                        <el-table-column type="expand" v-if="ordoption.expand" ></el-table-column>
+                        <!--                        align="center"-->
+                        <el-table-column type="expand" v-if="ordoption.expand"></el-table-column>
                         <template v-for="(item,index) in ordoption.column">
                             <!-- table字段 -->
                             <el-table-column v-if="item.hide!==true"
@@ -189,8 +190,8 @@
                                              :show-overflow-tooltip="true"
                                              :width="item.width"
                                              :key="index">
-<!--                                                                             :align="center"
--->
+                                <!--                                                                             :align="center"
+                                -->
                             </el-table-column>
                         </template>
                     </el-table>
@@ -205,9 +206,9 @@
                               style="width: 100%"
                               :border="option.border"
                     >
-<!--                        align="center"-->center
+                        <!--                        align="center"-->center
 
-                        <el-table-column type="expand" v-if="wrapoption.expand" ></el-table-column>
+                        <el-table-column type="expand" v-if="wrapoption.expand"></el-table-column>
                         <template v-for="(item,index) in wrapoption.column">
                             <!-- table字段 -->
                             <el-table-column v-if="item.hide!==true"
@@ -216,7 +217,7 @@
                                              :show-overflow-tooltip="true"
                                              :width="item.width"
                                              :key="index">
-<!--                                :align="center"-->
+                                <!--                                :align="center"-->
 
                             </el-table-column>
                         </template>
@@ -257,7 +258,7 @@
                                              :show-overflow-tooltip="true"
                                              :width="item.width"
                                              :key="index">
-<!--                                :align="center"-->
+                                <!--                                :align="center"-->
 
                             </el-table-column>
                         </template>
@@ -291,31 +292,57 @@
                     <!--          </el-pagination>-->
                 </div>
             </el-row>
-          <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
-            <el-form :model="formCustomer">
-              <el-form-item label="姓名" :label-width="formLabelWidth">
-                <el-input v-model="formCustomer.consignee" autocomplete="off" />
-              </el-form-item>
-              <el-form-item label="电话" :label-width="formLabelWidth">
-                <el-input v-model="formCustomer.deliveryPhone" autocomplete="off" />
-              </el-form-item>
-              <el-form-item label="地址" :label-width="formLabelWidth">
-                <el-input
-                  v-model="formCustomer.deliveryAddress"
-                  :rows="2"
-                  type="textarea"
-                  placeholder="请填写地址"
-                />
-              </el-form-item>
-            </el-form>
-            <template #footer>
+            <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
+                <el-form :model="formCustomer">
+                    <el-form-item label="姓名" :label-width="formLabelWidth">
+                        <el-input v-model="formCustomer.consignee" autocomplete="off"/>
+                    </el-form-item>
+                    <el-form-item label="电话" :label-width="formLabelWidth">
+                        <el-input v-model="formCustomer.deliveryPhone" autocomplete="off"/>
+                    </el-form-item>
+                    <el-form-item label="地址" :label-width="formLabelWidth">
+                        <el-input
+                                v-model="formCustomer.deliveryAddress"
+                                :rows="2"
+                                type="textarea"
+                                placeholder="请填写地址"
+                        />
+                    </el-form-item>
+                    <el-form-item label="加急" :label-width="formLabelWidth">
+                        <el-radio-group v-model="formCustomer.isUrgent" >
+                            <el-radio
+                                    :label="'1'" :value="'1'"> 否
+                            </el-radio>
+                            <el-radio
+                                    :label="'2'" :value="'2'" > 是
+                            </el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <!--                <el-form-item label="加急:" prop="serveType" >-->
+                    <!--                    &lt;!&ndash;                            v-for="item in this.deliveryWayData"&ndash;&gt;-->
+                    <!--                    <el-radio-group v-model="form.isUrgent" v-for="item in this.whetherData">-->
+                    <!--                        <el-radio :label="3">否</el-radio>-->
+                    <!--                        <el-radio :label="6">是</el-radio>-->
+                    <!--                    </el-radio-group>-->
+                    <!--                </el-form-item>-->
+                    <!--                <br/>-->
+                    <el-form-item label="备注" :label-width="formLabelWidth">
+                        <el-input
+                                v-model="formCustomer.remarks"
+                                :rows="2"
+                                type="textarea"
+                                placeholder="请填写备注"
+                        />
+                    </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="dialogFormVisible = false"> 确定 </el-button>-->
             <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
           </span>
-            </template>
-          </el-dialog>
+                </template>
+            </el-dialog>
             <!-- 表单模块 -->
             <el-dialog :title="title"
                        v-model="box"
@@ -337,7 +364,7 @@
                                          :show-overflow-tooltip="true"
                                          :width="item.width"
                                          :key="index">
-<!--                            :align="center"-->
+                            <!--                            :align="center"-->
 
                         </el-table-column>
                     </template>
@@ -345,15 +372,15 @@
                 <div class="avue-crud__pagination" style="width:100%">
                     <!-- 分页模块 -->
                     <el-pagination
-                                   background
-                                   @size-change="wsizeChange"
-                                   @current-change="wcurrentChange"
-                                   :current-page="wpage.currentPage"
-                                   :page-sizes="[10, 20, 30, 40, 50, 100]"
-                                   :page-size="wpage.pageSize"
-                                   layout="total, sizes, prev, pager, next, jumper"
-                                   :total="wpage.total">
-<!--                        :align="center"-->
+                            background
+                            @size-change="wsizeChange"
+                            @current-change="wcurrentChange"
+                            :current-page="wpage.currentPage"
+                            :page-sizes="[10, 20, 30, 40, 50, 100]"
+                            :page-size="wpage.pageSize"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="wpage.total">
+                        <!--                        :align="center"-->
                     </el-pagination>
                 </div>
                 <!-- 表单按钮 -->
@@ -535,14 +562,21 @@
               width: '100px'
             },
             {
-              label: '是否加急',
-              prop: 'isUrgent',
+              label: '签收件数',
+              prop: 'receivedQuantity',
               search: true,
               width: '100px'
             },
             {
-              label: '签收件数',
-              prop: 'receivedQuantity',
+              label: '备注',
+              prop: 'remarks',
+              search: false,
+              width: '100px',
+              hide:true
+            },
+            {
+              label: '是否加急',
+              prop: 'isUrgentName',
               search: true,
               width: '100px'
             },
@@ -569,27 +603,32 @@
             {
               label: '订单自编号',
               prop: 'orderIds',
-              search: true,
+              search: true
             },
             {
               label: '收货人',
               prop: 'consignee',
-              search: true,
+              search: true
 
             },
+
             {
               label: '收货电话',
               prop: 'deliveryPhone',
-              search: true,
-
+              search: true
             },
             {
               label: '收货地址',
               prop: 'deliveryAddress',
-              search: true,
-
+              search: true
             },
-          ],
+            {
+              label: '收货单位',
+              prop: 'receivingUnit',
+              search: true
+
+            }
+          ]
         },
 
         // 表单配置
@@ -725,6 +764,25 @@
           border: true,
           selection: true,
           column: [
+
+            {
+              label: '运单号',
+              prop: 'waybillNumber',
+              search: true,
+              width: '100px'
+            },
+            {
+              label: '服务号',
+              prop: 'serviceNumber',
+              search: true,
+              width: '100px'
+            },
+            {
+              search: true,
+              label: '订单自编号',
+              prop: 'waybillNumber',
+              width: '100px'
+            },
             {
               label: '包条码',
               prop: 'orderPackageCode',
@@ -737,6 +795,48 @@
               search: true,
               width: '100px'
             },
+            {
+              label: '发站仓',
+              prop: 'sendWarehouseName',
+              search: true,
+              width: '100px'
+            },
+            {
+              label: '目的仓',
+              prop: 'acceptWarehouseName',
+              search: true,
+              width: '100px'
+            },
+            {
+              label: '发货时间',
+              prop: 'waybillNumber',
+              search: true,
+              width: '100px'
+            },
+            {
+              label: '入库时间',
+              prop: 'warehouseEntryTimeEnd',
+              search: true,
+              width: '100px'
+            },
+            // {
+            //   label: '客户车次号',
+            //   prop: 'trainNumber',
+            //   search: true,
+            //   width: '100px'
+            // },
+            // {
+            //   label: '发站出库车次',
+            //   prop: 'trainNumber',
+            //   search: true,
+            //   width: '100px'
+            // },
+            {
+              label: '入库车次',
+              prop: 'trainNumber',
+              search: true,
+              width: '100px'
+            },
             {
               label: '一级品类',
               prop: 'firsts',
@@ -774,13 +874,13 @@
               search: true,
               width: '100px'
             },
-             {
+            {
               label: '冻结状态',
               prop: 'orderPackageFreezeStatusName',
               search: true,
               width: '100px'
             },
-             {
+            {
               label: '上架状态',
               prop: 'orderPackageGroundingStatusName',
               search: true,
@@ -822,7 +922,7 @@
             //   search: true,
             //   width: '150px'
             // },
-              {
+            {
               label: '签收扫描时间',
               prop: 'scanTime',
               search: true,
@@ -931,7 +1031,7 @@
               prop: 'readyStock',
               search: true,
               width: '100px'
-            },
+            }
 
           ]
         },
@@ -1089,7 +1189,7 @@
       '$route.data': {
         handler(newVal, oldVal) {
           console.log(newVal, oldVal);
-          if (this.$router.data){
+          if (this.$router.data) {
             this.fetchData();
           }
           this.onLoad(this.page);
@@ -1118,18 +1218,17 @@
       }
     },
     methods: {
-      callFordelivery(){
-        console.log("提交的数据》》》",this.formCustomer);
-        updateReservation(this.formCustomer).then(res =>{
-          console.log("返回的数据",res.data.data);
+      callFordelivery() {
+        console.log('提交的数据》》》', this.formCustomer);
+        updateReservation(this.formCustomer).then(res => {
+          console.log('返回的数据', res.data.data);
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
             type: 'success',
             message: '操作成功!'
           });
-        })
-
+        });
 
 
         this.dialogFormCustomer = false;
@@ -1150,10 +1249,17 @@
           case '3':
             this.dialogFormCustomer = true;
             console.log('<><>', row);
-            this.formCustomer.id = row.id ;
+            this.formCustomer.id = row.id;
             this.formCustomer.consignee = row.consignee;
             this.formCustomer.deliveryPhone = row.deliveryPhone;
             this.formCustomer.deliveryAddress = row.deliveryAddress;
+            this.formCustomer.remarks = row.remarks;
+            if (row.isUrgentName === '否' || row.isUrgentName === '1'){
+              this.formCustomer.isUrgent = '1'
+            }else {
+              this.formCustomer.isUrgent = '2'
+
+            }
             break;
         }
       },
@@ -1262,7 +1368,7 @@
           if (valid) {
             if (this.signtitle = '复核签收') {
               let row = {};
-              console.log("this.signform.deliverySignPictures>>>>>>>>>",this.signform.deliverySignPictures);
+              console.log('this.signform.deliverySignPictures>>>>>>>>>', this.signform.deliverySignPictures);
               row.id = this.signform.deliveryId;
               row.deliverySignPictures = this.signform.deliverySignPictures;
               row.clerkSignRemarks = this.signform.clerkSignRemarks;
@@ -1516,7 +1622,7 @@
             }
           });
 
-          this.deliverydata.teamResponsibility = b.join(",");
+          this.deliverydata.teamResponsibility = b.join(',');
           //this.deliverydata = data
           this.data = data.reservationList;
         });
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index 9a9a727b..fd0b9c6c 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -331,7 +331,7 @@ export default {
         },
         {
           prop: 'typeName',
-          label: '配送种类',
+          label: '配送类型',
           type: 1,
           values: '',
           width: '180',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 46b7cf64..7371f51c 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -6,7 +6,10 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="订单自编号:">
-            <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
+            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
+          </el-form-item>
+          <el-form-item label="运单">
+            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" />
           </el-form-item>
           <el-form-item label="入库时间:">
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
@@ -169,7 +172,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="费用" :label-width="formLabelWidth">
-            <el-input v-model="formService.cost" autocomplete="off"   placeholder="请填写费用"/>
+            <el-input v-model="formService.cost" autocomplete="off"   placeholder="请填写费用 "/>
           </el-form-item>
           <el-form-item label="原因" :label-width="formLabelWidth">
             <el-input
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index 4bc6dd4f..ba5e46db 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -6,7 +6,10 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="订单自编号:">
-            <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
+            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
+          </el-form-item>
+          <el-form-item label="运单">
+            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" />
           </el-form-item>
           <el-form-item label="入库时间:">
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index db7051f2..0ef8f1a4 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -6,7 +6,10 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="订单自编号:">
-            <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
+            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
+          </el-form-item>
+          <el-form-item label="运单">
+            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" />
           </el-form-item>
           <el-form-item label="入库时间:">
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index b939e1c0..5b2dfd03 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -6,7 +6,10 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="订单自编号:">
-            <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
+            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
+          </el-form-item>
+          <el-form-item label="运单">
+            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" />
           </el-form-item>
           <el-form-item label="入库时间:">
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue b/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue
new file mode 100644
index 00000000..535d7578
--- /dev/null
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue
@@ -0,0 +1,1642 @@
+<template>
+  <!--全部订单-->
+  <basic-container>
+    <div class="avue-crud">
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <el-form-item label="订单自编号:">
+            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
+          </el-form-item>
+          <el-form-item label="运单">
+            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" />
+          </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"
+              :default-time="defaultTime2"
+            />
+          </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>
+        <!--        <div class="avue-crud__header">
+                  &lt;!&ndash; 头部左侧按钮模块 &ndash;&gt;
+                  <div class="avue-crud__left">
+                    <el-button type="primary" icon="el-icon-plus" @click="handleTrade"  v-if="handler && taker || handler && trade"> 商配</el-button>
+                    <el-button type="danger" icon="el-icon-delete" @click="handleMunicipal" v-if="handler && taker || handler && trade">市配</el-button>
+                    <el-button type="primary" icon="el-icon-plus" @click="handlePickUpStore" v-if="permission.stockArticle_add && handler && !trade || permission.stockArticle_add && !taker" >自提</el-button>
+                    <el-button type="danger" icon="el-icon-delete" @click="handleEntire" >全部</el-button>
+                    <el-button type="primary" icon="el-icon-plus" @click="handleInform('2')" v-if = "!handler && !taker">未通知</el-button>
+                    <el-button type="danger" icon="el-icon-delete" @click="handleInform('1')" v-if = "!handler && !taker">已通知</el-button>
+                  </div>
+                  &lt;!&ndash; 头部右侧按钮模块 &ndash;&gt;
+        &lt;!&ndash;          <div class="avue-crud__right">&ndash;&gt;
+        &lt;!&ndash;            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>&ndash;&gt;
+        &lt;!&ndash;            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>&ndash;&gt;
+        &lt;!&ndash;          </div>&ndash;&gt;
+                </div>-->
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if = "handler">创建异常</el-button>
+            <el-button type="danger" icon="el-icon-edit" @click="handleMoke" v-if = "handler">转预约单</el-button>
+            <el-button type="primary" icon="el-icon-edit" @click="handleStockList" v-if = "handler">批量加配转库存品</el-button>
+            <el-button type="danger" icon="el-icon-edit" @click="handleCallDelivery('3')" v-if = "handler">修改客户信息</el-button>
+            <el-button type="danger" icon="el-icon-edit" @click="handleCallDelivery('2')" v-if = "handler">修改服务类型</el-button>
+            <!--            <el-button type="danger" icon="el-icon-plus"  v-if = "handler">转配送</el-button>-->
+
+          </div>
+          <div class="avue-crud__left">
+            <el-button type="primary" icon="el-icon-plus" @click="handlebill"  v-if = "!handler">创建提货单</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1')"  v-if = "!handler">再次通知</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1')"  v-if = "!handler">通知提货</el-button>
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :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>
+      </el-row>
+      <el-row>
+        <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>
+        </div>
+      </el-row>
+      <el-dialog v-model="dialogFormVisible" title="通知提货">
+        <el-form :model="formCall">
+          <el-form-item label="顾客姓名" :label-width="formLabelWidth">
+            <el-input v-model="formCall.customerName" autocomplete="off" />
+          </el-form-item>
+          <el-form-item label="顾客电话" :label-width="formLabelWidth">
+            <el-input v-model="formCall.customerTelephone" autocomplete="off" />
+          </el-form-item>
+          <el-form-item label="运单" :label-width="formLabelWidth">
+            <el-input v-model="formCall.waybill" autocomplete="off" />
+          </el-form-item>
+          <el-form-item label="跟进记录" :label-width="formLabelWidth">
+            <el-input
+              v-model="formCall.followUpRecord"
+              :rows="2"
+              type="textarea"
+              placeholder="请填写内容"
+            />
+          </el-form-item>
+          <el-form-item label="历史跟进" :label-width="formLabelWidth">
+
+
+          </el-form-item>
+        </el-form>
+        <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取消</el-button>
+        <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+        <el-button type="primary" @click="callFordelivery('1')"> 确定 </el-button>
+      </span>
+        </template>
+      </el-dialog>
+      <el-dialog v-model="dialogFormService" title="修改服务类型">
+        <el-form :model="formService">
+          <el-form-item label="服务类型" :label-width="formLabelWidth">
+            <!--            <el-input v-model="formService.typeService" autocomplete="off" />-->
+            <el-select v-model="formService.typeService" clearable placeholder="请选择服务类型">
+              <el-option
+                v-for="item in distributionType"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="费用" :label-width="formLabelWidth">
+            <el-input v-model="formService.cost" autocomplete="off"   placeholder="请填写费用 "/>
+          </el-form-item>
+          <el-form-item label="原因" :label-width="formLabelWidth">
+            <el-input
+              v-model="formService.cause"
+              :rows="2"
+              type="textarea"
+              placeholder="请填写原因"
+            />
+          </el-form-item>
+        </el-form>
+        <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogFormService = false">取消</el-button>
+        <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+        <el-button type="primary" @click="callFordelivery('2')"> 确定 </el-button>
+      </span>
+        </template>
+      </el-dialog>
+      <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
+        <el-form :model="formCustomer">
+          <el-form-item label="姓名" :label-width="formLabelWidth">
+            <el-input v-model="formCustomer.name" autocomplete="off" />
+          </el-form-item>
+          <el-form-item label="电话" :label-width="formLabelWidth">
+            <el-input v-model="formCustomer.phone" autocomplete="off" />
+          </el-form-item>
+          <el-form-item label="地址" :label-width="formLabelWidth">
+            <el-input
+              v-model="formCustomer.address"
+              :rows="2"
+              type="textarea"
+              placeholder="请填写地址"
+            />
+          </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>
+        </template>
+      </el-dialog>
+      <!-- 表单模块 -->
+      <el-dialog :title="title"
+                 v-model="box"
+                 width="50%"
+                 :before-close="beforeClose"
+                 append-to-body>
+        <el-form :disabled="view" ref="form" :model="form" label-width="80px">
+          <!-- 表单字段 -->
+          <el-form-item label="服务号" prop="serviceNumber">
+            <el-input v-model="form.serviceNumber" placeholder="请输入服务号"/>
+          </el-form-item>
+          <el-form-item label="订单自编号" prop="orderCode">
+            <el-input v-model="form.orderCode" placeholder="请输入订单自编号"/>
+          </el-form-item>
+          <el-form-item label="商场名称" prop="mallName">
+            <el-input v-model="form.mallName" placeholder="请输入商场名称"/>
+          </el-form-item>
+          <el-form-item label="货物名称" prop="descriptionGoods">
+            <el-input v-model="form.descriptionGoods" placeholder="请输入货物名称"/>
+          </el-form-item>
+          <el-form-item label="仓库" prop="warehouse">
+            <el-input v-model="form.warehouse" placeholder="请输入仓库"/>
+          </el-form-item>
+          <el-form-item label="入库时间" prop="warehouseEntryTime">
+            <!--            <el-input v-model="form.warehouseEntryTime" placeholder="请输入入库时间"/>-->
+            <el-date-picker
+              v-model="form.warehouseEntryTime"
+              type="datetime"
+              placeholder="请输入入库时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD hh:mm:ss"
+            />
+          </el-form-item>
+          <el-form-item label="在库时长" prop="storeTime">
+            <el-input v-model="form.storeTime" placeholder="请输入在库时长"/>
+          </el-form-item>
+          <el-form-item label="订单总件数" prop="totalNumber">
+            <el-input v-model="form.totalNumber" placeholder="请输入订单总件数"/>
+          </el-form-item>
+          <el-form-item label="在库件数" prop="handQuantity">
+            <el-input v-model="form.handQuantity" placeholder="请输入在库件数"/>
+          </el-form-item>
+          <el-form-item label="是否齐套" prop="completeSet">
+            <el-select v-model="form.completeSet" clearable placeholder="请选择是否齐套">
+              <!--              <el-option-->
+              <!--                v-for="item in completeSetData"-->
+              <!--                :key="item.dictKey"-->
+              <!--                :label="item.dictValue"-->
+              <!--                :value="item.dictKey">-->
+              <!--              </el-option>-->
+              <el-option label="是" value="2">是</el-option>
+              <el-option label="否" value="1">否</el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="品牌" prop="brand">
+            <el-input v-model="form.brand" placeholder="请输入品牌"/>
+          </el-form-item>
+          <el-form-item label="服务类型" prop="typeService">
+            <el-select v-model="form.typeService" clearable placeholder="请选择服务类型">
+              <!--              <el-option-->
+              <!--                v-for="item in typeServiceData"-->
+              <!--                :key="item.dictKey"-->
+              <!--                :label="item.dictValue"-->
+              <!--                :value="item.dictKey">-->
+              <!--              </el-option>-->
+              <el-option label="干" value="1">干</el-option>
+              <el-option label="仓" value="2">仓</el-option>
+              <el-option label="配" value="3">配</el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="顾客名字" prop="customerName">
+            <el-input v-model="form.customerName" placeholder="请输入顾客名字"/>
+          </el-form-item>
+          <el-form-item label="顾客电话" prop="customerTelephone">
+            <el-input v-model="form.customerTelephone" placeholder="请输入顾客电话"/>
+          </el-form-item>
+          <el-form-item label="顾客地址" prop="customerAddress">
+            <el-input v-model="form.customerAddress" placeholder="请输入顾客地址"/>
+          </el-form-item>
+          <el-form-item label="类型;1 预约单  2库存单" prop="genre">
+            <el-select v-model="form.genre" clearable placeholder="请选择类型;1 预约单  2库存单">
+              <!--              <el-option-->
+              <!--                v-for="item in genreData"-->
+              <!--                :key="item.dictKey"-->
+              <!--                :label="item.dictValue"-->
+              <!--                :value="item.dictKey">-->
+              <!--              </el-option>-->
+              <el-option label="库存单" value="2">库存单</el-option>
+              <el-option label="预约单" value="1">预约单</el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="状态;1 配送 2 待配送" prop="state">
+            <el-select v-model="form.state" clearable placeholder="请选择状态;1 配送 2 待配送">
+              <!--              <el-option-->
+              <!--                v-for="item in stateData"-->
+              <!--                :key="item.dictKey"-->
+              <!--                :label="item.dictValue"-->
+              <!--                :value="item.dictKey">-->
+              <!--              </el-option>-->
+              <el-option label="待配送" value="2">待配送</el-option>
+              <el-option label="配送" value="1">配送</el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
+  </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
+</template>
+
+<script>
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  addStock,
+  getListStockArticleWhole
+} from '@/api/distribution/distributionStockArticle';
+import { getListOwn } 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 { getDictionaryBiz } from '@/api/system/dict';
+import dayjs from 'dayjs';
+import { getUser } from '@/api/system/user';
+
+export default {
+  data () {
+    return {
+      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: [
+            // {
+            //   value: '0',
+            //   label: '未上架',
+            // },
+            // {
+            //   value: '1',
+            //   label: '部分上架',
+            // }, {
+            //   value: '2',
+            //   label: '已上架',
+            // },
+            // {
+            //   value: '3',
+            //   label: '已下架',
+            // },
+          ],
+          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: 'orderReceiveStatusName',
+          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: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          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: [],
+      drawerShow: false,
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      formCall: {},// 通知
+      formService: {}, // 服务
+      formCustomer: {}, // 客户
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+      distributionType: [],
+      deliveryOrderStatus: [],
+      dialogTableVisible: false,
+      dialogFormVisible: false,
+      dialogFormCustomer: false, //多选客户弹窗
+      dialogFormCustomerOwn: false, //单独的客户标识
+      dialogFormService: false,
+      formLabelWidth: '120px',
+      handler:true, //首次
+      trade:false, // 商
+      municipal:true, // 市
+      taker:true, // 自提
+      stockupDate: [],
+      defaultTime2: [
+        new Date(2000, 1, 1, 0, 0, 0),
+        new Date(2000, 2, 1, 23, 59, 59),
+      ] ,// '12:00:00', '08:00:00'
+      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]
+          },
+        },
+      ]
+    }
+  },
+  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');
+    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)
+    }
+  },
+  computed: {
+    ...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)
+      };
+    },
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  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 ==='typeServerName'){
+        this.query['typeService'] = index;
+      } else if(row.prop ==='orderReceiveStatusName'){
+        this.query['orderReceiveStatus'] = 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);
+      // console.log(index, row.prop);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
+    },
+    handleMoke(){
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      let st = false;
+      this.selectionList.forEach( i =>{
+        console.log("yuyuyuuyu",i);
+        if(i.reservationStatusName === "已预约"){
+          st = true;
+          this.$message.warning(i.orderCode+" - 已预约，请勿重复预约！！！");
+        }
+        if(i.typeService == 3){
+          st = true;
+          this.$message.warning(i.orderCode+" - 为自提单，无法预约！！！");
+        }
+      })
+      if(st){
+        return
+      }
+      // 判断orderId是否全都相等
+      const notEqualFlag = this.selectionList.some(
+        (item) =>
+          this.selectionList.filter((ele) =>
+            ele.customerName !== item.customerName
+            && ele.customerTelephone !== item.customerTelephone
+            && ele.customerAddress !== item.customerAddress ).length >= 1
+      );
+      console.log("notEqualFlag=====",notEqualFlag);
+      // 返回true,说明有不同
+      // 返回false,说明全都相等
+      if(!notEqualFlag){
+        this.$router.push({
+          path: '/distribution/reservation/reservationSubmitFrom',
+          query:{
+            id: this.ids,
+          }
+        });
+      }else{
+        this.$message.warning("请选择相同收货信息的订单！！！")
+      }
+
+    },
+    async handleStockList(){
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }else{
+        let st = false;
+        let lost = false;
+        for (const i of this.selectionList) {
+          console.log("yuyuyuuyu",i);
+          if(i.reservationStatusName == "已预约"){
+            st = true;
+            this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！");
+          }
+          if(i.typeService == 3){
+            st = true;
+            this.$message.warning(i.orderCode+" - 为自提单，无法转为库存品！！！");
+          }
+          if(i.freezeStatus == "30"){
+            st = true;
+            this.$message.warning(i.orderCode+" - 为冻结单，无法转为库存品！！！");
+          }
+          if(!st){
+            //查询库存数据
+            // console.log("cxcxcxc",i);
+            let aa = await getListOwn(this.page.currentPage,this.page.pageSize,{ stockArticleId : i.id } ).then();
+            // console.log("包件物料不存在！！",aa.data.data.records);
+            aa.data.data.records.forEach( l =>{
+              console.log(l.materialId , l.materialName , l.materialCode , l.materialUnit);
+              if(!l.materialId || l.materialId == '-1'){
+                lost = true;
+              }
+            })
+          }
+        }
+        if(st){
+          return
+        }
+        if(lost){
+          this.$message.warning("订单信息不完整，请完善包件信息！如没有请维护物料信息，在选择！！！")
+        }else{
+          this.getSock();
+        }
+      }
+
+
+      /*else if (this.selectionList.length > 1){
+        this.getSock();
+      }else if (this.selectionList.length < 2){
+        //判断有没有包件
+        let params ={
+          stockArticleId : this.selectionList[0].id
+        }
+
+      let a =  await  getListOwn(this.page.currentPage,this.page.pageSize,params);
+        // console.log("aaaaaaa===",a.data.data);
+        if(a.data.data.records.length > 0){
+          this.$router.push({
+            path: '/distribution/inventory/distributionStockArticleFrom',
+            query: {
+              id : this.ids,
+              name : "转库存单"
+            }
+          });
+        }else{
+          this.getSock();
+        }
+      }*/
+    },
+    getSock(){
+      this.$confirm("确定将选择的订单转为库存品吗？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return addStock(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    //确定通知提货按钮
+    callFordelivery(inde){
+      switch (inde) {
+        case '1':
+          console.log(this.formCall);
+          this.formCall.waybillNumber  = this.ids;
+          addCallDelivery(this.formCall).then(() => {
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.dialogFormVisible = false;
+            this.formCall={}
+            this.onLoad(this.page);
+          });
+          break;
+        case '2':
+          this.formService.stockArticleId = this.ids;
+          // console.log("服务类型",this.formService);
+
+          addService(this.formService).then(() =>{
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.dialogFormService = false;
+            this.formService={}
+            this.onLoad(this.page);
+          })
+          break;
+        case '3':
+          console.log("客户信息！！！",this.formCustomer);
+          if(!this.dialogFormCustomerOwn){
+            this.formCustomer.stockArticleId = this.ids;
+          }
+          addClient(this.formCustomer).then(() =>{
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.dialogFormCustomer = false;
+            this.dialogFormCustomerOwn = false;
+            this.formCustomer={}
+            this.onLoad(this.page);
+          })
+          break;
+      }
+    },
+    //提货跳转
+    handlebill(row){
+      console.log(">>>>",this.ids);
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$router.push({
+        path: '/distribution/inventory/distrilbutionBillLading',
+        query:{
+          id: this.ids,
+
+        }
+      });
+    },
+    //通知提货
+    handleCallDeliveryOwn(row){
+      console.log("row",row);
+      this.formCustomer.name = row.row.customerName;
+      this.formCustomer.phone = row.row.customerTelephone;
+      this.formCustomer.address = row.row.customerAddress;
+      this.formCustomer.stockArticleId = row.row.id;
+      this.dialogFormCustomer = true;
+      this.dialogFormCustomerOwn = true;
+    },
+    //通知提货
+    handleCallDelivery(ind){
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      let a = this.selectionList.find( i => i.reservationStatusName == '已预约');
+      if(!!a){
+        this.$message.warning("有已预约的数据，不能修改服务类型");
+        return ;
+      }
+      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;
+          break;
+      }
+
+    },
+    init () {
+      this.height = this.setPx(document.body.clientHeight - 340);
+      getDictionaryBiz('distribution_type').then(res => {
+        this.distributionType = res.data.data;
+        this.checkcColumnList("typeServerName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+
+        // this.columnList[26].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
+      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
+        });
+        // this.columnList[24].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
+        });
+        // this.columnList[19].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
+        });
+        // this.columnList[19].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
+        });
+        // this.columnList[36].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
+        });
+        // this.columnList[35].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
+      getDictionaryBiz('order_receive_status').then(res => {
+        this.checkcColumnList("orderReceiveStatusName", 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;
+    },
+    searchChange () {
+      this.onLoad(this.page);
+    },
+    searchReset () {
+      this.query = {};
+      this.stockupDate = [];
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    handleSubmit () {
+      if (!this.form.id) {
+        add(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+      } else {
+        update(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        })
+      }
+    },
+
+    //全部
+    handleEntire(){
+      this.handler = true;
+      this.taker = true;
+      this.trade = false;
+
+    },
+    //商配
+    handleTrade(){
+      // this.handler = true;
+      this.trade = true;
+    },
+    //商配
+    handleMunicipal(){
+      // this.handler = true;
+      // this.taker = true;
+    },
+    //自提
+    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;
+      });
+    }, //自提的通知
+    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;
+      }
+      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;
+      });
+    },
+    handleAdd () {
+      this.title = '新增'
+      this.form = {}
+      this.box = true
+    },
+    handleEdit (row) {
+      this.title = '编辑'
+      this.box = true
+      getDetail(row.row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleView (row) {
+      // this.title = '查看'
+      // this.view = true;
+      // this.box = true;
+      // getDetail(row.id).then(res => {
+      //   this.form = res.data.data;
+      // });
+      // console.log("查看===",row.row);
+      this.$router.push({
+        path: '/distribution/inventory/distributionStockArticleDetails',
+        query: {
+          id : row.row.id,
+          name: "详情 - "+row.row.orderCode
+        },
+      })
+
+
+    },
+    handleDelete () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    rowDel (row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    beforeClose (done) {
+      done()
+      this.form = {};
+      this.view = false;
+    },
+    selectionChange (list) {
+      // console.log("添加阿斯顿发生",list);
+      this.selectionList = list;
+    },
+    selectionClear () {
+      this.selectionList = [];
+      // this.$refs.table.clearSelection();
+    },
+    currentChange (currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page);
+    },
+    sizeChange (pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page);
+    },
+    getTime(dat){
+      let date = new Date(dat);
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? '0' + m : m
+      var d = date.getDate()
+      d = d < 10 ? '0' + d : d
+      var h = date.getHours()
+      h = h < 10 ? '0' + h : h
+      var minute = date.getMinutes()
+      minute = minute < 10 ? '0' + minute : minute
+      var s = date.getSeconds()
+      s = s < 10 ? '0' + s : s
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + s;
+    },
+    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());
+      }
+      this.query.genre = 1;
+      getListStockArticleWhole(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        console.log(">>>>>>>",data.records);
+        this.page.total = data.total;
+        this.data = data.records;
+        this.data = this.data.map( i => {
+          // console.log("iiiii",i.createUser);
+          // const freezeStatusMap = {
+          //   0: "未冻结",
+          //   1: "已冻结",
+          //   default: "无"
+          // };
+          const nuMap = {
+            '-1': "0"
+          };
+          // const groundingStatusMap = {
+          //   0: "未上架",
+          //   1: "部分上架",
+          //   2: "已上架",
+          //   3: "已下架",
+          //   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;
+          i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
+          i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
+          i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
+          // console.log("i.totalNumber",i.totalNumber,"i.handQuantitys",i.handQuantity);
+          i.notReceived = parseInt( i.totalNumber) - parseInt(i.handQuantity);
+          return i;
+        });
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+
+  }
+};
+</script>
+<style scoped>
+.el-button--text {
+  margin-right: 15px;
+}
+.el-select {
+  width: 300px;
+}
+.el-input {
+  width: 300px;
+}
+.dialog-footer button:first-child {
+  margin-right: 10px;
+}
+</style>
+
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 906297ca..1b4527db 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -429,8 +429,8 @@ export default {
           fixed: true,
         },
         {
-          prop: 'warehouse',
-          label: '仓库',
+          prop: 'serviceNumber',
+          label: '服务号',
           type: 2,
           values: '',
           width: '150',
@@ -449,6 +449,27 @@ export default {
           fixed: true,
           sortable: true,
           head: false,
+        }, {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
         },
         {
           prop: 'orderPackageStatusName',
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index aebda40c..9518ac2b 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -90,10 +90,10 @@
                         @selection="selectionChange"
                 >
                     <template #default="slotProps">
-                        <el-button size="small" @click="viewReservation(slotProps.scope)">查看</el-button>
-                        <el-button size="small" @click="editsolt(slotProps.scope)">编辑</el-button>
+                        <el-button size="small" type="primary" link icon="el-icon-view" @click="viewReservation(slotProps.scope)">查看</el-button>
+                        <el-button size="small" type="primary" link icon="el-icon-view" @click="editsolt(slotProps.scope)">编辑</el-button>
                         <br/>
-                        <el-button size="small" @click="cancelReservation(slotProps.scope)">取消预约</el-button>
+                        <el-button size="small" type="primary" link icon="el-icon-view" @click="cancelReservation(slotProps.scope)">取消预约</el-button>
                         <br/>
 <!--                        ${{slotProps.scope}}-->
                         <el-button v-if="this.query.reservationStatus==='1'?true:false " size="small" @click="confirmReservation(slotProps.scope)">确认预约</el-button>
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 88ba0cda..e85b7505 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -103,7 +103,6 @@
                             <!--                            v-for="item in this.deliveryWayData"-->
                             <el-radio-group v-model="form.isUrgent" v-for="item in this.whetherData">
                                 <el-radio
-
                                         :label="item.dictKey"
                                         :value="item.dictKey">{{item.dictValue}}&emsp;
                                 </el-radio>
@@ -117,15 +116,15 @@
                             <el-input v-model="form.otherFee" placeholder="请输入其他费用"/>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="10">
-                        <el-form-item label="服务类型:" prop="serveType" label-width="120px">
-                            <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
-                                <el-checkbox :label="item.dictKey"
-                                             :value="item.dictKey">{{item.dictValue}}&emsp;
-                                </el-checkbox>
-                            </el-checkbox-group>
-                        </el-form-item>
-                    </el-col>
+<!--                    <el-col :span="10">-->
+<!--                        <el-form-item label="服务类型:" prop="serveType" label-width="120px">-->
+<!--                            <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">-->
+<!--                                <el-checkbox :label="item.dictKey"-->
+<!--                                             :value="item.dictKey">{{item.dictValue}}&emsp;-->
+<!--                                </el-checkbox>-->
+<!--                            </el-checkbox-group>-->
+<!--                        </el-form-item>-->
+<!--                    </el-col>-->
 
 
                     <el-col :span="10">
@@ -591,7 +590,7 @@
           //   { required: true, message: '请选择启用状态!', trigger: 'change' }
           // ],
         },
-        obj:{},
+        obj: {}
       };
     },
     created() {
@@ -610,7 +609,7 @@
       this.onLoad(this.page);
       this.getDictionary();
     },
-    watch:{
+    watch: {
       '$route.query.reservationId': {
         handler(newVal, oldVal) {
           console.log(newVal, oldVal);
@@ -688,125 +687,9 @@
       //查询出所有的市配订单
       handleAddOrder() {
         this.loading = true;
-        console.log('$$$$$$', this.orderData);
-        this.query.typeService = 2;
-        this.query.genre = '1';
-        const params = {};
-        const page = this.page;
-        if (this.reservationId){
-          console.log("------------>",'预约编辑');
-          //编辑和新增不一样的处理方式
-          //这里需要查询出未被预约的订单和该预约自己本身的订单
-          // selectUpdateAvailableStockArticle(this.reservationId).then(res=>{
-          //   console.log('res------------>', res);
-          //   const data = res.data.data;
-          //   this.stockArticleInfo =  data
-          //   this.stockArticleInfo.forEach((item, index) => {
-          //     //检查订单是否冻结
-          //     this.checkOrder(item, index);
-          //     if (this.orderData) {
-          //       this.orderData.forEach(o => {
-          //         if (o.id === item.id) {
-          //           this.$nextTick(() => {
-          //             this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
-          //           });
-          //         }
-          //       });
-          //     }else {
-          //       this.orderList = [];
-          //     }
-          //   });
-          // })
-          this.onLoadEditOrder(this.page);
-        }else {
-          this.onLoadOrder(this.page);
-          // selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => {
-          //   console.log('res------------>', res);
-          //   const data = res.data.data;
-          //   this.stockArticleInfo =  data.records;
-          //   this.stockArticleInfo.forEach((item, index) => {
-          //     //检查订单是否冻结
-          //     this.checkOrder(item, index);
-          //     // if (this.orderData) {
-          //     //   this.orderData.forEach(o => {
-          //     //     if (o.id === item.id) {
-          //     //       this.$nextTick(() => {
-          //     //         this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
-          //     //       });
-          //     //     }
-          //     //   });
-          //     // }else {
-          //     //   this.orderList = [];
-          //     // }
-          //   });
-          //   this.orderList = [];
-          //
-          // });
-        }
+        //这里只需要对订单进行正常的搜索即可
+        this.onLoadOrder(this.page);
         this.loading = false;
-        console.log("this.stockArticleInfo------------->",this.stockArticleInfo);
-        // if (this.reservationId) {
-        //   //这里需要编辑，那么这里就需要在订单列表中回显已使用包件，禁用勾选其他预约使用的包件细信息
-        //   this.query.typeService = 2;
-        //   this.query.genre = '1';
-        //   //查询所有订单列表信息
-        //   let page = this.page;
-        //   let params = {};
-        //   selectStockArticleInfoList(Object.assign(params, this.query)).then(res => {
-        //     let orderListData = res.data.data;
-        //     this.stockArticleInfo = orderListData;
-        //     //这里进行订单的勾选回显
-        //     let a = this.orderData;
-        //     for (let i = 0; i < orderListData.length; i++) {
-        //       for (let j = 0; j < a.length; j++) {
-        //         if (orderListData[i].id === a[j].id){
-        //           orderListData[i] = a[j];
-        //           this.$nextTick(()=> {
-        //             this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[i],true);
-        //           })
-        //         }
-        //         this.checkOrder(this.stockArticleInfo[i],i);
-        //       }
-        //     }
-        //     this.loading = false;
-        //     this.selectionClear();
-        //   });
-        // } else {
-        //   this.query.typeService = 2;
-        //   this.query.genre = '1';
-        //   let page = this.page;
-        //   let params = {};
-        //   selectStockArticleAndParcel(Object.assign(params, this.query)).then(res => {
-        //     let orderData = res.data.data;
-        //     orderData.forEach((item, index) => {
-        //       item.reservationNum = item.handQuantity;
-        //       item.reservationNum = '0';
-        //     });
-        //     this.stockArticleInfo = orderData;
-        //     //转预约单的操作会带出订单
-        //     if (this.orderData){
-        //       this.stockArticleInfo.forEach((item,index)=>{
-        //         this.orderData.forEach(o=>{
-        //           if (item.id === o.id){
-        //             this.$nextTick(()=> {
-        //               this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index],true);
-        //             })
-        //           }
-        //         })
-        //         // if (item.reservationStatus === '30'){
-        //         //   this.$nextTick(()=> {
-        //         //     this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index],true);
-        //         //   })
-        //         // }
-        //         this.checkOrder(item,index);
-        //       })
-        //     }else {
-        //       //这里是通过新增预约的按钮进入的页面
-        //     }
-        //     this.loading = false;
-        //     this.selectionClear();
-        //   });
-        // }
         this.orderShow = true;
       },
       checkOrder(row, index) {
@@ -930,29 +813,29 @@
         console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
         if (this.reservationId) {
           //这里就是编辑的数据回显问题
-          let packageInfo = row.parcelListVOS
+          let packageInfo = row.parcelListVOS;
           // this.packageData = row.parcelListVOS;
           let packageListData = this.packageData;
           if (row.packageList) {
             let packageListInfo = row.packageList;
-            packageInfo.forEach((item,index)=>{
-              packageListInfo.forEach(p=>{
-                if (item.id===p.id){
-                  this.$nextTick( ()=> {
-                    this.$refs.packageList.toggleRowSelection(this.packageData[index],true);
-                  })
+            packageInfo.forEach((item, index) => {
+              packageListInfo.forEach(p => {
+                if (item.id === p.id) {
+                  this.$nextTick(() => {
+                    this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+                  });
                 }
-              })
-            })
-          }else {
+              });
+            });
+          } else {
             //新增订单，默认全选
-            packageInfo.forEach((item,index)=>{
-              this.$nextTick( ()=> {
-                this.$refs.packageList.toggleRowSelection(this.packageData[index],true);
-              })
-            })
+            packageInfo.forEach((item, index) => {
+              this.$nextTick(() => {
+                this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+              });
+            });
           }
-          this.packageData =row.parcelListVOS;
+          this.packageData = row.parcelListVOS;
         } else {
           this.packageData = row.parcelListVOS;
           //这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选
@@ -995,12 +878,11 @@
         let page = this.page;
         this.query.typeService = 2;
         this.query.genre = 1;
-        if (this.reservationId){
-          this.onLoadEditOrder(this.page)
-        }else {
-          this.onLoadOrder(this.page)
-
-        }
+        // if (this.reservationId) {
+        //   this.onLoadEditOrder(this.page);
+        // } else {
+        this.onLoadOrder(this.page);
+        // }
         // selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         //   const data = res.data.data;
         //   data.records.forEach(item => {
@@ -1042,11 +924,11 @@
           this.$message.warning('请选择包件!!!');
           return;
         }
-        this.orderData.forEach(item=>{
-          if (item.id===this.obj.id){
+        this.orderData.forEach(item => {
+          if (item.id === this.obj.id) {
             item.packageList = this.packageList;
           }
-        })
+        });
         console.log('this.orderData------------>', this.orderData);
         this.isaddvalue = false;
       },
@@ -1076,11 +958,11 @@
         this.form.inventoryList = inventoryList;
         console.log('-------------->', this.orderData);
         let order = this.orderData;
-        order.forEach(o=>{
-          if (!o.packageListInfo){
+        order.forEach(o => {
+          if (!o.packageListInfo) {
             o.packageListInfo = o.packageList;
           }
-        })
+        });
         this.form.stockArticleList = order;
         this.deliveryWayData.forEach(item => {
           if (this.form.deliveryWay === item.dictValue) {
@@ -1117,7 +999,7 @@
             });
           });
         } else {
-          this.form.reservationStatus = '20'
+          this.form.reservationStatus = '20';
           autonomouslySave(this.form).then(() => {
             this.$message({
               type: 'success',
@@ -1224,12 +1106,12 @@
           this.$message.warning('请选择至少一条数据');
           return;
         }
-        this.inventoryList.forEach(item=>{
-          if (item.reservationNum > item.applyNum){
+        this.inventoryList.forEach(item => {
+          if (item.reservationNum > item.applyNum) {
             this.$message.warning('该库存品数量输入有误!!!');
             return;
           }
-        })
+        });
         this.inventoryData = this.inventoryList;
 
         // if (this.orderData.length) {
@@ -1250,40 +1132,71 @@
        */
       onSubmitOrder() {
         console.log('-------------》', this.orderList);
-        if (this.orderList.length === 0) {
-          this.$message.warning('请选择至少一条数据');
-          return;
-        }
         const list = this.orderList;
-        console.log("list--------",list);
-        let j = 0;
-        let  name = list[0].customerName;
-        let  address = list[0].customerAddress;
-        let  phone = list[0].customerTelephone;
+        let name = list[0].customerName;
+        let address = list[0].customerAddress;
+        let phone = list[0].customerTelephone;
+        if (!!this.form.consignee) {
+          if (this.form.consignee !== name) {
+            this.$message.warning('请选择统一顾客订单!!!');
+            return;
+          }
+        }
+        if (!!this.form.customerAddress) {
+          if (this.form.customerAddress !== address) {
+            this.$message.warning('请选择统一顾客订单!!!');
+            return;
+          }
+        }
+        if (!!this.form.customerTelephone) {
+          if (this.form.customerTelephone !== phone) {
+            this.$message.warning('请选择统一顾客订单!!!');
+            return;
+          }
+        }
+        //市配  --- 最终客户校验
         for (let i = 1; i < list.length; i++) {
-          if (list[i].customerName !== name || list[i].customerAddress !== address || list[i].customerTelephone !== phone){
+          if (list[i].customerName !== name || list[i].customerAddress !== address || list[i].customerTelephone !== phone) {
             this.$message.warning('请选择统一顾客订单!!!');
             return;
           }
         }
+
         this.form.consignee = name;
         this.form.deliveryAddress = address;
         this.form.deliveryPhone = phone;
-        this.orderData = this.orderList;
-        let info = [];
-        // if (this.orderData){
-        //   let a = this.orderData;
-        //   data.forEach(item=>{
-        //     a.forEach(order=>{
-        //       if (item.id === order.id){
-                console.log("orderData----------------->",this.orderData);
-        //         item = order;
-        //       }
-        //     })
-        //     info.push(item);
-        //   })
-        // }
-        // this.orderData = info;
+        //这里需要对选择的订单进行筛选
+        const info = [];
+        this.stockArticleInfo.forEach((item, index) => {
+          this.orderList.forEach(order => {
+            // const newDate1 = this.orderData.map(item => { // map遍历本地数据
+            //   if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
+            //     return item;
+            // });
+            //   }              info.push(order);
+            //清理原来订单列表的订单数据
+            info.push(order);
+            this.stockArticleInfo.splice(index, 1);
+          });
+        });
+        if (this.orderData.length >= 1) {
+          let newDate1 = this.orderData.map(item => { // map遍历本地数据
+            if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
+              return item;
+            }
+          });
+          console.log('newDate1-------------->', newDate1.length);
+          if (newDate1.length >= 1) {
+            console.log('newDate1-------------->', newDate1);
+            newDate1.forEach(a => {
+              this.orderData.push(a);
+            });
+          }
+          console.log('this.orderData------------->', this.orderData);
+        } else {
+          this.orderData = this.orderList;
+        }
+        // this.orderData.push(info);
         this.orderShow = false;
       },
       selectionClear() {
@@ -1293,28 +1206,39 @@
       },
       currentOrderChange(currentPage) {
         this.page.currentPage = currentPage;
-        if (this.reservationId){
-          this.onLoadEditOrder(this.page,this.reservationId);
-        }else {
-          this.onLoadOrder(this.page);
-        }
+        // if (this.reservationId) {
+        //   this.onLoadEditOrder(this.page, this.reservationId);
+        // } else {
+        //   this.onLoadOrder(this.page);
+        // }
+        this.onLoadOrder(this.page);
       },
       sizeOrderChange(pageSize) {
         this.page.pageSize = pageSize;
-        if (this.reservationId){
-          this.onLoadEditOrder(this.page,this.reservationId);
-
-        }else {
+        // if (this.reservationId) {
+        //   this.onLoadEditOrder(this.page, this.reservationId);
+        // } else {
+        //   this.onLoadOrder(this.page);
+        // }
+        this.onLoadOrder(this.page);
 
-          this.onLoadOrder(this.page);
-        }
       },
-      onLoadEditOrder(arg,params = {}){
-        const  page  = arg;
-        selectUpdateAvailableStockArticle(page.currentPage, page.pageSize,this.reservationId,Object.assign(params, this.query)).then(res=>{
+      onLoadEditOrder(params = {}) {
+        this.query.typeService = 2;
+        this.query.genre = '1';
+        const page = this.page;
+        let a = [];
+        if (this.orderData) {
+          this.orderData.forEach(item => {
+            a.push(item.id);
+          });
+        }
+        this.query.orderIds = a.join(',');
+        this.query.reservationId = this.reservationId;
+        selectUpdateAvailableStockArticle(page.currentPage, page.pageSize, this.reservationId, Object.assign(params, this.query)).then(res => {
           console.log('res------------>', res);
           const data = res.data.data;
-          this.stockArticleInfo =  data.records;
+          this.stockArticleInfo = data.records;
           this.stockArticleInfo.forEach((item, index) => {
             //检查订单是否冻结
             this.checkOrder(item, index);
@@ -1327,24 +1251,30 @@
                   });
                 }
               });
-            }else {
+            } else {
               this.orderList = [];
             }
           });
           this.page.total = data.total;
-        })
+        });
         // this.query = {};
       },
-
-
-      onLoadOrder(arg,params={}){
-        console.log("------------->arg",arg);
-        const  page  = arg;
-        console.log("------------->page",page);
-        selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => {
+      onLoadOrder(page, params = {}) {
+        this.query.typeService = 2;
+        this.query.genre = '1';
+        // const page = this.page;
+        let a = [];
+        if (this.orderData) {
+          this.orderData.forEach(item => {
+            a.push(item.id);
+          });
+        }
+        this.query.orderIds = a.join(',');
+        console.log('-------------->', this.query);
+        selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           console.log('res------------>', res);
           const data = res.data.data;
-          this.stockArticleInfo =  data.records;
+          this.stockArticleInfo = data.records;
           this.stockArticleInfo.forEach((item, index) => {
             //检查订单是否冻结
             this.checkOrder(item, index);
@@ -1362,7 +1292,6 @@
             this.page.total = data.total;
           });
           this.orderList = [];
-
         });
       },
 
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index 4da16469..f849c113 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -671,8 +671,9 @@ export default {
       let params ={
         department: this.deptId
       }
+      console.log("备货区参数>>>",params);
       stockUp(params).then(res =>{
-        // console.log("res>>>",res.data.data);
+        console.log("备货区数据",res.data.data);
         let fo =[];
         res.data.data.forEach(i =>{
           let v = {
@@ -695,7 +696,7 @@ export default {
        }
       let a = false ;
       this.selectionList.some(i =>{
-        if(i.assignStatus == "2"){
+        if(i.assignStatus == "20"){
           a = true;
           return;
         }
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index 775d02cd..6121d657 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -736,8 +736,9 @@ export default {
       let params ={
         department: this.deptId
       }
+      console.log("备货参数<><><>",params);
       stockUp(params).then(res =>{
-        // console.log("res>>>",res.data.data);
+        console.log("备货区数据>>>",res.data.data);
         let fo =[];
         res.data.data.forEach(i =>{
           let v = {
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 3bca59d9..6a60c8cb 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -193,16 +193,16 @@
                     </el-form-item>
                 </el-col>
 
-                <el-col :span="6">
-                    <el-form-item label="服务类型:" prop="serveType" label-width="100px">
-                        <!--              <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>-->
-                        <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
-                            <el-checkbox :label="item.dictKey" :value="item.dictKey"
-                            >{{ item.dictValue }}&emsp;
-                            </el-checkbox>
-                        </el-checkbox-group>
-                    </el-form-item>
-                </el-col>
+<!--                <el-col :span="6">-->
+<!--                    <el-form-item label="服务类型:" prop="serveType" label-width="100px">-->
+<!--                        &lt;!&ndash;              <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>&ndash;&gt;-->
+<!--                        <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">-->
+<!--                            <el-checkbox :label="item.dictKey" :value="item.dictKey"-->
+<!--                            >{{ item.dictValue }}&emsp;-->
+<!--                            </el-checkbox>-->
+<!--                        </el-checkbox-group>-->
+<!--                    </el-form-item>-->
+<!--                </el-col>-->
             </el-row>
             <el-row>
                 <el-col :span="6">
@@ -407,10 +407,10 @@
     >
         <el-form :inline="true" :model="query">
             <el-form-item label="顾客电话:">
-                <el-input v-model="query.customerTelephone" placeholder="请输入服务类型"></el-input>
+                <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>
             </el-form-item>
             <el-form-item label="顾客地址:">
-                <el-input v-model="query.customerAddress" placeholder="请输入服务类型"></el-input>
+                <el-input v-model="query.customerAddress" placeholder="请输入顾客地址"></el-input>
             </el-form-item>
             <!-- 查询按钮 -->
             <el-form-item>
@@ -1056,28 +1056,46 @@
         console.log('>>>>>>>>>>>>', this.stockArticleList);
         console.log('>>>>>>>>orderData', this.orderData);
         const data = this.stockArticleList;
-        let info = [];
-        // if (this.orderData) {
-        //   let a = this.orderData;
-        //   data.forEach(item => {
-        //     a.forEach(order => {
-        //       if (item.id === order.id) {
-        //         console.log('order----------------->', order);
-        //         item = order;
-        //       }
-        //     });
-        //     info.push(item);
-        //   });
-        // }
-        data.map(item=>{
-          console.log(item);
-            this.orderData.forEach(order=>{
-              if (item.id !== order.id){
-                this.orderData.push(item);
-              }
+        const info = [];
+        this.stockArticleInfo.forEach((item, index) => {
+          this.stockArticleList.forEach(order => {
+            // const newDate1 = this.orderData.map(item => { // map遍历本地数据
+            //   if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
+            //     return item;
+            // });
+            //   }              info.push(order);
+            //清理原来订单列表的订单数据
+            info.push(order);
+            this.stockArticleInfo.splice(index, 1);
+          });
+        });
+
+        if (this.orderData.length >= 1) {
+          let newDate1 = this.orderData.map(item => { // map遍历本地数据
+            if (this.stockArticleList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
+              return item;
+            }
+          });
+          console.log('newDate1-------------->', newDate1.length);
+          if (newDate1.length >= 1) {
+            console.log('newDate1-------------->', newDate1);
+            newDate1.forEach(a=>{
+              this.orderData.push(a);
             })
-        })
-        // this.orderData = info;
+          }
+          console.log("this.orderData------------->",this.orderData);
+        } else {
+          this.orderData = this.stockArticleList;
+        }
+        // data.map(item=>{
+        //   console.log(item);
+        //     this.orderData.forEach(order=>{
+        //       if (item.id !== order.id){
+        //         this.orderData.push(item);
+        //       }
+        //     })
+        // })
+        // // this.orderData = info;
         console.log('+++++++++++++++', this.orderData);
         this.orderShow = false;
       },
@@ -1537,23 +1555,24 @@
         this.query.genre = '1';
         console.log('query------------->', this.query);
         const page = this.page;
-        selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          console.log('------------------->', res);
-          const data = res.data.data;
-          this.stockArticleInfo = data.records;
-          if (this.orderData) {
-            this.stockArticleInfo.forEach((item, index) => {
-              this.orderData.forEach(order => {
-                if (item.id === order.id) {
-                  console.log('----------->');
-                  this.$nextTick(() => {
-                    this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
-                  });
-                }
-              });
-            });
-          }
-        });
+        this.onLoadOrder(page);
+        // selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        //   console.log('------------------->', res);
+        //   const data = res.data.data;
+        //   this.stockArticleInfo = data.records;
+        //   if (this.orderData) {
+        //     this.stockArticleInfo.forEach((item, index) => {
+        //       this.orderData.forEach(order => {
+        //         if (item.id === order.id) {
+        //           console.log('----------->');
+        //           this.$nextTick(() => {
+        //             this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
+        //           });
+        //         }
+        //       });
+        //     });
+        //   }
+        // });
         // selectStockArticleAndParcel(Object.assign(params,this.query)).then(res=>{
         //   console.log("res------------>",res.data.data);
         //   const data = res.data.data
@@ -1626,6 +1645,13 @@
         this.query.typeService = 1;
         this.query.genre = '1';
         const page = arg;
+        let a =[];
+        if (this.orderData){
+          this.orderData.forEach(item=>{
+            a.push(item.id)
+          })
+        }
+        this.query.orderIds = a.join(",");
         selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           console.log(res.data.data);
           const data = res.data.data;
diff --git a/src/views/reservation/order_list.vue b/src/views/reservation/order_list.vue
index 900d7692..3cdac67b 100644
--- a/src/views/reservation/order_list.vue
+++ b/src/views/reservation/order_list.vue
@@ -969,7 +969,7 @@ export default {
       // 返回false,说明全都相等
       if(!notEqualFlag){
         this.$router.push({
-          path: '/distribution/reservation/reservationFrom',
+          path: '/distribution/reservation/order_listFrom',
           query:{
             id: this.ids,
           }
diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue
index a0bd6fa0..9b60bc4c 100644
--- a/src/views/system/tenant.vue
+++ b/src/views/system/tenant.vue
@@ -128,6 +128,7 @@ import { getDetail as packageDetail } from '@/api/system/tenantpackage';
 import { mapGetters } from 'vuex';
 import { getMenuTree } from '@/api/system/menu';
 import { validatenull } from '@/utils/validate';
+import {getAppMenuTree} from "@/api/system/appmenu";
 
 export default {
   data() {
@@ -375,6 +376,11 @@ export default {
         const column = this.findObject(this.packageOption.column, 'menuId');
         column.dicData = res.data.data;
       });
+      getAppMenuTree().then(res => {
+
+        const columns = this.findObject(this.packageOption.column, 'appMenuId');
+        columns.dicData = res.data.data;
+      });
     },
     rowSave(row, done, loading) {
       add(row).then(
diff --git a/src/views/warehouse/warehouseStock/warehouseStock.vue b/src/views/warehouse/warehouseStock/warehouseStock.vue
index d6e9f06b..f337f712 100644
--- a/src/views/warehouse/warehouseStock/warehouseStock.vue
+++ b/src/views/warehouse/warehouseStock/warehouseStock.vue
@@ -68,6 +68,17 @@ export default {
           sortable: false,
           head: false,
         },
+        {
+          prop: 'scanNodeType',
+          label: '扫描详情',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: false,
+          head: false,
+        },
         {
           prop: 'orderCode',
           label: '订单自编码',
@@ -181,7 +192,7 @@ export default {
         {
           prop: 'operatorName',
           label: '操作员',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -373,6 +384,8 @@ export default {
     },
     inputsc(index, row) {
       console.log(index, row);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
     },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
diff --git a/src/views/warehouse/warehouseWaybill.vue b/src/views/warehouse/warehouseWaybill.vue
index b76fdf2a..0e0ed495 100644
--- a/src/views/warehouse/warehouseWaybill.vue
+++ b/src/views/warehouse/warehouseWaybill.vue
@@ -425,7 +425,7 @@ export default {
           head: false,
         },
         {
-          prop: 'destinationWarehouse',
+          prop: 'destinationWarehouseName',
           label: '目的仓',
           type: 2,
           values: '',
@@ -436,7 +436,7 @@ export default {
           head: false,
         },
         {
-          prop: 'departureWarehouse',
+          prop: 'departureWarehouseName',
           label: '发站仓',
           type: 2,
           values: '',
@@ -1128,7 +1128,7 @@ export default {
       for (let index = 0; index < this.orderlist.length; index++) {
         const element = this.orderlist[index];
         if(element.goods){
-          var o = element.goods[index]
+          var o = element.goods[0]
           if(!o.splitNum){
             this.$message({
               type: 'waring',