From 388aeb08b43513a34bc4ece92904b101ca5df0de Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 3 Jul 2024 17:39:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artery/TripartiteTransfer.vue             | 14 +++++-
 .../artery/VehicleArrivalManagement.vue       | 43 +++++++++++--------
 .../distribution/artery/VehicleStowage.vue    | 14 ++++--
 3 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index 859712d7..8f9ef385 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -125,7 +125,7 @@
           <el-button
             v-if="permissionObj.TripartiteTransfer_cancelStartCar"
             type="primary"
-            icon="Delete"
+            icon="CircleClose"
             @click="handleCancelStartCar"
           >
             取消发车
@@ -513,7 +513,7 @@
       <el-button icon="el-icon-circle-close" @click="details.popUpShow.listOfLoadedWagons = false">
         取 消
       </el-button>
-      <el-button type="primary" icon="Printer" @click="handleSubmit"> 打 印 </el-button>
+      <el-button type="primary" icon="Printer" @click="handlePrint"> 打 印 </el-button>
     </div>
   </el-dialog>
 
@@ -579,6 +579,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import { useRouter } from 'vue-router';
 import type { UploadProps } from 'element-plus';
 import { getToken } from '@/utils/auth';
+import print from '@/utils/print';
 
 // 获取路由实例
 const $router = useRouter();
@@ -1472,6 +1473,15 @@ const handleSubmitSiginImg = async () => {
     details.loadingObj.pageLoading = false;
   }
 };
+
+/** 配载打印 */
+const handlePrint = () => {
+  const nodeList = document.querySelectorAll('.listOfLoadedWagonsPopUp table');
+
+  console.log('nodeList :>> ', nodeList);
+
+  print(nodeList);
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index a67a2313..6bd2c3c2 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -86,26 +86,16 @@
           <el-button
             v-if="permissionObj.VehicleArrivalManagement_nodeCancelStartCar"
             type="primary"
-            icon="el-icon-close"
+            icon="CircleClose"
             @click="handleEndCar"
             >网点取消发车
           </el-button>
 
-          <!-- 装载清单 -->
-          <el-button
-            v-if="permissionObj.VehicleArrivalManagement_listOfLoadedWagons"
-            type="primary"
-            icon="el-icon-printer"
-            @click="handleShowListOfLoadedWagons"
-          >
-            装载清单
-          </el-button>
-
           <!-- 到达 -->
           <el-button
             v-if="permissionObj.VehicleArrivalManagement_arrive"
             type="primary"
-            icon="el-icon-printer"
+            icon="MapLocation"
             @click="handleArrive"
             >到达
           </el-button>
@@ -114,7 +104,7 @@
           <el-button
             v-if="permissionObj.VehicleArrivalManagement_cancelArrive"
             type="primary"
-            icon="el-icon-printer"
+            icon="CircleClose"
             @click="handleCloseArrive"
           >
             取消到达
@@ -124,7 +114,7 @@
           <el-button
             v-if="permissionObj.VehicleArrivalManagement_HalfwayToUnloadTheCar"
             type="primary"
-            icon="el-icon-delete"
+            icon="Refresh"
             @click="handleUnloadByLoadId(1)"
           >
             中途到达卸车
@@ -139,12 +129,22 @@
           <el-button
             v-if="permissionObj.VehicleArrivalManagement_UnloadAtTheEnd"
             type="primary"
-            icon="el-icon-document"
+            icon="Guide"
             @click="handleUnloadByLoadId(2)"
           >
             终点到达卸车
           </el-button>
 
+          <!-- 装载清单 -->
+          <el-button
+            v-if="permissionObj.VehicleArrivalManagement_listOfLoadedWagons"
+            type="primary"
+            icon="el-icon-printer"
+            @click="handleShowListOfLoadedWagons"
+          >
+            装载清单
+          </el-button>
+
           <!-- 卸车报告 -->
           <el-button
             v-if="permissionObj.VehicleArrivalManagement_UnloadReport"
@@ -154,9 +154,6 @@
           >
             卸车报告
           </el-button>
-          <!-- <el-button type="primary" icon="el-icon-document" @click="searchReset()">
-              欧派TIMS数据关联
-            </el-button> -->
         </div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
@@ -531,7 +528,7 @@
       <el-button icon="el-icon-circle-close" @click="details.popUpShow.listOfLoadedWagons = false">
         取 消
       </el-button>
-      <el-button type="primary" icon="Printer" @click="handleSubmit"> 打 印 </el-button>
+      <el-button type="primary" icon="Printer" @click="handlePrint"> 打 印 </el-button>
     </div>
   </el-dialog>
 
@@ -617,6 +614,7 @@ import {
 } from '@/api/distribution/VehicleStowage';
 import { useRouter, useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import print from '@/utils/print';
 
 // 获取路由实例
 const $router = useRouter();
@@ -1442,6 +1440,13 @@ const handleDirectGoMarketDetails = ({ row }) => {
     },
   });
 };
+
+/** 配载打印 */
+const handlePrint = () => {
+  const nodeList = document.querySelectorAll('.listOfLoadedWagonsPopUp table');
+
+  print(nodeList);
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index fdb4a8e5..5bc98db8 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -100,7 +100,7 @@
           <el-button
             v-if="permissionObj.VehicleStowage_cancelStartCar"
             type="primary"
-            icon="el-icon-delete"
+            icon="CircleClose"
             @click="handleCancelStartCar"
           >
             取消发车
@@ -110,7 +110,7 @@
           <el-button
             v-if="permissionObj.VehicleStowage_cancelStowage"
             type="primary"
-            icon="el-icon-delete"
+            icon="CircleClose"
             @click="handleCancelCarsLoad"
           >
             取消配载
@@ -513,7 +513,7 @@
         >
           取 消
         </el-button>
-        <el-button type="primary" icon="Printer" @click="handleSubmit"> 打 印 </el-button>
+        <el-button type="primary" icon="Printer" @click="handlePrint"> 打 印 </el-button>
       </div>
     </div>
   </el-dialog>
@@ -559,6 +559,7 @@ import {
 import { useStore } from 'vuex';
 import { useRouter, useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import print from '@/utils/print';
 
 // 获取路由实例
 const $router = useRouter();
@@ -1353,6 +1354,13 @@ const handleShowListOfLoadedWagons = async () => {
     details.loadingObj.pageLoading = false;
   }
 };
+
+/** 配载打印 */
+const handlePrint = () => {
+  const nodeList = document.querySelectorAll('.listOfLoadedWagonsPopUp table');
+
+  print(nodeList);
+};
 </script>
 
 <style scoped lang="scss">