diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js
index dae720c6..b574b596 100644
--- a/src/api/distribution/distributionStockArticle.js
+++ b/src/api/distribution/distributionStockArticle.js
@@ -212,12 +212,15 @@ export const selectDiscussStockArticleInfoList = (current, size, params) => {
   })
 }
 
-export const selectUpdateAvailableStockArticle = (id) => {
+export const selectUpdateAvailableStockArticle = (current, size, id,params) => {
   return request({
     url: '/api/logpm-distribution/reservation/selectUpdateAvailableStockArticle',
     method: 'get',
     params: {
-      id
+      ...params,
+      current,
+      size,
+      id,
     }
   })
 }
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index b09f2cda..13d9dba8 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -133,6 +133,7 @@
           </el-pagination>
         </div>
       </el-row>
+
       <!-- 表单模块 -->
       <el-dialog :title="title"
                  v-model="box"
@@ -185,16 +186,16 @@
             </el-col>
             <el-col :span="12" v-if="!allocation">
               <el-form-item label="货  区:" prop="goodsAreaId"  label-width="100px">
-                <el-select v-model="form.goodsAreaId" clearable  placeholder="请选择货区" style="width: 88%;">
-                  <el-option
-                    v-for="item in optioner"
-                    :key="item.id"
-                    :label="item.headline"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
-                <!--                <el-cascader   :options="optioner" clearable style="width: 88%" v-model="form.goodsAreaInfo"  :show-all-levels="false">-->
-                <!--                </el-cascader>-->
+                  <el-cascader :options="optioner"  style="width: 80%"  v-model="form.goodsAreaId"   placeholder="请选择货区" :show-all-levels="false"  clearable />
+
+                  <!--                <el-select v-model="form.goodsAreaId" clearable  placeholder="请选择货区" style="width: 88%;">-->
+<!--                  <el-option-->
+<!--                    v-for="item in optioner"-->
+<!--                    :key="item.id"-->
+<!--                    :label="item.headline"-->
+<!--                    :value="item.id">-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
               </el-form-item>
             </el-col>
             <!--            <el-col :span="12">-->
@@ -618,11 +619,11 @@ 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=>{
@@ -632,18 +633,34 @@ export default {
       })
     },
     // 格式化数据，递归将空的children置为undefined
-    formatCascaderData(data)
-    {
+    formatCascaderData(data){
+      console.log("------------>",data);
+      const a =[];
       for (var i = 0; i < data.length; i++) {
-        if (null==data[i].children ||data[i].children.length < 1) {
-          // children若为空数组，则将children设为undefined
-          delete data[i].leaf;
-        } else {
-          // children若不为空数组，则继续 递归调用 本方法
-          this.formatCascaderData(data[i].children)
+        let b =
+          {
+            value:data[i].id,
+            label:data[i].name,
+            children:[]
+          }
+        if (!!data[i].children && data[i].children.length > 1) {
+          let k = data[i].children;
+          let j=[];
+          k.forEach(item=>{
+            let c={
+              value:item.id,
+              label:item.headline,
+            }
+            j.push(c);
+          })
+          //处理货区
+          b.children=j;
         }
+
+        a.push(b);
       }
-      return data
+      console.log("--------------->a".a);
+      return a
     },
     searchHide () {
       this.search = !this.search;
@@ -704,6 +721,11 @@ export default {
             if (!this.form.id) {
               console.log("this.form>>>>>>>", this.form);
               console.log("this.optioner>>>>>>>", this.optioner);
+              if (!!this.form.goodsAreaId && this.form.goodsAreaId.length > 1){
+                    //这里需要截取最后一个ID
+                    let a = this.form.goodsAreaId;
+                this.form.goodsAreaId = a[a.length - 1];
+              }
               this.optioner.map(item => {
                 if (item.id == this.form.goodsAreaId) {
                   this.form.goodsAreaName = item.headline
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 81949be2..88ba0cda 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -185,6 +185,7 @@
                             </template>
                         </el-table-column>
                     </el-table>
+
                 </el-tab-pane>
 
                 <el-tab-pane label="库存品">
@@ -285,6 +286,23 @@
                         </el-table-column>
                     </template>
                 </el-table>
+                <el-row>
+                    <div class="avue-crud__pagination" style="width: 100%">
+                        <!-- 分页模块 -->
+                        <el-pagination
+                                align="right"
+                                background
+                                @size-change="sizeOrderChange"
+                                @current-change="currentOrderChange"
+                                :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-form-item style="margin-left: 45%;margin-top: 5px">
                     <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder">提交(订单)</el-button>
                     <el-button icon="el-icon-circle-close" @click="orderShow=false">返 回</el-button>
@@ -679,50 +697,51 @@
           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 = [];
-              }
-            });
-          })
-
+          // 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 {
-          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);
+          // 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.loading = false;
         console.log("this.stockArticleInfo------------->",this.stockArticleInfo);
@@ -976,16 +995,22 @@
         let page = this.page;
         this.query.typeService = 2;
         this.query.genre = 1;
-        selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          data.records.forEach(item => {
-            item.reservationNum = item.handQuantity;
-          });
-          this.page.total = data.total;
-          this.stockArticleInfo = data.records;
-          this.loading = false;
-          // this.selectionClear();
-        });
+        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 => {
+        //     item.reservationNum = item.handQuantity;
+        //   });
+        //   this.page.total = data.total;
+        //   this.stockArticleInfo = data.records;
+        //   this.loading = false;
+        //   // this.selectionClear();
+        // });
       },
       searchStockList() {
         let params = {};
@@ -1266,15 +1291,82 @@
         this.query = {};
         // this.$refs.table.clearSelection();
       },
