编辑报表

src/api/reportforms/ZeroAllTrunklineTimePageReport.js

@@ -1,6 +1,6 @@
 import request from '@/axios';
 /** 报表列表 */
-export const postCheckWaybillTimePage = data => {
+export const postZeroAllTrunklineTimePage = data => {
   return request({
     url: '/api/logpm-report/reportTime/zeroAllTrunklineTimePage',
     method: 'post',
@@ -9,7 +9,7 @@ export const postCheckWaybillTimePage = data => {
 };
 
 /** 报表导出 */
-export const postCheckWaybillTimeExport = data => {
+export const postZeroAllTrunklineTimeExport = data => {
   return request({
     url: '/api/logpm-report/reportTime/zeroAllTrunklineTimeExport',
     method: 'post',

src/api/reportforms/ZeroStartTimePageReport.js

@@ -1,6 +1,6 @@
 import request from '@/axios';
 /** 报表列表 */
-export const postCheckWaybillTimePage = data => {
+export const postZeroStartTimePage = data => {
   return request({
     url: '/api/logpm-report/reportTime/zeroStartTimePage',
     method: 'post',
@@ -9,7 +9,7 @@ export const postCheckWaybillTimePage = data => {
 };
 
 /** 报表导出 */
-export const postCheckWaybillTimeExport = data => {
+export const postZeroStartTimeExport = data => {
   return request({
     url: '/api/logpm-report/reportTime/zeroStartTimeExport',
     method: 'post',

src/api/reportforms/ZeroTransferTimePageReport.js

@@ -1,6 +1,6 @@
 import request from '@/axios';
 /** 报表列表 */
-export const postCheckWaybillTimePage = data => {
+export const postZeroTransferTimePage = data => {
   return request({
     url: '/api/logpm-report/reportTime/zeroTransferTimePage',
     method: 'post',
@@ -9,7 +9,7 @@ export const postCheckWaybillTimePage = data => {
 };
 
 /** 报表导出 */
-export const postCheckWaybillTimeExport = data => {
+export const postZeroTransferTimeExport = data => {
   return request({
     url: '/api/logpm-report/reportTime/zeroTransferTimeExport',
     method: 'post',

src/api/warehouse/warehouseUpdownGoodsLog.js

@@ -8,9 +8,9 @@ export const getpage = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 
 export const getinventorypage = (current, size, params) => {
   return request({
@@ -20,9 +20,9 @@ export const getinventorypage = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 export const gettruckloadpage = (current, size, params) => {
   return request({
     url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/truckloadpage',
@@ -31,47 +31,47 @@ export const gettruckloadpage = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 
-export const getDetail = (id) => {
+export const getDetail = id => {
   return request({
     url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/detail',
     method: 'get',
     params: {
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};
 
-export const remove = (ids) => {
+export const remove = ids => {
   return request({
     url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/remove',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
+    },
+  });
+};
 
-export const add = (row) => {
+export const add = row => {
   return request({
     url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/submit',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
-export const update = (row) => {
+export const update = row => {
   return request({
     url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/submit',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
-// 订制品导出 
+// 定制品导出
 export const $_OrderedProducts = params => {
   return request({
     url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/export-customized',
@@ -81,7 +81,7 @@ export const $_OrderedProducts = params => {
   });
 };
 
-// 库存品导出 
+// 库存品导出
 export const $_Inventory = params => {
   return request({
     url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/export-stock',
@@ -90,7 +90,7 @@ export const $_Inventory = params => {
     responseType: 'blob',
   });
 };
-// 零担订单导出 
+// 零担订单导出
 export const $_LessThanTruckload = params => {
   return request({
     url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/export-temporary',
@@ -99,8 +99,3 @@ export const $_LessThanTruckload = params => {
     responseType: 'blob',
   });
 };
-
-
-
-
-

src/api/waybill/TemporaryStorageList.js

@@ -63,7 +63,7 @@ export const postOpenLabelHasPacakage = data => {
 };
 
 /**
- * 导入欧派订制品
+ * 导入欧派定制品
  */
 export const postImportCustomizedOuPai = data => {
   return request({
@@ -106,10 +106,10 @@ export const postCreateOrderPackage = (data = {}) => {
   });
 };
 
-export const $_getopenOrderAdvancePageList = (data) => {
+export const $_getopenOrderAdvancePageList = data => {
   return request({
     url: '/api/logpm-trunkline/openOrder/advancePageListByBussiness',
     method: 'post',
-    data
+    data,
   });
-};
+};

src/option/addvalue/distributionAddvaluePackage.js

@@ -5,114 +5,114 @@ export default {
   selection: true,
   column: [
     {
-      label: "租户号",
-      prop: "tenantId",
+      label: '租户号',
+      prop: 'tenantId',
       display: false,
       hide: true,
     },
     {
-      label: "创建人",
-      prop: "createUser",
+      label: '创建人',
+      prop: 'createUser',
       display: false,
       hide: true,
     },
     {
-      label: "创建时间",
-      prop: "createTime",
+      label: '创建时间',
+      prop: 'createTime',
       display: false,
       hide: true,
     },
     {
-      label: "更新人",
-      prop: "updateUser",
+      label: '更新人',
+      prop: 'updateUser',
       display: false,
       hide: true,
     },
     {
-      label: "更新时间",
-      prop: "updateTime",
+      label: '更新时间',
+      prop: 'updateTime',
       display: false,
       hide: true,
     },
     {
-      label: "状态",
-      prop: "status",
+      label: '状态',
+      prop: 'status',
       display: false,
       hide: true,
     },
     {
-      label: "是否已删除",
-      prop: "isDeleted",
+      label: '是否已删除',
+      prop: 'isDeleted',
       display: false,
       hide: true,
     },
     {
-      label: "创建部门",
-      prop: "createDept",
+      label: '创建部门',
+      prop: 'createDept',
       display: false,
       hide: true,
     },
     {
-      label: "主键",
-      prop: "id",
+      label: '主键',
+      prop: 'id',
       display: false,
       hide: true,
     },
     {
-      label: "预留1",
-      prop: "reserve1",
+      label: '预留1',
+      prop: 'reserve1',
     },
     {
-      label: "预留2",
-      prop: "reserve2",
+      label: '预留2',
+      prop: 'reserve2',
     },
     {
-      label: "预留3",
-      prop: "reserve3",
+      label: '预留3',
+      prop: 'reserve3',
     },
     {
-      label: "预留4",
-      prop: "reserve4",
+      label: '预留4',
+      prop: 'reserve4',
     },
     {
-      label: "预留5",
-      prop: "reserve5",
+      label: '预留5',
+      prop: 'reserve5',
     },
     {
-      label: "包件ID",
-      prop: "packageId",
+      label: '包件ID',
+      prop: 'packageId',
     },
     {
-      label: "包件类型;1-订制品；2-库存品",
-      prop: "conditions",
+      label: '包件类型;1-定制品；2-库存品',
+      prop: 'conditions',
     },
     {
-      label: "包条码",
-      prop: "orderPackageCode",
+      label: '包条码',
+      prop: 'orderPackageCode',
     },
     {
-      label: "订单自编号",
-      prop: "orderCode",
+      label: '订单自编号',
+      prop: 'orderCode',
     },
     {
-      label: "商配名称",
-      prop: "materialName",
+      label: '商配名称',
+      prop: 'materialName',
     },
     {
-      label: "订单ID",
-      prop: "stockArticleId",
+      label: '订单ID',
+      prop: 'stockArticleId',
     },
     {
-      label: "数量",
-      prop: "quantity",
+      label: '数量',
+      prop: 'quantity',
     },
     {
-      label: "客户ID",
-      prop: "reservationId",
+      label: '客户ID',
+      prop: 'reservationId',
     },
     {
-      label: "增值服务详情表ID",
-      prop: "addvalueDetailId",
+      label: '增值服务详情表ID',
+      prop: 'addvalueDetailId',
     },
-  ]
-}
+  ],
+};

src/option/distribution/DeliveryExceptionReview.js

@@ -79,8 +79,8 @@ export const AbnormalReview = [
     width: '100',
     checkarr: [
       {
-        label: '订制品',
-        value: '订制品',
+        label: '定制品',
+        value: '定制品',
       },
       {
         label: '库存品',

src/option/reportforms/OrderAllTime.js

@@ -259,7 +259,7 @@ export const columnList = [
   },
   {
     prop: 'dayTime',
-    label: '标准时效',
+    label: '标准时效(天)',
     type: 1,
     values: '',
     width: '150',
@@ -324,16 +324,4 @@ export const columnList = [
     head: false,
     isshowSummary: true, //开启统计
   },
-  {
-    prop: 'dayTime',
-    label: '标准时效(天)',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-    isshowSummary: true, //开启统计
-  },
 ];

src/views/addvalue/distributionAddvaluePackage.vue

@@ -119,8 +119,8 @@
           <el-form-item label="包件ID" prop="packageId">
             <el-input v-model="form.packageId" placeholder="请输入包件ID" />
           </el-form-item>
-          <el-form-item label="包件类型;1-订制品；2-库存品" prop="conditions">
-            <el-input v-model="form.conditions" placeholder="请输入包件类型;1-订制品；2-库存品" />
+          <el-form-item label="包件类型;1-定制品；2-库存品" prop="conditions">
+            <el-input v-model="form.conditions" placeholder="请输入包件类型;1-定制品；2-库存品" />
           </el-form-item>
           <el-form-item label="包条码" prop="orderPackageCode">
             <el-input v-model="form.orderPackageCode" placeholder="请输入包条码" />

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -3395,7 +3395,7 @@ export default {
 
     async handleIndexOne() {
       const qr = {};
-      if (this.selectionList[0].goodsTypeName === '订制品') {
+      if (this.selectionList[0].goodsTypeName === '定制品') {
         qr.ids = this.selectionList.map(res => res.packageId).join(',');
         return await showOrderPackgeCode(qr);
       } else {

src/views/reportforms/PackageAllTrunklineTimePageReport.vue

@@ -115,24 +115,52 @@
       </div>
 
       <!-- 表格 -->
-      <!-- 列表模块 -->
-      <tablecmt
-        ref="tableNodeRef"
-        :columnList="details.columnList"
-        :tableData="details.data"
-        :loading="loadingObj.list"
-        @inputTxt="inputsc"
-        @timeCheck="timesc"
-        @btnCheck="btnsc"
-        @selectCheck="selectsc"
-        @selection="selectionChange"
+      <el-tabs
+        type="border-card"
+        v-loading="loadingObj.list"
+        v-model="details.tabStatus"
+        @tab-click="handleTab"
       >
-        <template #default="{ scope: { row, column } }">
-          <div>
-            {{ row[column.property] + '%' }}
-          </div>
-        </template>
-      </tablecmt>
+        <el-tab-pane label="定制品" name="order">
+          <!-- 列表模块 -->
+          <tablecmt
+            ref="tableNodeRef1"
+            :columnList="details.columnList"
+            :tableData="details.data"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="{ scope: { row, column } }">
+              <div>
+                {{ row[column.property] + '%' }}
+              </div>
+            </template>
+          </tablecmt>
+        </el-tab-pane>
+
+        <el-tab-pane label="零担" name="zero">
+          <!-- 列表模块 -->
+          <tablecmt
+            ref="tableNodeRef2"
+            :columnList="details.columnList"
+            :tableData="details.data"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="{ scope: { row, column } }">
+              <div>
+                {{ row[column.property] + '%' }}
+              </div>
+            </template>
+          </tablecmt>
+        </el-tab-pane>
+      </el-tabs>
 
       <!-- 分页模块 -->
       <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
@@ -175,6 +203,10 @@ import {
   postCheckWaybillTimePage,
   postCheckWaybillTimeExport,
 } from '@/api/reportforms/PackageAllTrunklineTimePageReport';
+import {
+  postZeroAllTrunklineTimePage,
+  postZeroAllTrunklineTimeExport,
+} from '@/api/reportforms/ZeroAllTrunklineTimePageReport';
 import { getListName } from '@/api/basicdata/basicdataVehicle';
 import {
   setNodeHeight,
@@ -196,7 +228,8 @@ const $router = useRouter();
 const $store = useStore();
 
 // 组件实例
-const tableNodeRef = ref();
+const tableNodeRef1 = ref();
+const tableNodeRef2 = ref();
 
 const details = reactive<any>({
   /** 是否开启搜索 */
@@ -265,6 +298,8 @@ const details = reactive<any>({
   popUpShow: {},
   /** 全屏 */
   fullscreenObj: {},
+  /** tab */
+  tabStatus: 'order' as 'order' | 'zero',
 });
 
 const { search, query, shortcuts, loadingObj, selectionList, drawerShow, page } = toRefs(details);
@@ -309,7 +344,10 @@ const onLoad = async (params = {}) => {
     delete submitData.timeArr;
     delete submitData.total;
 
-    const res = await postCheckWaybillTimePage(submitData);
+    const res =
+      details.tabStatus === 'order'
+        ? await postCheckWaybillTimePage(submitData)
+        : await postZeroAllTrunklineTimePage(submitData);
     const { code, data } = res.data;
     if (code !== 200) return;
     details.data = getObjType(data.records) === 'array' ? data.records : [];
@@ -401,7 +439,8 @@ const showdrawer = (_flag?: boolean) => {
 const searchHide = () => {
   details.search = !details.search;
 
-  setNodeHeight(tableNodeRef.value.$el, '', true);
+  setNodeHeight(tableNodeRef1.value.$el, '', true);
+  setNodeHeight(tableNodeRef2.value.$el, '', true);
 };
 
 /** 表格表头输入框搜索 */
@@ -485,17 +524,39 @@ const ExportData = async () => {
     delete submitData.timeArr;
     delete submitData.total;
 
-    const res = await postCheckWaybillTimeExport(submitData);
+    const res =
+      details.tabStatus === 'order'
+        ? await postCheckWaybillTimeExport(submitData)
+        : await postZeroAllTrunklineTimeExport(submitData);
     const { status, data } = res;
     if (status !== 200) return;
     const time = new Date().getTime();
-    downloadXls(data, '定制品干线时效报表 -' + time + '.xlsx');
+    downloadXls(
+      data,
+      (details.tabStatus === 'order' ? '定制品干线时效报表 - ' : '零担干线时效报表 - ') +
+        time +
+        '.xlsx'
+    );
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
     details.loadingObj.list = false;
   }
 };
+
+const handleTab = async () => {
+  await nextTick();
+  setNodeHeight(tableNodeRef1.value.$el, '', true);
+  setNodeHeight(tableNodeRef2.value.$el, '', true);
+  onLoad();
+};
+
+onMounted(async () => {
+  // 重置表格高度
+  await nextTick();
+  setNodeHeight(tableNodeRef1.value.$el, '', true);
+  setNodeHeight(tableNodeRef2.value.$el, '', true);
+});
 </script>
 
 <style scoped lang="scss">

src/views/reportforms/PackageStartTimePageReport.vue

@@ -115,25 +115,52 @@
       </div>
 
       <!-- 表格 -->
-      <!-- 列表模块 -->
-      <tablecmt
-        ref="tableNodeRef"
-        :columnList="details.columnList"
-        :tableData="details.data"
-        :loading="loadingObj.list"
-        @inputTxt="inputsc"
-        @timeCheck="timesc"
-        @btnCheck="btnsc"
-        @selectCheck="selectsc"
-        @selection="selectionChange"
+      <el-tabs
+        type="border-card"
+        v-loading="loadingObj.list"
+        v-model="details.tabStatus"
+        @tab-click="handleTab"
       >
-        <template #default="{ scope: { row, column } }">
-          <div>
-            {{ row[column.property] + '%' }}
-          </div>
-        </template>
-      </tablecmt>
-
+        <el-tab-pane label="定制品" name="order">
+          <!-- 列表模块 -->
+          <tablecmt
+            ref="tableNodeRef1"
+            :columnList="details.columnList"
+            :tableData="details.data"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="{ scope: { row, column } }">
+              <div>
+                {{ row[column.property] + '%' }}
+              </div>
+            </template>
+          </tablecmt>
+        </el-tab-pane>
+
+        <el-tab-pane label="零担" name="zero">
+          <!-- 列表模块 -->
+          <tablecmt
+            ref="tableNodeRef2"
+            :columnList="details.columnList"
+            :tableData="details.data"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="{ scope: { row, column } }">
+              <div>
+                {{ row[column.property] + '%' }}
+              </div>
+            </template>
+          </tablecmt>
+        </el-tab-pane>
+      </el-tabs>
       <!-- 分页模块 -->
       <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
         <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
@@ -175,6 +202,10 @@ import {
   postCheckWaybillTimePage,
   postCheckWaybillTimeExport,
 } from '@/api/reportforms/PackageStartTimePageReport';
+import {
+  postZeroStartTimePage,
+  postZeroStartTimeExport,
+} from '@/api/reportforms/ZeroStartTimePageReport';
 import { getListName } from '@/api/basicdata/basicdataVehicle';
 import {
   setNodeHeight,
@@ -196,7 +227,8 @@ const $router = useRouter();
 const $store = useStore();
 
 // 组件实例
-const tableNodeRef = ref();
+const tableNodeRef1 = ref();
+const tableNodeRef2 = ref();
 
 const details = reactive<any>({
   /** 是否开启搜索 */
@@ -265,6 +297,8 @@ const details = reactive<any>({
   popUpShow: {},
   /** 全屏 */
   fullscreenObj: {},
+  /** tab */
+  tabStatus: 'order' as 'order' | 'zero',
 });
 
 const { search, query, shortcuts, loadingObj, selectionList, drawerShow, page } = toRefs(details);
@@ -309,7 +343,11 @@ const onLoad = async (params = {}) => {
     delete submitData.timeArr;
     delete submitData.total;
 
-    const res = await postCheckWaybillTimePage(submitData);
+    const res =
+      details.tabStatus === 'order'
+        ? await postCheckWaybillTimePage(submitData)
+        : await postZeroStartTimePage(submitData);
+
     const { code, data } = res.data;
     if (code !== 200) return;
     details.data = getObjType(data.records) === 'array' ? data.records : [];
@@ -401,7 +439,8 @@ const showdrawer = (_flag?: boolean) => {
 const searchHide = () => {
   details.search = !details.search;
 
-  setNodeHeight(tableNodeRef.value.$el, '', true);
+  setNodeHeight(tableNodeRef1.value.$el, '', true);
+  setNodeHeight(tableNodeRef2.value.$el, '', true);
 };
 
 /** 表格表头输入框搜索 */
@@ -488,17 +527,39 @@ const ExportData = async () => {
     delete submitData.timeArr;
     delete submitData.total;
 
-    const res = await postCheckWaybillTimeExport(submitData);
+    const res =
+      details.tabStatus === 'order'
+        ? await postCheckWaybillTimeExport(submitData)
+        : await postZeroStartTimeExport(submitData);
     const { status, data } = res;
     if (status !== 200) return;
     const time = new Date().getTime();
-    downloadXls(data, '定制品发运时效报表 -' + time + '.xlsx');
+    downloadXls(
+      data,
+      (details.tabStatus === 'order' ? '定制品发运时效报表 - ' : '零担发运时效报表 - ') +
+        time +
+        '.xlsx'
+    );
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
     details.loadingObj.list = false;
   }
 };
+
+const handleTab = async () => {
+  await nextTick();
+  setNodeHeight(tableNodeRef1.value.$el, '', true);
+  setNodeHeight(tableNodeRef2.value.$el, '', true);
+  onLoad();
+};
+
+onMounted(async () => {
+  // 重置表格高度
+  await nextTick();
+  setNodeHeight(tableNodeRef1.value.$el, '', true);
+  setNodeHeight(tableNodeRef2.value.$el, '', true);
+});
 </script>
 
 <style scoped lang="scss">

src/views/reportforms/PackageTransferTimePageReport.vue

@@ -115,24 +115,52 @@
       </div>
 
       <!-- 表格 -->
-      <!-- 列表模块 -->
-      <tablecmt
-        ref="tableNodeRef"
-        :columnList="details.columnList"
-        :tableData="details.data"
-        :loading="loadingObj.list"
-        @inputTxt="inputsc"
-        @timeCheck="timesc"
-        @btnCheck="btnsc"
-        @selectCheck="selectsc"
-        @selection="selectionChange"
+      <el-tabs
+        type="border-card"
+        v-loading="loadingObj.list"
+        v-model="details.tabStatus"
+        @tab-click="handleTab"
       >
-        <template #default="{ scope: { row, column } }">
-          <div>
-            {{ row[column.property] + '%' }}
-          </div>
-        </template>
-      </tablecmt>
+        <el-tab-pane label="定制品" name="order">
+          <!-- 列表模块 -->
+          <tablecmt
+            ref="tableNodeRef1"
+            :columnList="details.columnList"
+            :tableData="details.data"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="{ scope: { row, column } }">
+              <div>
+                {{ row[column.property] + '%' }}
+              </div>
+            </template>
+          </tablecmt>
+        </el-tab-pane>
+
+        <el-tab-pane label="零担" name="zero">
+          <!-- 列表模块 -->
+          <tablecmt
+            ref="tableNodeRef2"
+            :columnList="details.columnList"
+            :tableData="details.data"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="{ scope: { row, column } }">
+              <div>
+                {{ row[column.property] + '%' }}
+              </div>
+            </template>
+          </tablecmt>
+        </el-tab-pane>
+      </el-tabs>
 
       <!-- 分页模块 -->
       <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
@@ -175,6 +203,10 @@ import {
   postCheckWaybillTimePage,
   postCheckWaybillTimeExport,
 } from '@/api/reportforms/PackageTransferTimePageReport';
+import {
+  postZeroTransferTimePage,
+  postZeroTransferTimeExport,
+} from '@/api/reportforms/ZeroTransferTimePageReport';
 import { getListName } from '@/api/basicdata/basicdataVehicle';
 import {
   setNodeHeight,
@@ -196,7 +228,8 @@ const $router = useRouter();
 const $store = useStore();
 
 // 组件实例
-const tableNodeRef = ref();
+const tableNodeRef1 = ref();
+const tableNodeRef2 = ref();
 
 const details = reactive<any>({
   /** 是否开启搜索 */
@@ -265,6 +298,8 @@ const details = reactive<any>({
   popUpShow: {},
   /** 全屏 */
   fullscreenObj: {},
+  /** tab */
+  tabStatus: 'order' as 'order' | 'zero',
 });
 
 const { search, query, shortcuts, loadingObj, selectionList, drawerShow, page } = toRefs(details);
@@ -309,7 +344,10 @@ const onLoad = async (params = {}) => {
     delete submitData.timeArr;
     delete submitData.total;
 
-    const res = await postCheckWaybillTimePage(submitData);
+    const res =
+      details.tabStatus === 'order'
+        ? await postCheckWaybillTimePage(submitData)
+        : await postZeroTransferTimePage(submitData);
     const { code, data } = res.data;
     if (code !== 200) return;
     details.data = getObjType(data.records) === 'array' ? data.records : [];
@@ -401,7 +439,8 @@ const showdrawer = (_flag?: boolean) => {
 const searchHide = () => {
   details.search = !details.search;
 
-  setNodeHeight(tableNodeRef.value.$el, '', true);
+  setNodeHeight(tableNodeRef1.value.$el, '', true);
+  setNodeHeight(tableNodeRef2.value.$el, '', true);
 };
 
 /** 表格表头输入框搜索 */
@@ -487,17 +526,39 @@ const ExportData = async () => {
     delete submitData.timeArr;
     delete submitData.total;
 
-    const res = await postCheckWaybillTimeExport(submitData);
+    const res =
+      details.tabStatus === 'order'
+        ? await postCheckWaybillTimeExport(submitData)
+        : await postZeroTransferTimeExport(submitData);
     const { status, data } = res;
     if (status !== 200) return;
     const time = new Date().getTime();
-    downloadXls(data, '定制品中转时效报表 -' + time + '.xlsx');
+    downloadXls(
+      data,
+      (details.tabStatus === 'order' ? '定制品中转时效报表 - ' : '零担中转时效报表 - ') +
+        time +
+        '.xlsx'
+    );
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
     details.loadingObj.list = false;
   }
 };
+
+const handleTab = async () => {
+  await nextTick();
+  setNodeHeight(tableNodeRef1.value.$el, '', true);
+  setNodeHeight(tableNodeRef2.value.$el, '', true);
+  onLoad();
+};
+
+onMounted(async () => {
+  // 重置表格高度
+  await nextTick();
+  setNodeHeight(tableNodeRef1.value.$el, '', true);
+  setNodeHeight(tableNodeRef2.value.$el, '', true);
+});
 </script>
 
 <style scoped lang="scss">

src/views/reportforms/ZeroAllTrunklineTimePageReport.vue

@@ -172,8 +172,8 @@ import { getDictionaryBiz } from '@/api/system/dict';
 import { postFindBrandList } from '@/api/waybill/TemporaryStorageList';
 import { postFindbusinessLine } from '@/api/reportforms/SalesDepartmentIncomeReport';
 import {
-  postCheckWaybillTimePage,
-  postCheckWaybillTimeExport,
+  postZeroAllTrunklineTimePage,
+  postZeroAllTrunklineTimeExport,
 } from '@/api/reportforms/ZeroAllTrunklineTimePageReport';
 import { getListName } from '@/api/basicdata/basicdataVehicle';
 import {
@@ -309,7 +309,7 @@ const onLoad = async (params = {}) => {
     delete submitData.timeArr;
     delete submitData.total;
 
-    const res = await postCheckWaybillTimePage(submitData);
+    const res = await postZeroAllTrunklineTimePage(submitData);
     const { code, data } = res.data;
     if (code !== 200) return;
     details.data = getObjType(data.records) === 'array' ? data.records : [];
@@ -488,7 +488,7 @@ const ExportData = async () => {
     delete submitData.timeArr;
     delete submitData.total;
 
-    const res = await postCheckWaybillTimeExport(submitData);
+    const res = await postZeroAllTrunklineTimeExport(submitData);
     const { status, data } = res;
     if (status !== 200) return;
     const time = new Date().getTime();

src/views/reportforms/ZeroStartTimePageReport.vue

@@ -172,8 +172,8 @@ import { getDictionaryBiz } from '@/api/system/dict';
 import { postFindBrandList } from '@/api/waybill/TemporaryStorageList';
 import { postFindbusinessLine } from '@/api/reportforms/SalesDepartmentIncomeReport';
 import {
-  postCheckWaybillTimePage,
-  postCheckWaybillTimeExport,
+  postZeroStartTimePage,
+  postZeroStartTimeExport,
 } from '@/api/reportforms/ZeroStartTimePageReport';
 import { getListName } from '@/api/basicdata/basicdataVehicle';
 import {
@@ -309,7 +309,7 @@ const onLoad = async (params = {}) => {
     delete submitData.timeArr;
     delete submitData.total;
 
-    const res = await postCheckWaybillTimePage(submitData);
+    const res = await postZeroStartTimePage(submitData);
     const { code, data } = res.data;
     if (code !== 200) return;
     details.data = getObjType(data.records) === 'array' ? data.records : [];
@@ -488,7 +488,7 @@ const ExportData = async () => {
     delete submitData.timeArr;
     delete submitData.total;
 
-    const res = await postCheckWaybillTimeExport(submitData);
+    const res = await postZeroStartTimeExport(submitData);
     const { status, data } = res;
     if (status !== 200) return;
     const time = new Date().getTime();

src/views/reportforms/ZeroTransferTimePageReport.vue

@@ -172,8 +172,8 @@ import { getDictionaryBiz } from '@/api/system/dict';
 import { postFindBrandList } from '@/api/waybill/TemporaryStorageList';
 import { postFindbusinessLine } from '@/api/reportforms/SalesDepartmentIncomeReport';
 import {
-  postCheckWaybillTimePage,
-  postCheckWaybillTimeExport,
+  postZeroTransferTimePage,
+  postZeroTransferTimeExport,
 } from '@/api/reportforms/ZeroTransferTimePageReport';
 import { getListName } from '@/api/basicdata/basicdataVehicle';
 import {
@@ -309,7 +309,7 @@ const onLoad = async (params = {}) => {
     delete submitData.timeArr;
     delete submitData.total;
 
-    const res = await postCheckWaybillTimePage(submitData);
+    const res = await postZeroTransferTimePage(submitData);
     const { code, data } = res.data;
     if (code !== 200) return;
     details.data = getObjType(data.records) === 'array' ? data.records : [];
@@ -488,7 +488,7 @@ const ExportData = async () => {
     delete submitData.timeArr;
     delete submitData.total;
 
-    const res = await postCheckWaybillTimeExport(submitData);
+    const res = await postZeroTransferTimeExport(submitData);
     const { status, data } = res;
     if (status !== 200) return;
     const time = new Date().getTime();

src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue

@@ -75,7 +75,7 @@
       </el-row>
 
       <el-tabs type="border-card" @tab-click="tabClick">
-        <el-tab-pane label="订制品">
+        <el-tab-pane label="定制品">
           <el-row>
             <!-- 列表模块 -->
             <tablecmt
@@ -758,7 +758,7 @@ export default {
       console.log(this.ids);
       console.log(this.selectionList);
       const options = {
-        订制品: 1,
+        定制品: 1,
         库存品: 2,
         零担订单: 3,
       };