diff --git a/src/option/distribution/arteryDistrilbutionBillLadingList.js b/src/option/distribution/arteryDistrilbutionBillLadingList.js
index 39a741cd..6ca09a5c 100644
--- a/src/option/distribution/arteryDistrilbutionBillLadingList.js
+++ b/src/option/distribution/arteryDistrilbutionBillLadingList.js
@@ -4,6 +4,7 @@ export const columnList = [
     prop: '',
     label: '复选框',
     type: 0,
+    checkarr: [],
     width: 55,
     fixed: true,
   },
@@ -12,6 +13,7 @@ export const columnList = [
     label: '序号',
     type: 12,
     values: '',
+    checkarr: [],
     width: 55,
     fixed: true,
   },
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 4364433a..72af7f69 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -392,11 +392,11 @@
       <el-dialog
         :title="title"
         v-model="box"
-        width="50%"
+        width="70%"
         :before-close="beforeClose"
         append-to-body
       >
-        <el-table
+        <!-- <el-table
           ref="table"
           v-loading="loading"
           @selection-change="selectionChange"
@@ -407,7 +407,6 @@
         >
           <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
           <template v-for="(item, index) in wrapoption.column">
-            <!-- table字段 -->
             <el-table-column
               v-if="item.hide !== true"
               :prop="item.prop"
@@ -416,17 +415,32 @@
               :width="item.width"
               :key="index"
             >
-              <!--                            :align="center"-->
             </el-table-column>
 
-            <!--            <span>操作</span>-->
           </template>
           <el-table-column fixed="right" label="操作" width="100">
             <template #default="scope">
               <el-button size="small" @click="handleQRCode(scope.row)">查看二维码</el-button>
             </template>
           </el-table-column>
-        </el-table>
+        </el-table> -->
+
+        <tablecmt
+          :columnList="wrapoption.column"
+          :tableData="wrapdata"
+          :loading="loading"
+          @inputTxt="winputsc"
+          @timeCheck="timesc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <el-button text size="small" @click="handleQRCode(scope.row)">查看二维码</el-button>
+            </template>
+          </template>
+        </tablecmt>
+
         <div class="avue-crud__pagination" style="width: 100%">
           <!-- 分页模块 -->
           <el-pagination
