From 7947298e8405ef9f155f434313677d6da63edbd9 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 21 Jan 2025 14:46:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/reportforms/OrderAllTime.js        | 17 ++++
 .../reportforms/PackageStartTimePageReport.js | 35 ++++++++
 .../PackageTransferTimePageReport.js          | 11 +++
 .../artery/VehicleArrivalManagement.vue       |  7 ++
 .../distribution/artery/VehicleStowage.vue    |  7 ++
 .../distribution/artery/abnormalList.vue      |  8 --
 .../artery/addTripartiteTransfer.vue          | 25 ------
 .../arteryDistrilbutionBillLadingList.vue     |  5 ++
 .../PackageAllTrunklineTimePageReport.vue     |  4 +-
 .../PackageStartTimePageReport.vue            |  7 +-
 .../PackageTransferTimePageReport.vue         |  7 +-
 src/views/waybill/ChangeOrder.vue             | 82 ++++++++++---------
 .../waybill/WarehousingByTrainNumber.vue      | 43 +++++-----
 src/views/waybill/WaybillOrderList.vue        |  8 +-
 src/views/waybill/orderPackageList.vue        | 11 +++
 15 files changed, 179 insertions(+), 98 deletions(-)

diff --git a/src/option/reportforms/OrderAllTime.js b/src/option/reportforms/OrderAllTime.js
index d286db60..b2e82ded 100644
--- a/src/option/reportforms/OrderAllTime.js
+++ b/src/option/reportforms/OrderAllTime.js
@@ -81,6 +81,23 @@ export const columnList = [
     head: false,
     isshowSummary: true, //开启统计
   },
