From 5134d4289cb55f76726e6e47b7f6c2356981d4e9 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 31 Jul 2024 14:52:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A3=85=E8=BD=A6=E9=9B=B6?=
 =?UTF-8?q?=E6=8B=85=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/truckLoadingDetails.js   |  6 +--
 .../artery/truckLoadingDetails.vue            | 50 ++++++++-----------
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/api/distribution/truckLoadingDetails.js b/src/api/distribution/truckLoadingDetails.js
index 77d3296b..5df4b86a 100644
--- a/src/api/distribution/truckLoadingDetails.js
+++ b/src/api/distribution/truckLoadingDetails.js
@@ -92,10 +92,10 @@ export const postLoadingDetailExport = (data = {}) => {
 /**
  * 零担二维码
  */
-export const postShowOrderCodeByCode = params => {
+export const postShowOrderCodeByCode = data => {
   return request({
     url: '/api/logpm-distribution/distributionStockArticle/showOrderCodeByCode',
-    method: 'get',
-    params,
+    method: 'post',
+    data,
   });
 };
diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue
index f67c554a..28087c63 100644
--- a/src/views/distribution/artery/truckLoadingDetails.vue
+++ b/src/views/distribution/artery/truckLoadingDetails.vue
@@ -219,23 +219,14 @@
   </el-dialog>
 
   <!-- 打印二维码 -->
-  <el-dialog
-    class="el-dialog-QRCode"
-    title="二维码"
-    :visible.sync="details.popUpShow.QRCodeVisible"
-    width="780px"
+
+  <MyPrint
+    :html="details.html"
     v-model="details.popUpShow.QRCodeVisible"
-    :align-center="true"
-  >
-    <div class="el-dialog-QRCode-container">
-      <div v-html="details.html"></div>
-    </div>
-    <span slot="footer" class="dialog-footer flex-c-c mt10">
-      <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-      <el-button @click="details.popUpShow.QRCodeVisible = false">关 闭</el-button>
-      <el-button type="primary" icon="Printer" @click="printTemplate">打 印</el-button>
-    </span>
-  </el-dialog>
+    width="780px"
+    type="titlePrint"
+    :isShowExport="false"
+  />
 
   <!-- 配置装车目的地 -->
   <el-dialog
@@ -319,7 +310,6 @@ import {
 } from '@/utils/util';
 import { detailsColumnList } from '@/option/distribution/TripartiteTransfer';
 import { useRouter, useRoute } from 'vue-router';
-import print from '@/utils/print';
 
 const details = reactive<any>({
   /** 是否开启搜索 */
@@ -1219,9 +1209,12 @@ const printOrderByZero = async ({ row }) => {
   try {
     details.loadingObj.pageLoading = true;
 
-    let ids = {
-      orderCodes: row.orderCode,
-    };
+    let ids = [
+      {
+        orderCode: row.orderCode,
+        fromWarehouseId: row.fromWarehouseId,
+      },
+    ];
 
     details.html = '';
     const res = await postShowOrderCodeByCode(ids);
@@ -1278,9 +1271,14 @@ const handleBatchBarcode = async () => {
       );
     _zeroArr.length > 0 &&
       _promiseArr.push(
-        postShowOrderCodeByCode({
-          orderCodes: _zeroArr.map(val => val.orderCode).join(','),
-        }).then(res => {
+        postShowOrderCodeByCode(
+          _zeroArr.map(val => {
+            return {
+              orderCode: val.orderCode,
+              fromWarehouseId: val.fromWarehouseId,
+            };
+          })
+        ).then(res => {
           const { code, data } = res.data;
           if (code !== 200 || getObjType(data.moldList) !== 'array') return;
 
@@ -1300,12 +1298,6 @@ const handleBatchBarcode = async () => {
   }
 };
 
-/** 打印包条码 */
-const printTemplate = () => {
-  const orderNodeList = document.querySelectorAll('.el-dialog-QRCode-container>div>div');
-  print(orderNodeList);
-};
-
 /** 批量移除 */
 const handleBatchRemove = async () => {
   const WarehouseName = localStorage.getItem('WarehouseName');