修复部分干线bug

src/api/waybill/orderPackageListDetails.js

@@ -43,3 +43,14 @@ export const getShowAdvancePackgeCode = params => {
     params,
   });
 };
+
+/**
+ * 批量删除
+ */
+export const postDeleteAdvanceDetail = params => {
+  return request({
+    url: '/api/logpm-trunkline/advanceDetail/deleteAdvanceDetail',
+    method: 'post',
+    params,
+  });
+};

src/option/distribution/VehicleArrivalManagement.js

@@ -17,7 +17,7 @@ export const columnList = [
   {
     prop: 'carsNo',
     label: '批次号',
-    type: 6,
+    type: 13,
     values: '',
     width: '150',
     checkarr: [],
@@ -28,11 +28,11 @@ export const columnList = [
   {
     prop: 'carsLineName',
     label: '路线',
-    type: 6,
+    type: 13,
     values: '',
     width: '200',
     checkarr: [],
-    fixed: false,
+    fixed: true,
     sortable: true,
   },
   {
@@ -57,6 +57,17 @@ export const columnList = [
     sortable: true,
     isshowSummary: true,
   },
+  {
+    prop: 'NumberOfPiecesInTheCar',
+    label: '在车件数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isshowSummary: true,
+  },
   {
     prop: 'unloadNumber',
     label: '卸车件数',

src/option/distribution/VehicleStowage.js

@@ -57,17 +57,17 @@ export const columnList = [
     sortable: true,
     isshowSummary: true,
   },
-  // {
+  {
-  //   prop: 'warehouseName',
+    prop: 'NumberOfPiecesInTheCar',
-  //   label: '在车件数',
+    label: '在车件数',
-  //   type: 1,
+    type: 1,
-  //   values: '',
+    values: '',
-  //   width: '130',
+    width: '130',
-  //   checkarr: [],
+    checkarr: [],
-  //   fixed: false,
+    fixed: false,
-  //   sortable: true,
+    sortable: true,
-  //   isshowSummary: true,
+    isshowSummary: true,
-  // },
+  },
   {
     prop: 'unloadNumber',
     label: '卸车件数',

src/views/distribution/artery/TripartiteTransfer.vue

@@ -123,18 +123,12 @@
           </template>
 
           <template v-if="slotProps.scope.column.label === '操作'">
-            <el-button type="text" @click="handleShowzeroAdditionalRecording(slotProps.scope)">
+            <el-text @click="handleShowzeroAdditionalRecording(slotProps.scope)"> 删除 </el-text>
-              删除
+            <el-text @click="handleShowzeroAdditionalRecording(slotProps.scope)">
-            </el-button>
-            <el-button type="text" @click="handleShowzeroAdditionalRecording(slotProps.scope)">
               文员签收
-            </el-button>
+            </el-text>
-            <el-button type="text" @click="handleShowzeroAdditionalRecording(slotProps.scope)">
+            <el-text @click="handleShowzeroAdditionalRecording(slotProps.scope)"> 结算 </el-text>
-              结算
+            <el-text @click="handleShowTruckLoadingDetails(slotProps.scope)">装车明细</el-text>
-            </el-button>
-            <el-button type="text" @click="handleShowTruckLoadingDetails(slotProps.scope)"
-              >装车明细</el-button
-            >
           </template>
         </template>
       </tablecmt>
@@ -448,6 +442,7 @@ const details = reactive<any>({
   customerTypeOptions: [
     { value: 1, label: '商城' },
     { value: 2, label: 'C端客户' },
+    { value: '1,2', label: '商城,C端客户' },
   ],
   /** 送货方式 */
   deliveryTypeOptions: [
@@ -500,8 +495,10 @@ console.log('permission :>> ', permission);
 /** 转换码值 */
 const handleConversionCodeValue = (item, label, Arr) => {
   const codes = Arr.map(item => item.value);
+  console.log('codes :>> ', codes);
 
-  const _index = codes.indexOf(Number(item[label]));
+  let _index = codes.indexOf(Number(item[label]));
+  if (_index === -1) _index = codes.indexOf(item[label]);
   item[label + 'Name'] = _index !== -1 ? Arr[_index].label : '未知';
 };
 
@@ -522,6 +519,85 @@ onMounted(() => {
   handleSetOption('isSettlement', details.isSettlementOptions);
   handleSetOption('customerType', details.customerTypeOptions);
   handleSetOption('deliveryType', details.deliveryTypeOptions);
+
+  /**
+   * 初始化获取本地缓存的编辑隐藏的列表
+   *  固定搭配，不能更改
+   */
+  let checkListnewarr = functions.getStorage(window.location.pathname + 'checkList');
+  let flexListnewarr = functions.getStorage(window.location.pathname + 'flexList');
+  let sortlistnewarr = functions.getStorage(window.location.pathname + 'sortlist');
+  if (checkListnewarr) {
+    details.columnList.map(item => {
+      item.head = false;
+    });
+    for (const iterator of checkListnewarr) {
+      for (const item of details.columnList) {
+        if (iterator == item.label) {
+          item.head = true;
+        }
+      }
+    }
+    // checkListnewarr.map(ite => {
+    //   details.columnList.map(item => {
+    //     if (ite == item.label) {
+    //       item.head = true;
+    //     }
+    //   });
+    // });
+  } else {
+    let arr = [];
+    details.columnList.map(item => {
+      if (item.head) {
+        arr.push(item.label);
+      }
+    });
+    functions.setStorage(window.location.pathname + 'checkList', arr);
+  }
+  if (flexListnewarr) {
+    details.columnList.map(item => {
+      item.fixed = false;
+    });
+    flexListnewarr.map(ite => {
+      details.columnList.map(item => {
+        if (ite == item.label) {
+          if (item.type == 6) {
+            item.fixed = 'right';
+          } else {
+            item.fixed = true;
+          }
+        }
+      });
+    });
+  } else {
+    let arr = [];
+    details.columnList.map(item => {
+      if (item.fixed) {
+        arr.push(item.label);
+      }
+    });
+    functions.setStorage(window.location.pathname + 'flexList', arr);
+  }
+  if (sortlistnewarr) {
+    details.columnList.map(item => {
+      item.sortable = false;
+    });
+    sortlistnewarr.map(ite => {
+      details.columnList.map(item => {
+        if (ite == item.label) {
+          item.sortable = true;
+        }
+      });
+    });
+  } else {
+    let arr = [];
+    details.columnList.map(item => {
+      if (item.sortable) {
+        arr.push(item.label);
+      }
+    });
+    functions.setStorage(window.location.pathname + 'sortlist', arr);
+  }
 });
 
 /** 请求页面数据 */

src/views/distribution/artery/VehicleArrivalManagement.vue

@@ -70,7 +70,7 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-van" @click="handleStartCar">发车 </el-button>
-            <el-button type="primary" icon="el-icon-close" @click="searchReset()"
+            <el-button type="primary" icon="el-icon-close" @click="handleEndCar"
               >网点取消发车</el-button
             >
             <el-button type="primary" icon="el-icon-printer" @click="searchReset()"
@@ -151,20 +151,27 @@
                     <span>{{ item.nodeName }}</span>
                   </div>
                   <div>
-                    <span class="mr-10">运单总件数:</span>
+                    <span class="mr-10">计划总件数:</span>
-                    <span>{{ item.nodeName }}</span>
+                    <span>{{ item.planLoadingNumber || 0 }}</span>
                   </div>
                   <div>
                     <span class="mr-10">实际装车件数:</span>
-                    <span>{{ item.nodeName }}</span>
+                    <span>{{ item.realLoadingNumber || 0 }}</span>
+                  </div>
+                  <div>
+                    <span class="mr-10">卸车件数:</span>
+                    <span>{{ item.unloadNumber || 0 }}</span>
                   </div>
                   <div>
                     <span class="mr-10">操作人:</span>
-                    <span>{{ item.nodeName }}</span>
+                    <span>{{ item.arriveUserName || item.startUserName || '暂无数据' }}</span>
                   </div>
                   <div>
                     <span class="mr-10">状态:</span>
-                    <span>{{ item.nodeName }}</span>
+                    <span>{{
+                      (details.nodeStatus.find(val => val.value === Number(item.nodeStatus)) || {})
+                        .label
+                    }}</span>
                   </div>
                 </template>
                 <el-text style="margin: 0 !important">{{ item.nodeName }}</el-text>
@@ -184,14 +191,13 @@
 
           <template v-if="slotProps.scope.column.label === '操作'">
             <el-text @click="handleShowTruckLoadingDetails(slotProps.scope)">装车明细</el-text>
-            <el-button
+            <el-text
-              type="text"
+              v-if="
-              :disabled="
+                Mydata.id === slotProps.scope.row.nowWarehouseId ||
-                Mydata.id !== slotProps.scope.row.nowWarehouseId ||
+                Number(slotProps.scope.row.loadStatus) !== 40
-                Number(slotProps.scope.row.loadStatus) === 40
               "
               @click="handleEditStowage(slotProps.scope)"
-              >编辑</el-button
+              >编辑</el-text
             >
           </template>
         </template>
@@ -362,6 +368,7 @@ import {
   postFindNextNodeList,
   postUpdateLoadScanFinalNodeIdById,
   postRemoveCarsLoadScan,
+  postCancelStartCarByLoadId,
 } from '@/api/distribution/VehicleStowage';
 import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
@@ -459,6 +466,12 @@ const details = reactive({
     { value: 40, label: '终点到车' },
     { value: 100, label: '取消配载' },
   ],
+  /** 节点状态 */
+  nodeStatus: [
+    { label: '未到达', value: 0 },
+    { label: '已到车', value: 10 },
+    { label: '已发车', value: 20 },
+  ],
   packageColumnList: deepClone(packageColumnList),
   /** 配置装车目的地数据 */
   packageData: [],
@@ -485,12 +498,84 @@ const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']
 console.log('permission :>> ', permission);
 
 onMounted(() => {
-  // const timer = setTimeout(() => {
+  /**
-  //   details.listNode = document.querySelector('.maboxhi') as any;
+   * 初始化获取本地缓存的编辑隐藏的列表
-  //   details.listNode.style.transition = 'all .5s ease-out';
+   *  固定搭配，不能更改
-  //   console.log('details.listNode :>> ', details.listNode);
+   */
-  //   clearTimeout(timer);
+  let checkListnewarr = functions.getStorage(window.location.pathname + 'checkList');
-  // }, 100);
+  let flexListnewarr = functions.getStorage(window.location.pathname + 'flexList');
+  let sortlistnewarr = functions.getStorage(window.location.pathname + 'sortlist');
+  if (checkListnewarr) {
+    details.columnList.map(item => {
+      item.head = false;
+    });
+    for (const iterator of checkListnewarr) {
+      for (const item of details.columnList) {
+        if (iterator == item.label) {
+          item.head = true;
+        }
+      }
+    }
+    // checkListnewarr.map(ite => {
+    //   details.columnList.map(item => {
+    //     if (ite == item.label) {
+    //       item.head = true;
+    //     }
+    //   });
+    // });
+  } else {
+    let arr = [];
+    details.columnList.map(item => {
+      if (item.head) {
+        arr.push(item.label);
+      }
+    });
+    functions.setStorage(window.location.pathname + 'checkList', arr);
+  }
+  if (flexListnewarr) {
+    details.columnList.map(item => {
+      item.fixed = false;
+    });
+    flexListnewarr.map(ite => {
+      details.columnList.map(item => {
+        if (ite == item.label) {
+          if (item.type == 6) {
+            item.fixed = 'right';
+          } else {
+            item.fixed = true;
+          }
+        }
+      });
+    });
+  } else {
+    let arr = [];
+    details.columnList.map(item => {
+      if (item.fixed) {
+        arr.push(item.label);
+      }
+    });
+    functions.setStorage(window.location.pathname + 'flexList', arr);
+  }
+  if (sortlistnewarr) {
+    details.columnList.map(item => {
+      item.sortable = false;
+    });
+    sortlistnewarr.map(ite => {
+      details.columnList.map(item => {
+        if (ite == item.label) {
+          item.sortable = true;
+        }
+      });
+    });
+  } else {
+    let arr = [];
+    details.columnList.map(item => {
+      if (item.sortable) {
+        arr.push(item.label);
+      }
+    });
+    functions.setStorage(window.location.pathname + 'sortlist', arr);
+  }
 });
 
 /** 请求页面数据 */
@@ -509,6 +594,7 @@ const onLoad = async (params = {}) => {
     for (let item of details.data) {
       const _index = codes.indexOf(Number(item.loadStatus));
       item.loadStatusName = _index !== -1 ? details.carsStatus[_index].label : '未知';
+      item.NumberOfPiecesInTheCar = item.realLoadingNumber - item.unloadNumber;
     }
     details.page.total = data.total;
   } catch (error) {
@@ -598,6 +684,7 @@ const currentChange = () => {};
  * 固定搭配，只需要更换   columnList
  *  */
 const setnewcolum = (newarr, headarr, type) => {
+  console.log('type :>> ', type);
   if (type == 1) {
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'checkList', headarr);
@@ -798,7 +885,7 @@ const handleStartCar = async () => {
     }).then(async () => {
       const submitData = {
         loadId: details.selectionList.map(val => val.id).join(','),
-        startCarType: '1',
+        startCarType: '2',
       };
 
       const res = await postStartCarByLoadId(submitData);
@@ -816,6 +903,44 @@ const handleStartCar = async () => {
   }
 };
 
+/** 取消发车 */
+const handleEndCar = async () => {
+  if (details.selectionList.length === 0) {
+    return ElMessage({
+      message: '请选择发车数据',
+      type: 'warning',
+    });
+  } else if (details.selectionList.length !== 1) {
+    return ElMessage({
+      message: '仅支持单条数据操作',
+      type: 'warning',
+    });
+  }
+
+  ElMessageBox.confirm('确认取消发车吗?', '', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    const submitData = {
+      loadId: details.selectionList.map(val => val.id).join(','),
+      startCarType: '2',
+    };
+
+    const res = await postCancelStartCarByLoadId(submitData);
+    const { code } = res.data;
+    if (code !== 200) {
+      return;
+    }
+    ElMessage({
+      type: 'success',
+      message: '取消成功',
+    });
+
+    onLoad();
+  });
+};
+
 /** 开启弹窗 */
 const handleOpenConfiguration = (type: 'one' | 'batch', data) => {
   if (type === 'batch' && details.packageSelectedData.length === 0)

src/views/distribution/artery/VehicleStowage.vue

@@ -122,10 +122,18 @@
                     <span class="mr-10">网点:</span>
                     <span>{{ item.nodeName }}</span>
                   </div>
+                  <div>
+                    <span class="mr-10">计划装车件数:</span>
+                    <span>{{ item.planLoadingNumber || 0 }}</span>
+                  </div>
                   <div>
                     <span class="mr-10">装车件数:</span>
                     <span>{{ item.realLoadingNumber || 0 }}</span>
                   </div>
+                  <div>
+                    <span class="mr-10">卸车件数:</span>
+                    <span>{{ item.unloadNumber || 0 }}</span>
+                  </div>
                   <div>
                     <span class="mr-10">操作人:</span>
                     <span>{{ item.arriveUserName || item.startUserName || '暂无数据' }}</span>
@@ -605,12 +613,15 @@ const onLoad = async (params = {}) => {
     const res = await postloadCarsPageList(details.page, { ...details.query, ...params });
     const { code, data } = res.data;
     if (code !== 200) return;
-    details.data = data.records.map(val => {
+    details.data = data;
-      val.loadStatusName = carStateDictionaries.find(
+
-        item => Number(val.loadStatus) === item.code
+    for (let item of details.data) {
+      item.loadStatusName = item.loadStatusName = carStateDictionaries.find(
+        val => Number(item.loadStatus) === val.code
       ).label;
-      return val;
+      item.NumberOfPiecesInTheCar = item.realLoadingNumber - item.unloadNumber;
-    });
+    }
+
     details.page.total = data.total;
   } catch (error) {
     console.log('error :>> ', error);

src/views/distribution/inventory/BookingNote.vue

@@ -950,7 +950,7 @@
             <el-button type="primary" icon="el-icon-position" @click="searchReset()">
               审 核</el-button
             >
-            <el-button type="primary" icon="el-icon-edit" @click="searchReset()"> 修 改</el-button>
+            <el-button type="primary" icon="el-icon-edit" @click="handleEdit"> 修 改</el-button>
             <el-button type="primary" icon="el-icon-printer" @click="searchReset()">
               打 印</el-button
             >
@@ -1733,6 +1733,34 @@ const back = () => {
   $store.commit('DEL_TAG_CURRENT');
   $router.back();
 };
+
+const handleEdit = () => {
+  if (Number($route.query.waybillType) === 1) {
+    // 暂存单转运单的数据
+
+    $router.push({
+      path: '/distribution/inventory/CreateOrder',
+      query: {
+        name: '改单',
+        id: $route.query.id,
+        type: 'edit',
+        backPath: '/waybill/WaybillOrderList',
+      },
+    });
+  } else if (Number($route.query.waybillType) === 2) {
+    // 零担开单的数据
+
+    $router.push({
+      path: '/waybill/CreateZeroOrder',
+      query: {
+        name: '改单',
+        id: $route.query.id,
+        type: 'edit',
+        backPath: '/waybill/WaybillOrderList',
+      },
+    });
+  }
+};
 </script>
 
 <style scoped lang="scss">

src/views/waybill/FreezeOrder.vue

@@ -39,46 +39,83 @@
         </el-form>
       </el-row>
 
-      <!-- 控件模块 -->
+      <div style="display: flex">
-      <el-row>
+        <el-tabs
-        <div class="avue-crud__header">
+          v-model="details.orderStatus"
-          <!-- 头部左侧按钮模块 -->
+          tab-position="left"
-          <div class="avue-crud__left">
+          style="height: 100%; width: fit-content; flex: none"
-            <el-button type="primary" icon="Edit" @click="editClientInfo">修改客户信息</el-button>
+          class="demo-tabs"
-            <el-button type="primary" icon="Delete" @click="handleDelete">删除</el-button>
+          @tab-click="handleClickAll"
-            <el-button type="primary" icon="Refresh" @click="handleRefresh">恢复</el-button>
+        >
-          </div>
+          <el-tab-pane name="haveData" label="有数据"></el-tab-pane>
-          <!-- 头部右侧按钮模块 -->
+          <el-tab-pane name="notHaveData" label="无数据"></el-tab-pane>
-          <div class="avue-crud__right">
+        </el-tabs>
-            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+
-            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+        <div class="overflow">
-            <el-button icon="Search" @click="searchHide" circle></el-button>
+          <el-row>
-          </div>
+            <div class="avue-crud__header">
+              <!-- 头部左侧按钮模块 -->
+              <div class="avue-crud__left">
+                <el-button type="primary" icon="Edit" @click="editClientInfo"
+                  >修改客户信息</el-button
+                >
+                <el-button type="primary" icon="Delete" @click="handleDelete">删除</el-button>
+                <el-button type="primary" icon="Refresh" @click="handleRefresh">恢复</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="Search" @click="searchHide" circle></el-button>
+              </div>
+            </div>
+          </el-row>
+          <!-- 表格 -->
+          <!-- 列表模块 -->
+          <tablecmt
+            :columnList="details.columnList"
+            :tableData="
+              details.orderStatus === 'haveData' ? details.haveDataData : details.notHaveDataData
+            "
+            :loading="
+              details.orderStatus === 'haveData'
+                ? loadingObj.haveDataList
+                : loadingObj.notHaveDataList
+            "
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="slotProps">
+              <template v-if="slotProps.scope.column.label === '操作'">
+                <el-text @click="handleShowPackageOrderList(slotProps.scope)"> 包明细 </el-text>
+              </template>
+            </template>
+          </tablecmt>
         </div>
-      </el-row>
+      </div>
 
       <!-- 表格 -->
-      <el-row>
+      <!-- <tablecmt
-        <!-- 列表模块 -->
+        :columnList="details.columnList"
-        <tablecmt
+        :tableData="data"
-          :columnList="details.columnList"
+        :loading="loadingObj.list"
-          :tableData="data"
+        @inputTxt="inputsc"
-          :loading="loadingObj.list"
+        @timeCheck="timesc"
-          @inputTxt="inputsc"
+        @btnCheck="btnsc"
-          @timeCheck="timesc"
+        @selectCheck="selectsc"
-          @btnCheck="btnsc"
+        @selection="selectionChange"
-          @selectCheck="selectsc"
+      >
-          @selection="selectionChange"
+        <template #default="slotProps">
-        >
+          <template v-if="slotProps.scope.column.label === '操作'">
-          <template #default="slotProps">
+            <el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
-            <template v-if="slotProps.scope.column.label === '操作'">
+              包明细
-              <el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
+            </el-button>
-                包明细
-              </el-button>
-            </template>
           </template>
-        </tablecmt>
+        </template>
-      </el-row>
+      </tablecmt> -->
 
       <!-- 分页模块 -->
       <el-row class="el-fy">
@@ -172,13 +209,17 @@ const details = reactive<any>({
   /** 列表 */
   columnList,
   /** 列表数据 */
-  data: [{}],
+  haveDataData: [],
+  notHaveDataData: [],
   /** 包明细表头 */
   packageListColumnList,
   /** 包明细数据 */
   packageListData: [{}],
   /** 页面loading */
   loadingObj: {
+    /** 列表加载loading */
+    haveDataList: false,
+    notHaveDataList: false,
     /** 列表加载loading */
     list: false,
     packageListLoading: false,
@@ -216,6 +257,8 @@ const details = reactive<any>({
     /** 包明细 */
     packageOrderListlVisited: false,
   },
+  /** tab标签有无数据 */
+  orderStatus: 'haveData',
 });
 
 const {
@@ -250,34 +293,47 @@ onMounted(() => {
 /** 请求页面数据 */
 /** 请求页面数据 */
 const onLoad = async (page: any, params = {}) => {
+  const status = details.orderStatus;
   try {
     // 开启列表loading动画
     details.loadingObj.list = true;
+    console.log('status :>> ', status);
+
+    if (status === 'haveData') details.loadingObj.haveDataList = true;
+    else details.loadingObj.notHaveDataList = true;
 
     details.query.freezeStatus = '1';
+
+    params.hasPackage = status === 'haveData' ? 1 : 0;
     // 获取暂存单列表
-    const res = await getopenOrderAdvancePageList(page, { ...details.query, ...params });
+    const res = await getopenOrderAdvancePageList(details.page, { ...details.query, ...params });
     console.log('res :>> ', res);
     const { code, data } = res.data;
     if (code !== 200) return;
-    details.data = data.records;
+    if (status === 'haveData') details.haveDataData = data.records;
+    else details.notHaveDataData = data.records;
     details.page.total = data.total;
 
     return res.data;
   } catch (error) {
   } finally {
     // 开启列表loading动画
-    details.loadingObj.list = false;
+    if (status === 'haveData') details.loadingObj.haveDataList = false;
+    else details.loadingObj.notHaveDataList = false;
   }
 };
 
-onLoad(details.page);
+const initOnLoad = (params = {}) => {
+  details.page.pageNum = 1;
+  details.page.total = 0;
+  onLoad(params);
+};
 
-onLoad(details.page);
+initOnLoad();
 
 /** 搜索 */
 const searchChange = () => {
-  onLoad(details.page);
+  initOnLoad();
 };
 
 /** 清空表单 */
@@ -285,7 +341,7 @@ const searchReset = () => {
   details.query = {};
   details.stockupDate = [];
   details.page.currentPage = 1;
-  onLoad(details.page);
+  initOnLoad();
 };
 
 /** 展开列表控件 */
@@ -317,7 +373,7 @@ const searchHide = () => {
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
-  onLoad(details.page);
+  initOnLoad();
 };
 
 /** 表格表头时间选择 */
@@ -330,7 +386,7 @@ const timesc = (index, row) => {
   if (!index) {
     delete details.query[row.prop];
   }
-  onLoad(details.page);
+  initOnLoad();
 };
 
 /** 表格表头输入框搜索 */
@@ -344,7 +400,7 @@ const selectsc = (index, row) => {
     details.query['certificateType'] = index;
     if (!index) delete details.query['certificateType'];
   }
-  onLoad(details.page);
+  initOnLoad();
 };
 
 /** 表格表头复选框选择 */
@@ -355,7 +411,7 @@ const selectionChange = (list: any) => {
 /** 每页数量改变执行的回调 */
 const sizeChange = (pageSize: number) => {
   details.page.pageSize = pageSize;
-  onLoad(details.page);
+  initOnLoad();
 };
 
 /** 页码改变执行的回调 */
@@ -367,8 +423,8 @@ const currentChange = () => {};
  * 固定搭配，只需要更换   columnList
  *  */
 const setnewcolum = (newarr, headarr, type) => {
-  console.log(type,'type');
+  console.log(type, 'type');
-  
+
   if (type == 1) {
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'checkList', headarr);
@@ -437,9 +493,17 @@ const handleRefresh = () => {
       message: '操作成功',
     });
     details.page.pageNum = 1;
-    onLoad(details.page);
+    initOnLoad();
   });
 };
+
+/** 切换tabBar */
+const handleClickAll = e => {
+  console.log('e :>> ', e);
+  const _name = e.props.name;
+  details.orderStatus = _name;
+  initOnLoad();
+};
 </script>
 
 <style scoped lang="scss">
@@ -511,4 +575,8 @@ const handleRefresh = () => {
     }
   }
 }
+
+.overflow {
+  overflow: hidden;
+}
 </style>

src/views/waybill/WaybillOrderList.vue

@@ -117,15 +117,11 @@
             </template>
 
             <template v-else-if="slotProps.scope.column.label === '操作'">
-              <el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
+              <el-text @click="handleShowPackageOrderList(slotProps.scope)"> 上传回单 </el-text>
-                上传回单
+              <el-text @click="handleViewOrderDetails(slotProps.scope)"> 查看订单 </el-text>
-              </el-button>
+              <!-- <el-text @click="handleShowPackageOrderList(slotProps.scope)">
-              <el-button type="text" @click="handleViewOrderDetails(slotProps.scope)">
-                查看订单
-              </el-button>
-              <!-- <el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
                 零担标签
-              </el-button> -->
+              </el-text> -->
             </template>
           </template>
         </tablecmt>
@@ -564,7 +560,12 @@ const handleGoWaybillDetails = ({ row }) => {
   console.log('row :>> ', row);
   $router.push({
     path: '/distribution/inventory/BookingNote',
-    query: { name: `查看 -- 【${row.waybillNo}】`, waybillNo: row.waybillNo, id: row.id },
+    query: {
+      name: `查看 -- 【${row.waybillNo}】`,
+      waybillNo: row.waybillNo,
+      id: row.id,
+      waybillType: row.waybillType,
+    },
   });
 };
 </script>

src/views/waybill/orderPackageListDetails.vue

@@ -108,9 +108,10 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <el-button type="primary" icon="Printer" @click="editClientInfo">批量打印</el-button>
-            <el-button type="primary" icon="Position" @click="handleBatchPutInStorage"
+            <el-button type="primary" icon="Position" @click="handleBatchPutInStorage">
-              >批量入库</el-button
+              批量入库
-            >
+            </el-button>
+            <el-button type="primary" icon="Delete" @click="handleBatchDelete">批量删除</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -136,20 +137,15 @@
         >
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
-              <el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
+              <el-text @click="handleShowPackageOrderList(slotProps.scope)"> 包内产品 </el-text>
-                包内产品
+              <el-text @click="handleShowFlowNode(slotProps.scope)"> 流转节点 </el-text>
-              </el-button>
+              <el-text
-              <el-button type="text" @click="handleShowFlowNode(slotProps.scope)">
-                流转节点
-              </el-button>
-              <el-button
-                type="text"
                 v-if="Number(slotProps.scope.row.packageStatus) === 0"
                 @click="handlePutInStorage(slotProps.scope)"
               >
                 直接入库
-              </el-button>
+              </el-text>
-              <el-button type="text" @click="printOrder(slotProps.scope)"> 查看二维码 </el-button>
+              <el-text @click="printOrder(slotProps.scope)"> 查看二维码 </el-text>
             </template>
           </template>
         </tablecmt>
@@ -339,6 +335,7 @@ import {
   getopenOrderFindAdvanceDetailList,
   getopenOrderIncomingPackage,
   getShowAdvancePackgeCode,
+  postDeleteAdvanceDetail,
 } from '@/api/waybill/orderPackageListDetails';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
@@ -782,6 +779,29 @@ const handleShowFlowNode = ({ row }) => {
     console.log('_node :>> ', _node);
   });
 };
+
+/** 批量删除 */
+const handleBatchDelete = () => {
+  if (details.selectionList.length === 0) return ElMessage.error('请选择要删除的数据');
+
+  ElMessageBox.confirm('确认删除吗?', '警告', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    const submitData = { advanceDetailIds: details.selectionList.map(item => item.id) };
+
+    const res = await postDeleteAdvanceDetail(submitData);
+    const { code } = res.data;
+
+    if (code !== 200) return;
+    initPage();
+    ElMessage({
+      type: 'success',
+      message: '删除成功',
+    });
+  });
+};
 </script>
 
 <style scoped lang="scss">