+  {
+    prop: 'serviceTypeName',
+    label: '订单类型',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [
+      { label: '商配', value: 1 },
+      { label: '市配', value: 2 },
+      { label: '自提', value: 3 },
+      { label: '三方中转', value: 4 },
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
   {
     prop: 'departureWarehouseName',
     label: '始发仓',
diff --git a/src/option/reportforms/PackageStartTimePageReport.js b/src/option/reportforms/PackageStartTimePageReport.js
index f9d5ff71..3a78a4fb 100644
--- a/src/option/reportforms/PackageStartTimePageReport.js
+++ b/src/option/reportforms/PackageStartTimePageReport.js
@@ -94,6 +94,18 @@ export const columnList = [
     head: false,
     isshowSummary: true, //开启统计
   },
+  {
+    prop: 'noOutNum',
+    label: '未发运件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
   {
     prop: 'onTimeNum',
     label: '准时发运数',
@@ -106,6 +118,18 @@ export const columnList = [
     head: false,
     isshowSummary: true, //开启统计
   },
+  {
+    prop: 'noOutOverNum',
+    label: '未发运超时件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
   {
     prop: 'onTimeRate',
     label: '准时发运率',
@@ -128,4 +152,15 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'hoursTime',
+    label: '标准时效(小时)',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
 ];
diff --git a/src/option/reportforms/PackageTransferTimePageReport.js b/src/option/reportforms/PackageTransferTimePageReport.js
index 4eb82c03..7fcccfa8 100644
--- a/src/option/reportforms/PackageTransferTimePageReport.js
+++ b/src/option/reportforms/PackageTransferTimePageReport.js
@@ -151,4 +151,15 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'hoursTime',
+    label: '标准时效(小时)',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
 ];
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index c2fbb950..59ca22db 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -185,6 +185,7 @@
         </div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
+          <el-button icon="Download" @click="handleExportData" circle></el-button>
           <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
           <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
           <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
@@ -732,6 +733,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import print from '@/utils/print';
 import { exportExcelByDom } from '@/utils/export';
 import { dateNow } from '@/utils/date';
+import { exportExcel } from '@/utils/exportData';
 
 const ArteryPrintTemplateV2 = defineAsyncComponent(
   () => import('@/components/ArteryPrintTemplateV2/ArteryPrintTemplateV2.vue')
@@ -1883,6 +1885,11 @@ const handleShowVehicleImgs = ({ row }) => {
     },
   });
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '到车 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index ac9ef7a0..e5283bf6 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -166,6 +166,7 @@
         </div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
+          <el-button icon="Download" @click="handleExportData" circle></el-button>
           <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
           <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
           <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
@@ -664,6 +665,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import print from '@/utils/print';
 import { dateNow } from '@/utils/date';
 import { exportExcelByDom } from '@/utils/export';
+import { exportExcel } from '@/utils/exportData';
 
 const ArteryPrintTemplateV2 = defineAsyncComponent(
   () => import('@/components/ArteryPrintTemplateV2/ArteryPrintTemplateV2.vue')
@@ -1690,6 +1692,11 @@ const handleExportAbnormal = () => {
   const time = new Date().getTime();
   exportExcelByDom(abnormalOrderTableNode.value.$el, '异常数据' + ' - ' + time + '.xlsx');
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '车辆配载 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/distribution/artery/abnormalList.vue b/src/views/distribution/artery/abnormalList.vue
index 4f715cb6..bda1e011 100644
--- a/src/views/distribution/artery/abnormalList.vue
+++ b/src/views/distribution/artery/abnormalList.vue
@@ -489,14 +489,6 @@ const currentChange = current => {
   onLoad();
 };
 
-/** 弹出层开启前清除数据 */
-const beforeClose = done => {
-  done();
-  details.form = {};
-  details.selectionList = [];
-  details.view = false;
-};
-
 /** 处理异常 */
 const handleAnException = async ({ row }) => {
   details.abnormalInfo = { ...row };
diff --git a/src/views/distribution/artery/addTripartiteTransfer.vue b/src/views/distribution/artery/addTripartiteTransfer.vue
index a3beaa1f..0791ac5c 100644
--- a/src/views/distribution/artery/addTripartiteTransfer.vue
+++ b/src/views/distribution/artery/addTripartiteTransfer.vue
@@ -42,25 +42,6 @@
             <el-button type="primary" @click="handleAddCarrier" icon="Plus" />
           </div>
           <el-form-item label="经办人" prop="operator">
-            <!-- <el-select
-              v-model="form.operator"
-              filterable
-              :teleported="false"
-              remote
-              reserve-keyword
-              placeholder="经办人"
-              @change="val => carrierNameChange(val, index)"
-              :remote-method="remoteMethod"
-              :loading="details.loadingObj.loading"
-              :disabled="index === 0"
-            >
-              <el-option
-                v-for="val in details.carrierNameOptions"
-                :key="val.operator"
-                :label="val.operator"
-                :value="val.carrierId"
-              />
-            </el-select> -->
             <el-input v-model="form.operator" />
           </el-form-item>
           <el-form-item label="送货方式" prop="deliveryType">
@@ -1105,12 +1086,6 @@ const handleAddWaybill = () => {
     _orderMap.push(item.orderCode + ',' + item.waybillNo);
     details.newData.push(item);
   }
-
-  // details.selectionList.forEach(val => {
-  //   val.planNum = val.stockNum;
-  //   val.loadingNum = 0;
-  //   details.newData.push(val);
-  // });
   details.orderCodeList = [...new Set([...details.orderCodeList, ..._orderMap])];
   console.log('details.orderCodeList :>> ', details.orderCodeList);
 
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
index 6e1b431d..a6f3a41e 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
@@ -96,6 +96,7 @@
         </div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
+          <el-button icon="Download" @click="handleExportData" circle></el-button>
           <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
           <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
           <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
@@ -381,6 +382,7 @@ import {
   getObjType,
 } from '@/utils/util';
 import { dateNow } from '@/utils/date';
+import { exportExcel } from '@/utils/exportData';
 
 export default {
   data() {
@@ -1114,6 +1116,9 @@ export default {
           : (this.loadingObj.pageLoading = false);
       }
     },
+    handleExportData() {
+      exportExcel(this.columnList, this.data, '干线提货 - ' + new Date().getTime());
+    },
   },
   activated() {
     if (this.$store.state.isRefresh.refreshObj.addArteryDistrilbutionBillLadingList) {
diff --git a/src/views/reportforms/PackageAllTrunklineTimePageReport.vue b/src/views/reportforms/PackageAllTrunklineTimePageReport.vue
index 3a797ddd..eb9e197d 100644
--- a/src/views/reportforms/PackageAllTrunklineTimePageReport.vue
+++ b/src/views/reportforms/PackageAllTrunklineTimePageReport.vue
@@ -24,7 +24,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="工厂推送时间">
+          <el-form-item :label="details.tabStatus === 'order' ? '工厂推送时间' : '运单创建时间'">
             <el-date-picker
               v-model="query.timeArr"
               type="daterange"
@@ -372,7 +372,7 @@ const init = () => {
   // onLoad();
 };
 
-init();
+// init();
 
 /** 查询品牌 */
 const handleFindBrand = async () => {
diff --git a/src/views/reportforms/PackageStartTimePageReport.vue b/src/views/reportforms/PackageStartTimePageReport.vue
index 6973273f..7694eba0 100644
--- a/src/views/reportforms/PackageStartTimePageReport.vue
+++ b/src/views/reportforms/PackageStartTimePageReport.vue
@@ -24,7 +24,10 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="暂存单创建时间" label-width="120px">
+          <el-form-item
+            label-width="120px"
+            :label="details.tabStatus === 'order' ? '暂存单创建时间' : '运单创建时间'"
+          >
             <el-date-picker
               v-model="query.timeArr"
               type="daterange"
@@ -372,7 +375,7 @@ const init = () => {
   // onLoad();
 };
 
-init();
+// init();
 
 /** 查询品牌 */
 const handleFindBrand = async () => {
diff --git a/src/views/reportforms/PackageTransferTimePageReport.vue b/src/views/reportforms/PackageTransferTimePageReport.vue
index dd924e46..fbf67252 100644
--- a/src/views/reportforms/PackageTransferTimePageReport.vue
+++ b/src/views/reportforms/PackageTransferTimePageReport.vue
@@ -24,7 +24,10 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="包件入库时间">
+          <el-form-item
+            label-width="120px"
+            :label="details.tabStatus === 'order' ? '包件入库时间' : '零担入库时间'"
+          >
             <el-date-picker
               v-model="query.timeArr"
               type="daterange"
@@ -372,7 +375,7 @@ const init = () => {
   // onLoad();
 };
 
-init();
+// init();
 
 /** 查询品牌 */
 const handleFindBrand = async () => {
diff --git a/src/views/waybill/ChangeOrder.vue b/src/views/waybill/ChangeOrder.vue
index 5d7b1ae4..6420ed37 100644
--- a/src/views/waybill/ChangeOrder.vue
+++ b/src/views/waybill/ChangeOrder.vue
@@ -53,49 +53,48 @@
       </div>
 
       <!-- 控件模块 -->
-      <el-row>
-        <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
-          <div class="avue-crud__left">
-            <!-- <el-button type="primary" icon="Download" @click="handleExport">导出</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 class="avue-crud__header">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left">
+          <!-- <el-button type="primary" icon="Download" @click="handleExport">导出</el-button> -->
         </div>
-      </el-row>
+        <!-- 头部右侧按钮模块 -->
+        <div class="avue-crud__right">
+          <el-button icon="Download" @click="handleExportData" circle></el-button>
+          <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="data"
-          :loading="loadingObj.list"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-        >
-          <template #default="slotProps">
-            <template v-if="slotProps.scope.column.label === '运单号'">
-              <el-text @click="handleGoWaybillDetails(slotProps.scope)">
-                {{ slotProps.scope.row.waybillNo }}
-              </el-text>
-            </template>
-
-            <template v-else-if="slotProps.scope.column.label === '操作'">
-              <el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
-                查看
-              </el-button>
-            </template>
+
+      <!-- 列表模块 -->
+      <tablecmt
+        :columnList="details.columnList"
+        :tableData="data"
+        :loading="loadingObj.list"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @btnCheck="btnsc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '运单号'">
+            <el-text @click="handleGoWaybillDetails(slotProps.scope)">
+              {{ slotProps.scope.row.waybillNo }}
+            </el-text>
           </template>
-        </tablecmt>
-      </el-row>
+
+          <template v-else-if="slotProps.scope.column.label === '操作'">
+            <el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
+              查看
+            </el-button>
+          </template>
+        </template>
+      </tablecmt>
 
       <!-- 分页模块 -->
       <el-row class="el-fy">
@@ -522,6 +521,11 @@ const handleExport = () => {
     exportExcel(details.columnList, details.data, '改单 - ' + new Date().getTime());
   });
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '改单 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/waybill/WarehousingByTrainNumber.vue b/src/views/waybill/WarehousingByTrainNumber.vue
index dd57b345..e1545b7f 100644
--- a/src/views/waybill/WarehousingByTrainNumber.vue
+++ b/src/views/waybill/WarehousingByTrainNumber.vue
@@ -28,26 +28,25 @@
       </div>
 
       <!-- 控件模块 -->
-      <el-row>
-        <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
-          <div class="avue-crud__left">
-            <el-button
-              type="primary"
-              icon="Van"
-              v-if="permissionObj.WarehousingByTrainNumber_batchIncoming"
-              @click="handleBatchPutInStorage"
-              >批量入库</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 class="avue-crud__header">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left">
+          <el-button
+            type="primary"
+            icon="Van"
+            v-if="permissionObj.WarehousingByTrainNumber_batchIncoming"
+            @click="handleBatchPutInStorage"
+            >批量入库</el-button
+          >
         </div>
-      </el-row>
+        <!-- 头部右侧按钮模块 -->
+        <div class="avue-crud__right">
+          <el-button icon="Download" @click="handleExportData" circle></el-button>
+          <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>
 
       <!-- 表格 -->
       <tablecmt
@@ -121,6 +120,7 @@ import { columnList } from '@/option/waybill/WarehousingByTrainNumber';
 import { useRouter } from 'vue-router';
 import { useStore } from 'vuex';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -411,6 +411,11 @@ const handleIsSelect = val => {
     return false;
   }
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, renderData.value, '按车次入库 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index b587f465..62ba9336 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -125,6 +125,7 @@
         </div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
+          <el-button icon="Download" @click="handleExportData" circle></el-button>
           <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>
@@ -333,7 +334,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import { getToken } from '@/utils/auth';
 import { getListName } from '@/api/basicdata/basicdataVehicle';
 import type { UploadProps, UploadUserFile } from 'element-plus';
-import { utils } from 'sortablejs';
+import { exportExcel } from '@/utils/exportData';
 
 const $store = useStore();
 
@@ -1037,6 +1038,11 @@ getListName({ name: '' }).then(res => {
     };
   });
 });
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '运单列表 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue
index 170e746e..5f16d893 100644
--- a/src/views/waybill/orderPackageList.vue
+++ b/src/views/waybill/orderPackageList.vue
@@ -72,6 +72,7 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button icon="Download" @click="handleExportData" circle></el-button>
             <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>
@@ -334,6 +335,7 @@ import { flowNodeColumnList } from '@/option/waybill/orderPackageListDetails.js'
 import { useRouter } from 'vue-router';
 import print from '@/utils/print';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import { exportExcel } from '@/utils/exportData';
 const Tableexportcomponent = defineAsyncComponent(
   () => import('@/components/Tableexportcomponent/Tableexportcomponent.vue')
 );
@@ -918,6 +920,15 @@ const handleShowFlowNode = async ({ row }) => {
     details.loadingObj.pageLoading = false;
   }
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(
+    details.packageListColumnList,
+    details.packageListData,
+    '订单明细 - ' + new Date().getTime()
+  );
+};
 </script>
 
 <style scoped lang="scss">