@@ -2316,60 +2330,106 @@ export default {
         index: true,
         border: true,
         selection: true,
+        query: {},
         column: [
           {
-            label: '运单号',
-            prop: 'waybillNumber',
-            search: true,
-            width: '100px',
+            label: '序号',
+            prop: '',
+            type: 12,
+            values: '',
+            width: '55',
+            checkarr: [],
+            fixed: true,
           },
           {
-            label: '服务号',
-            prop: 'serviceNumber',
-            search: true,
-            width: '100px',
+            label: '运单号',
+            prop: 'waybillNumber',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
           },
           {
-            search: true,
             label: '订单自编号',
             prop: 'orderCode',
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
           },
           {
             label: '包条码',
             prop: 'orderPackageCode',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+          },
+          {
+            label: '服务号',
+            prop: 'serviceNumber',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '仓库',
             prop: 'warehouse',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '发站仓',
             prop: 'sendWarehouseName',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '目的仓',
             prop: 'acceptWarehouseName',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '发货时间',
             prop: 'waybillNumber',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '入库时间',
             prop: 'warehouseEntryTimeEnd',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           // {
           //   label: '客户车次号',
@@ -2386,26 +2446,42 @@ export default {
           {
             label: '入库车次',
             prop: 'trainNumber',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '一级品类',
             prop: 'firsts',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '二级品类',
             prop: 'second',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '三级品类',
             prop: 'thirdProduct',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           // {
           //   label: '物料编号',
@@ -2423,38 +2499,62 @@ export default {
           {
             label: '包件状态',
             prop: 'orderPackageStatusName',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '冻结状态',
             prop: 'orderPackageFreezeStatusName',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '上架状态',
             prop: 'orderPackageGroundingStatusName',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '备货状态',
             prop: 'orderPackageStockupStatusName',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '预约状态',
             prop: 'orderPackageReservationStatusName',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '装车状态',
             prop: 'orderPackageLoadingStatusName',
-            search: true,
-            width: '100px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           // {
           //   label: '配送计划状态',
@@ -2471,8 +2571,12 @@ export default {
           {
             label: '装车方式',
             prop: 'scanStatus',
-            search: true,
-            width: '150px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           // {
           //   label: '装车扫描人员',
@@ -2483,20 +2587,41 @@ export default {
           {
             label: '计划装车人',
             prop: 'driverName',
-            search: true,
-            width: '150px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '实际装车人',
             prop: 'scanUser',
-            search: true,
-            width: '150px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
             label: '签收扫描时间',
             prop: 'signingTime',
-            search: true,
-            width: '150px',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            label: '操作',
+            prop: 'signingTime',
+            type: 6,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: 'right',
           },
 
           // {
@@ -2926,7 +3051,6 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-
     inputsc() {},
     inputscOrder(index, row) {
       console.log('index', index);
@@ -3317,10 +3441,10 @@ export default {
     },
     handleSign(row) {
       console.log('签收>>>>>>>>>>', row);
-      console.log(row.id,'复合签收');
-      $_getDetail({id:row.id}).then(res=>{
-        console.log(res,'复合返回值');
-      })
+      console.log(row.id, '复合签收');
+      $_getDetail({ id: row.id }).then(res => {
+        console.log(res, '复合返回值');
+      });
       this.signtitle = '复核签收';
       // this.view = true;
       this.signform = row;
@@ -3370,14 +3494,16 @@ export default {
     getWrapdetails(page) {
       let params = {};
       params.reservationId = this.wid;
-      getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
-        res => {
-          console.log('查看>>>>>>>', res.data.data);
-          const data = res.data.data;
-          this.wrapdata = data.records;
-          this.wpage.total = data.total;
-        }
-      );
+      getWrapdetail(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.wrapoption.query)
+      ).then(res => {
+        console.log('查看>>>>>>>', res.data.data);
+        const data = res.data.data;
+        this.wrapdata = data.records;
+        this.wpage.total = data.total;
+      });
     },
 
     handleDelete() {
@@ -3448,6 +3574,10 @@ export default {
       this.wpage.pageSize = pageSize;
       this.getWrapdetails(this.wpage);
     },
+    winputsc(index, row) {
+      this.wrapoption.query[row.prop] = index;
+      this.getWrapdetails(this.wpage);
+    },
     pcurrentChange(currentPage) {
       this.packpage.currentPage = currentPage;
       this.handlePackage(this.packpage);
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
index 71656729..a334d27b 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
@@ -42,24 +42,27 @@
           <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
             <el-button type="primary" icon="el-icon-edit" @click="handleEdit">编 辑</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="handleAddDistrilbution"
-              >添加提货数据</el-button
-            >
-            <el-button type="primary" icon="el-icon-check" @click="handleDistributionConfirm"
-              >提货完成</el-button
-            >
-            <el-button type="primary" icon="el-icon-close" @click="handleCloseConfirm"
-              >取消完成</el-button
-            >
-            <el-button type="primary" icon="el-icon-close" @click="handleDistributionClose"
-              >取消提货</el-button
-            >
-            <el-button type="primary" icon="el-icon-check" @click="handleSettleAccounts"
-              >结 算</el-button
-            >
-            <el-button type="primary" icon="el-icon-close" @click="handleCloseSettleAccounts"
-              >取消结算</el-button
-            >
+            <el-button type="primary" icon="el-icon-plus" @click="handleAddDistrilbution">
+              添加提货数据
+            </el-button>
+            <el-button type="primary" icon="Check" @click="handleEditBillladingStatus(1)">
+              开始提货
+            </el-button>
+            <el-button type="primary" icon="el-icon-close" @click="handleEditBillladingStatus(6)">
+              取消提货
+            </el-button>
+            <el-button type="primary" icon="el-icon-check" @click="handleEditBillladingStatus(2)">
+              提货完成
+            </el-button>
+            <el-button type="primary" icon="el-icon-close" @click="handleEditBillladingStatus(3)">
+              取消完成
+            </el-button>
+            <el-button type="primary" icon="el-icon-check" @click="handleEditBillladingStatus(4)">
+              结 算
+            </el-button>
+            <el-button type="primary" icon="el-icon-close" @click="handleEditBillladingStatus(5)">
+              取消结算
+            </el-button>
             <!-- <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
               >导出
             </el-button> -->
@@ -73,48 +76,44 @@
         </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">
-            <template v-if="slotProps.scope.column.label === '提货批次'">
-              <el-text size="small" text @click="handleLike(slotProps.scope)">{{
-                slotProps.scope.row.pickupBatch
-              }}</el-text>
-              <el-text
-                type="primary"
-                text
-                icon="el-icon-edit"
-                @click="handleShowDetail(slotProps.scope)"
-                >明 细</el-text
-              >
-            </template>
+      <!-- 列表模块 -->
+      <tablecmt
+        :columnList="columnList"
+        :tableData="data"
+        :loading="loading"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '提货批次'">
+            <el-text size="small" text @click="handleLike(slotProps.scope)">{{
+              slotProps.scope.row.pickupBatch
+            }}</el-text>
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-edit"
+              @click="handleShowDetail(slotProps.scope)"
+              >明 细</el-text
+            >
+          </template>
 
-            <template v-if="slotProps.scope.column.label === '操作'">
-              <el-text size="small" text @click="handleLike(slotProps.scope)">查 看</el-text>
-              <el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)"
-                >明 细</el-text
-              >
-            </template>
+          <template v-if="slotProps.scope.column.label === '操作'">
+            <el-text size="small" text @click="handleLike(slotProps.scope)">查 看</el-text>
+            <el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)"
+              >明 细</el-text
+            >
           </template>
-        </tablecmt>
-      </el-row>
+        </template>
+      </tablecmt>
 
       <!-- 统计 -->
-      <el-row>
+      <!-- <el-row>
         <div>选择数: , 运单数: , 件数: , 重量: , 体积: , 提货费: ,</div>
         <div>总计: 总数: , 运单数: , 件数: , 重量: , 体积: , 提货费: ,</div>
-      </el-row>
+      </el-row> -->
 
       <!-- 分页模块 -->
       <el-row class="el-fy">
@@ -305,7 +304,6 @@
               :loading="loadingObj.oldListLoading"
               @inputTxt="inputsc"
               @timeCheck="timesc"
-              @btnCheck="btnsc"
               @selectCheck="selectsc"
               @selection="selectionChange"
             >
@@ -348,7 +346,6 @@
               :loading="loadingObj.oldListLoading"
               @inputTxt="inputsc"
               @timeCheck="timesc"
-              @btnCheck="btnsc"
               @selectCheck="selectsc"
               @selection="selectionChange"
             >
@@ -748,7 +745,6 @@
           :loading="loading"
           @inputTxt="inputsc"
           @timeCheck="timesc"
-          @btnCheck="btnsc"
           @selectCheck="selectsc"
           @selection="selectionChange"
         >
@@ -782,7 +778,7 @@
   ></edittablehead>
 </template>
 
-<script>
+<script lang="ts">
 import {
   remove,
   getListOwn,
@@ -1063,9 +1059,6 @@ export default {
     selectionsc(value) {
       console.log(value);
     },
-    btnsc(index, row) {
-      console.log(index, row);
-    },
     selectsc(index, row) {
       console.log('index :>> ', index);
       console.log('row :>> ', row);
@@ -1117,20 +1110,20 @@ export default {
     },
     init() {
       this.height = this.setPx(document.body.clientHeight - 160);
-      //字典
-      getDictionaryBiz('delivery_cost').then(res => {
-        this.clientType = res.data.data;
-      });
-      //字典
-      getDictionaryBiz('certificate_type').then(res => {
-        this.certificateType = res.data.data;
-        this.$functions.checkcColumnList('certificateTypeName', this.columnList).checkarr =
-          res.data.data.map(item => {
-            item.value = item.dictKey;
-            item.label = item.dictValue;
-            return item;
-          });
-      });
+      // //字典
+      // getDictionaryBiz('delivery_cost').then(res => {
+      //   this.clientType = res.data.data;
+      // });
+      // //字典
+      // getDictionaryBiz('certificate_type').then(res => {
+      //   this.certificateType = res.data.data;
+      //   this.$functions.checkcColumnList('certificateTypeName', this.columnList).checkarr =
+      //     res.data.data.map(item => {
+      //       item.value = item.dictKey;
+      //       item.label = item.dictValue;
+      //       return item;
+      //     });
+      // });
     },
     checkcColumnList(prop, columnList) {
       return columnList.find(item => item.prop === prop);
@@ -1182,6 +1175,34 @@ export default {
         });
       });
     },
+    /** 编辑提货数据的状态 */
+    handleEditBillladingStatus(type: number) {
+      if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
+
+      if (this.selectionList.length > 1) return this.$message.error('暂时只支持单条数据操作');
+
+      this.$confirm('确定将选择数据提货完成?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'success',
+      })
+        .then(() => {
+          return postUpdateBillladingStatus({
+            id: this.selectionList[0].id,
+            type,
+          });
+        })
+        .then(() => {
+          // 清空复选框
+          this.selectionClear();
+          // 刷新表格
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
     /** 开启添加提货数据弹窗 */
     handleAddDistrilbution() {
       if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
@@ -1431,15 +1452,16 @@ export default {
         this.loading = true;
 
         // 请求页面数据
-        const res = await postPageList(page, { ...this.query, ...params });
+        const res = await postPageList({ ...page, ...this.query, ...params });
 
         console.log('res :>> ', res);
         const { code, data } = res.data;
         if (code !== 200) return;
 
         this.data = data.records;
-        this.page.total = res.total;
+        this.page.total = data.total;
       } catch (error) {
+        console.log('error :>> ', error);
       } finally {
         this.loading = false;
       }
@@ -1499,124 +1521,14 @@ export default {
       //   this.selectionClear();
       // });
     },
-    async getMenDian(row, num) {
-      // console.log("值阿德飒飒的",row);
-      if (num == 1) {
-        const obj = this.options.find(item => item.value === row);
-        console.log('obj>>>>>>>>>>>', obj);
-        this.options = [
-          {
-            key: obj.value,
-            value: obj.value,
-            label: obj.label,
-            code: obj.code,
-          },
-        ];
-        this.form.customerCode = obj.code;
-      } else {
-        const obj = this.options.find(item => item.value === row);
-        console.log('obj>>>>>>>>>>>', obj);
-        this.options = [
-          {
-            key: obj.value,
-            value: obj.value,
-            label: obj.label,
-            code: obj.code,
-          },
-        ];
-        this.form.clientId = obj.value;
-      }
-      this.form.serviceType = null;
-      let aa = '';
-      this.options.some(i => {
-        // console.log(">><><><<>",i);
-        if (i.value == row) {
-          this.form.customerName = i.label;
-          this.form.clientCode = i.code;
-          //查询客户服务类型
-          aa = i.value;
-        }
-      });
-      let bu = await getListName(this.page.pageNum, this.page.pageSize, {
-        clientId: aa,
-        typeService: '3',
-      });
-      // console.log("bububu",bu.data.data.records);
-      if (bu.data.data?.records.length > 0) {
-        this.form.serviceType = bu.data.data.records[0].mold;
-      }
-      let cl = await getListClient(this.page.pageNum, this.page.pageSize, { pid: row });
-      // console.log(">>>>",cl.data.data.records);
-      this.shop = [];
-      cl.data.data.records.forEach(i => {
-        let st = {
-          label: i.clientName,
-          value: i.id,
-        };
-        this.shop.push(st);
-      });
-    },
+    async getMenDian(row, num) {},
     //客户编号
     async remoteCodeMethod(query) {
-      if (query) {
-        // this.loading = true;
-        this.options = [];
-        this.form.clientId = null;
-        let cl = await getListClient(this.page.pageNum, this.page.pageSize, {
-          clientCode: query,
-        });
-        console.log('客户信息1234>>>>', cl.data.data.records);
-        cl.data.data.records.forEach(i => {
-          let st = {
-            label: i.clientName,
-            value: i.id,
-            code: i.clientCode,
-          };
-          this.options.push(st);
-        });
-        // setTimeout(() => {
-        //   this.loading = false
-        //   this.loading = this.list.filter((item) => {
-        //     return item.label.toLowerCase().includes(query.toLowerCase())
-        //   })
-        // }, 200)
-      } else {
-        this.options = [];
-      }
+      console.log('query :>> ', query);
     },
   },
 };
 </script>
-<style scope lang="scss">
-.foot {
-  position: fixed;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 999;
-  height: 60px;
-}
-.foot .dialog-footer {
-  margin-bottom: 130px;
-  text-align: center;
-}
-.ca .el-radio__inner {
-  top: -18px;
-  left: -19px;
-  border-radius: 0;
-  border: 0;
-  width: 170px;
-  height: 34px;
-  background-color: transparent;
-  cursor: pointer;
-  box-sizing: border-box;
-  position: absolute;
-}
-
-.ca .el-radio__input.is-checked .el-radio__inner {
-  background: transparent;
-}
-</style>
 
 <style scoped lang="scss">
 /* .el-input {
@@ -1663,7 +1575,6 @@ export default {
   flex-direction: column;
 }
 .el-fy {
-  flex: 1;
   display: flex;
   align-items: flex-end;
 }
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 35165a51..5de97d6d 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -90,95 +90,95 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20" class="toscontent">
-          <el-col :span="24">
-            <el-form-item label="物品明细" prop="certificateType">
-              <el-tabs type="border-card" @tab-click="handleChlickTab" style="width: 100%">
-                <el-tab-pane label="定制品">
+
+        <el-form-item label-width="0" prop="certificateType">
+          <el-tabs @tab-click="handleChlickTab" style="width: 100%">
+            <el-tab-pane label="定制品">
+              <el-button
+                type="primary"
+                text
+                icon="el-icon-view"
+                @click="handleAddOrder"
+                v-if="orderAdd"
+                >新 增</el-button
+              >
+              <tablecmt
+                :columnList="columnListedit"
+                :tableData="dataList"
+                :loading="loading"
+                @inputTxt="inputsc"
+                @timeCheck="timesc"
+                @btnCheck="btnsc"
+                @selectCheck="selectsc"
+                @selection="selectionChange"
+              >
+                <template #default="slotProps">
                   <el-button
+                    v-if="slotProps.scope.row.isZero === '1'"
                     type="primary"
-                    link
-                    icon="el-icon-view"
-                    @click="handleAddOrder"
-                    v-if="orderAdd"
-                    >新 增</el-button
+                    text
+                    icon="el-icon-delete"
+                    @click.stop="handleZeroOrder(slotProps.scope.row)"
+                    >录入预约数量</el-button
                   >
-                  <tablecmt
-                    :columnList="columnListedit"
-                    :tableData="dataList"
-                    :loading="loading"
-                    @inputTxt="inputsc"
-                    @timeCheck="timesc"
-                    @btnCheck="btnsc"
-                    @selectCheck="selectsc"
-                    @selection="selectionChange"
+                  <el-button
+                    v-if="
+                      slotProps.scope.row.isZero === '1' && Number(this.$route.query.type) !== 2
+                    "
+                    type="primary"
+                    text
+                    icon="el-icon-delete"
+                    @click.stop="handleStockZeroOrder(slotProps.scope.row)"
+                    >维护在库数量</el-button
                   >
-                    <template #default="slotProps">
-                      <el-button
-                        v-if="slotProps.scope.row.isZero === '1'"
-                        type="primary"
-                        text
-                        icon="el-icon-delete"
-                        @click.stop="handleZeroOrder(slotProps.scope.row)"
-                        >录入预约数量</el-button
-                      >
-                      <el-button
-                        v-if="
-                          slotProps.scope.row.isZero === '1' && Number(this.$route.query.type) !== 2
-                        "
-                        type="primary"
-                        text
-                        icon="el-icon-delete"
-                        @click.stop="handleStockZeroOrder(slotProps.scope.row)"
-                        >维护在库数量</el-button
-                      >
-                      <el-button
-                        type="primary"
-                        text
-                        icon="el-icon-delete"
-                        @click="rowOrder(slotProps.scope.row)"
-                        >移除</el-button
-                      >
-                      <!-- 零担订单时不能选择包件 -->
-                      <el-button
-                        v-if="Number(slotProps.scope.row.isZero) !== 1"
-                        type="primary"
-                        @click="handleChooseOrder(slotProps.scope.row)"
-                        text
-                        icon="el-icon-delete"
-                        >选择包件</el-button
-                      >
-                    </template>
-                  </tablecmt>
-                </el-tab-pane>
-                <el-tab-pane label="库存品">
-                  <el-button type="primary" text icon="el-icon-view" @click="handleAddView(row)"
-                    >新增</el-button
+                  <el-button
+                    type="primary"
+                    text
+                    icon="el-icon-delete"
+                    @click="rowOrder(slotProps.scope.row)"
+                    >移除</el-button
                   >
-                  <tablecmt
-                    :columnList="columnStock"
-                    :tableData="data"
-                    :loading="loading"
-                    @inputTxt="inputsc"
-                    @timeCheck="timesc"
-                    @btnCheck="btnsc"
-                    @selectCheck="selectsc"
-                    @selection="selectionChange"
+                  <!-- 零担订单时不能选择包件 -->
+                  <el-button
+                    v-if="Number(slotProps.scope.row.isZero) !== 1"
+                    type="primary"
+                    @click="handleChooseOrder(slotProps.scope.row)"
+                    text
+                    icon="el-icon-delete"
+                    >选择包件</el-button
                   >
-                    <template #default="slotProps">
-                      <el-text
-                        type="primary"
-                        text
-                        icon="el-icon-delete"
-                        @click="rowStock(slotProps.scope.row)"
-                        >移除</el-text
-                      >
-                    </template>
-                  </tablecmt>
-                </el-tab-pane>
-              </el-tabs>
-            </el-form-item>
-          </el-col>
+                </template>
+              </tablecmt>
+            </el-tab-pane>
+            <el-tab-pane label="库存品">
+              <el-button type="primary" text icon="el-icon-view" @click="handleAddView(row)"
+                >新 增</el-button
+              >
+              <tablecmt
+                :columnList="columnStock"
+                :tableData="data"
+                :loading="loading"
+                @inputTxt="inputsc"
+                @timeCheck="timesc"
+                @btnCheck="btnsc"
+                @selectCheck="selectsc"
+                @selection="selectionChange"
+              >
+                <template #default="slotProps">
+                  <el-text
+                    type="primary"
+                    text
+                    icon="el-icon-delete"
+                    @click="rowStock(slotProps.scope.row)"
+                    >移除</el-text
+                  >
+                </template>
+              </tablecmt>
+            </el-tab-pane>
+          </el-tabs>
+        </el-form-item>
+
+        <el-row :gutter="20" class="toscontent">
           <el-col v-if="!view" :span="8">
             <el-form-item label="提货证件" label-width="120px">
               <el-upload
@@ -333,9 +333,10 @@
       <!--      &lt;!&ndash; 表单按钮 &ndash;&gt; v-if="!view || viewSC"-->
       <div class="foot" :disabled="view">
         <div class="dialog-footer">
-          <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
-            >提 交</el-button
-          >
+          <el-button type="primary" icon="CircleClose">返 回</el-button>
+          <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')">
+            提 交
+          </el-button>
           <!--          <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>-->
         </div>
       </div>
@@ -2138,13 +2139,12 @@ export default {
       let sts = false;
       let ad = false;
       let consigneePerson = '';
-      let consigneeMobile = '';
       this.selectionList.some(i => {
         if (this.dataList.length > 0) {
           let w = this.dataList.find(c => {
             console.log('i :>> ', i);
             console.log('c :>> ', c);
-            return c.consigneeMobile == i.consigneeMobile && c.consigneePerson == i.consigneePerson;
+            return c.consigneePerson == i.consigneePerson;
           });
           if (!w) {
             ad = true;
@@ -2154,11 +2154,10 @@ export default {
           st = true;
           this.$message.warning(i.orderCode + '已预约，请勿重复预约！！！');
         }
-        if (!consigneePerson && !consigneeMobile) {
-          consigneeMobile = i.consigneeMobile;
+        if (!consigneePerson) {
           consigneePerson = i.consigneePerson;
         } else {
-          if (consigneeMobile != i.consigneeMobile && consigneePerson != i.consigneePerson) {
+          if (consigneePerson != i.consigneePerson) {
             sts = true;
           }
         }
@@ -2791,6 +2790,9 @@ export default {
     },
     //库存品
     handleAddView(row) {
+      if (this.dataList.length === 0) {
+        return this.$message.warning('请选择最少一条定制品');
+      }
       this.selectionList = [];
       this.dialogFormVisible = true;
       this.onLoadList(this.pageStock);
@@ -3118,12 +3120,10 @@ export default {
 .el-input-number {
   width: 100%;
 }
-:deep(.maboxhi) {
-  height: 100% !important;
-}
+
 .toscontent {
   :deep(.el-form-item__content) {
-    height: 400px;
+    height: 200px;
     overflow-y: scroll;
     align-items: flex-start;
   }