-      currentChange(currentPage) {
+      currentOrderChange(currentPage) {
         this.page.currentPage = currentPage;
-        this.onLoad(this.page);
+        if (this.reservationId){
+          this.onLoadEditOrder(this.page,this.reservationId);
+        }else {
+          this.onLoadOrder(this.page);
+        }
       },
-      sizeChange(pageSize) {
+      sizeOrderChange(pageSize) {
         this.page.pageSize = pageSize;
-        this.onLoad(this.page);
+        if (this.reservationId){
+          this.onLoadEditOrder(this.page,this.reservationId);
+
+        }else {
+
+          this.onLoadOrder(this.page);
+        }
       },
-      onLoad(page, params = {}) {
+      onLoadEditOrder(arg,params = {}){
+        const  page  = arg;
+        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.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.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 => {
+          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.page.total = data.total;
+          });
+          this.orderList = [];
+
+        });
+      },
+
+      onLoad() {
         // this.loading = true;
         this.form.deliveryType = '2';
         this.form.deliveryWay = '10';
diff --git a/src/views/distribution/reservation/reservationSubmitFrom.vue b/src/views/distribution/reservation/reservationSubmitFrom.vue
index ac0c35f8..f972cc4d 100644
--- a/src/views/distribution/reservation/reservationSubmitFrom.vue
+++ b/src/views/distribution/reservation/reservationSubmitFrom.vue
@@ -1082,16 +1082,16 @@
         });
         // this.form.stockArticleList = this.packageList;
         console.log('>>>>>>>>', this.form);
-        if (this.reservationId) {
-          this.form.id = this.reservationId;
-          update(this.form).then(() => {
-            this.$router.go(-1);
-            this.$message({
-              type: 'success',
-              message: '操作成功!'
-            });
-          });
-        } else {
+        // if (this.reservationId) {
+        //   this.form.id = this.reservationId;
+        //   update(this.form).then(() => {
+        //     this.$router.go(-1);
+        //     this.$message({
+        //       type: 'success',
+        //       message: '操作成功!'
+        //     });
+        //   });
+        // } else {
           add(this.form).then(() => {
             this.$router.go(-1);
             this.$message({
@@ -1099,7 +1099,7 @@
               message: '操作成功!'
             });
           });
-        }
+        // }
       },
       handleClose(done) {
         this.$confirm('确认关闭？')
diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index 0cb07ded..ad30feff 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -436,7 +436,18 @@ export default {
         },
         {
           prop: 'signingStatusAll',
-          label: '签收状态',
+          label: '司机签收状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'signingStatusAll',
+          label: '文员复核状态',
           type: 2,
           values: '',
           width: '150',
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 813c206a..a6df2a4a 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -128,7 +128,7 @@
                 >
                     <template #default="slotProps">
                         <el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
-                        <el-button size="small" @click="handleSign(slotProps.scope.row)">签 收</el-button>
+                        <el-button size="small" @click="handleSign(slotProps.scope.row)">复 核</el-button>
                         <!--            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
                         <!--              >Delete</el-button>-->
                     </template>
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index d76ed7d6..d039028c 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -975,6 +975,7 @@
           });
           console.log('^^^^^^^^', row);
         }
+
         this.loading = false;
         this.isShowPackage = true;
       },
@@ -1489,7 +1490,7 @@
             console.log("----------------------------->",res.data.data);
             const data = res.data.data;
             // this.page.total = data.total;
-            this.stockArticleInfo = data;
+            this.stockArticleInfo = data.records;
             this.stockArticleInfo.forEach((item, index) => {
               if (this.orderData) {
                 this.orderData.forEach(a => {
@@ -1503,6 +1504,8 @@
                 });
               }
             });
+            this.page.total = data.total;
+
           });
           this.query = {};
         } else {
@@ -1514,9 +1517,9 @@
             this.stockArticleInfo.forEach((item, index) => {
                 this.checkOrder(item,index)
             });
+            this.page.total = data.total;
           });
         }
-
         this.loading = false;
         this.query = {};
         // this.selectionClear();