From c1649874cbc555b2eed06dfdfa8b27354804ea23 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 6 Nov 2024 14:45:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MyPrint/MyPrint.vue            | 104 ++++++++++++++++--
 src/utils/print.js                            |   3 +
 .../goodsShelf/basicdataGoodsShelf.vue        |  46 ++------
 .../artery/TripartiteTransfer.vue             |  80 +-------------
 .../artery/VehicleArrivalManagement.vue       |  88 ++-------------
 .../distribution/artery/VehicleStowage.vue    | 104 ++----------------
 .../deliverylist/distributionDeliveryList.vue |  42 -------
 .../distributionDeliveryListdis.vue           |  85 +-------------
 .../distributionDeliveryListedt.vue           |  23 ++--
 .../distributionDeliveryListmar.vue           |  22 ----
 .../distributionStockArticleDetails.vue       |  23 ++--
 .../distribution/reservation/reservation.vue  |  27 +----
 .../distributionStockupDetailsSelf.vue        |  31 +++---
 src/views/finance/CustomerSettlement.vue      |  23 +++-
 src/views/mail/reservation/list.vue           |  71 ++++--------
 .../parcelList/distributionParcelList.vue     |  26 ++---
 src/views/waybill/orderDetails.vue            |  28 ++---
 src/views/waybill/orderPackageList.vue        |   5 -
 src/views/waybill/orderPackageListDetails.vue |   6 -
 .../orderPackageListDetailsByMarket.vue       |   6 -
 20 files changed, 227 insertions(+), 616 deletions(-)

diff --git a/src/components/MyPrint/MyPrint.vue b/src/components/MyPrint/MyPrint.vue
index 3930fdea..db5c94e3 100644
--- a/src/components/MyPrint/MyPrint.vue
+++ b/src/components/MyPrint/MyPrint.vue
@@ -1,63 +1,119 @@
 <template>
   <div>
-    <el-dialog v-model="visible" align-center :title="props.title" :width="props.width">
-      <template v-if="visible">
-        <div class="printCode" ref="printNodeRef">
-          <div v-html="props.html"></div>
+    <el-dialog
+      v-model="visible"
+      destroy-on-close
+      align-center
+      :title="props.title"
+      :width="props.width"
+      :fullscreen="props.isFullscreen && details.isFullscreen"
+      :show-close="!props.isFullscreen"
+    >
+      <!-- 标题 -- 头部控件区 -->
+      <template v-if="props.isFullscreen" #header="{ close, titleId, titleClass }">
+        <div class="my-header flex-c-sb">
+          <div class="fwb" :id="titleId" :class="titleClass">{{ props.title }}</div>
+          <div class="flex-c-c">
+            <!-- 全屏显示按钮 -->
+            <el-button type="text" @click="handleFullScrean()" v-if="!details.isFullscreen">
+              <el-icon class=""><FullScreen /></el-icon>
+            </el-button>
+            <el-button type="text" @click="handleFullScrean()" v-else>
+              <el-icon class=""><CopyDocument /></el-icon>
+            </el-button>
 
-          <div>
-            <slot></slot>
+            <!-- 弹窗关闭按钮 -->
+            <el-button type="text">
+              <el-icon class="" @click="close"><Close /></el-icon>
+            </el-button>
           </div>
         </div>
       </template>
 
+      <div class="printCode" ref="printNodeRef">
+        <template v-if="props.html">
+          <div v-html="props.html"></div>
+        </template>
+
+        <div>
+          <slot></slot>
+        </div>
+      </div>
+
       <div class="flex-c-c mt10">
         <el-button @click="handleClose" icon="CircleClose"> 关 闭 </el-button>
         <el-button type="primary" v-if="props.isShowExport" @click="handleExport" icon="Download">
           导 出
         </el-button>
-        <el-button type="primary" @click="printTemplate" icon="Printer"> 打 印 </el-button>
+        <el-button
+          type="primary"
+          @click="printTemplate"
+          icon="Printer"
+          :disabled="details.printLoading"
+          :loading="details.printLoading"
+        >
+          打 印
+        </el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script setup lang="ts">
-import { defineProps, computed, ref, nextTick } from 'vue';
+import { defineProps, computed, ref, nextTick, reactive } from 'vue';
 import print from '@/utils/print';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { getObjType } from '@/utils/util';
 import * as XLSX from 'xlsx';
+import { exportExcelByDom } from '@/utils/export';
+import { dateNow } from '@/utils/date';
 
 const props = defineProps({
+  /** 打印内容 */
   html: {
     type: String,
     default: '',
   },
+  /** 是否显示弹窗 */
   modelValue: {
     type: Boolean,
     default: false,
   },
+  /** 弹窗宽度 */
   width: {
     type: String,
     default: '780px',
   },
+  /** 标题 */
   title: {
     type: String,
     default: '二维码',
   },
+  /** 是否显示导出按钮 */
   isShowExport: {
     type: Boolean,
     default: true,
   },
+  /** 打印函数 */
   printFn: {
     type: Function,
     default: null,
   },
+  /** 打印类型 */
   type: {
     type: String,
     default: 'deliveryPrint',
   },
+  /** 导出名称 */
+  exportName: {
+    type: String,
+    default: '导出',
+  },
+  /** 是否开启全屏按钮 */
+  isFullscreen: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const $emit = defineEmits(['update:modelValue']);
@@ -69,6 +125,13 @@ const visible = computed({
   },
 });
 
+const details = reactive({
+  /** 打印loading */
+  printLoading: false,
+  /** 是否全屏 */
+  isFullscreen: false,
+});
+
 const handleClose = () => {
   visible.value = false;
 };
@@ -147,8 +210,11 @@ const handleExport = () => {
     cancelButtonText: '关闭',
     type: 'warning',
   }).then(() => {
-    // 确认导出
-    createExcel();
+    console.log('printNodeRef.value :>> ', printNodeRef.value);
+
+    props.type === 'titlePrint'
+      ? createExcel()
+      : exportExcelByDom(printNodeRef.value, props.exportName + ' - ' + dateNow() + '.xlsx');
   });
 };
 
@@ -156,6 +222,8 @@ const handleExport = () => {
 const printTemplate = () => {
   if (props.printFn) return props.printFn();
 
+  details.printLoading = true;
+
   const nodeArr = document.querySelectorAll('.printSmallText');
 
   for (let i = 0; i < nodeArr.length; i++) {
@@ -168,9 +236,19 @@ const printTemplate = () => {
     const printNode = document.querySelectorAll('.printCode > div > div');
     console.log('printNode :>> ', printNode);
     print(printNode, props.type);
+    handleClose();
+    details.printLoading = false;
     clearTimeout(timer);
   }, 500);
 };
+
+/**
+ * 是否开启床车明细全屏
+ * @params(_type) 开启或关闭
+ */
+const handleFullScrean = () => {
+  details.isFullscreen = !details.isFullscreen;
+};
 </script>
 
 <style scoped lang="scss">
@@ -178,4 +256,10 @@ const printTemplate = () => {
   max-height: 80vh;
   overflow-y: scroll;
 }
+
+.my-header {
+  :deep(.el-icon) {
+    font-size: 20px;
+  }
+}
 </style>
diff --git a/src/utils/print.js b/src/utils/print.js
index 31c3fead..fa20edf3 100644
--- a/src/utils/print.js
+++ b/src/utils/print.js
@@ -1,5 +1,6 @@
 import { getLodop } from '@/utils/LodopFuncs';
 import hwyPrintNew from '@/utils/print/index';
+import { ElMessage } from 'element-plus';
 
 /** 处理标签打印 */
 const handleTitlePrint = (LODOP, templateData) => {
@@ -49,6 +50,8 @@ const print = (nodeList, type = 'deliveryPrint') => {
   // 当列表内没有元素时, 退出函数
   if (nodeList.length === 0) return;
 
+  ElMessage.success('打印任务提交成功');
+
   // 循环列表内元素并打印
   nodeList.forEach(orderNode => {
     let templateData = orderNode.innerHTML;
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index 26d387dd..2db372c3 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -339,34 +339,14 @@
         </template>
       </el-dialog>
 
-      <el-dialog
-        title="二维码"
-        class="printDialog"
-        :visible.sync="dialogVisible"
-        width="600px"
+      <!-- 打印 -->
+      <MyPrint
         v-model="dialogVisible"
-      >
-        <div class="el_ewm" v-loading="ewmloading" element-loading-text="二维码加载中...">
-          <!--        <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
-          <!--          <el-divider></el-divider>-->
-
-          <!--          <el-row>-->
-          <!--            <el-col :span="24" >-->
-          <!--              <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>-->
-          <!--            </el-col>-->
-          <!--          </el-row>-->
-          <!--        </div>-->
-          <!--startprint1-->
-          <div class="printNode" v-html="html"></div>
-          <!--endprint1-->
-        </div>
-        <span slot="footer" class="dialog-footer">
-          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-          <el-button type="primary" @click="printTemplate">打 印</el-button>
-          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-          <el-button @click="dialogVisible = false">取 消</el-button>
-        </span>
-      </el-dialog>
+        :isShowExport="false"
+        :html="html"
+        type="titlePrint"
+        width="600px"
+      />
 
       <el-dialog title="货位列表" width="80%" v-model="box1">
         <avue-crud
@@ -1400,18 +1380,6 @@ export default {
     //
     //   })
     // },
-    printTemplate() {
-      if (this.allselectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-
-      const nodeList = document.querySelectorAll('.printNode > div');
-
-      console.log('nodeList :>> ', nodeList);
-
-      print(nodeList, 'titlePrint');
-    },
     rowDel(row) {
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index 04f09f7b..7d783353 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -385,66 +385,15 @@
   </el-dialog>
 
   <!-- 配载清单 -->
-  <el-dialog
-    title="配载清单"
+  <MyPrint
     v-model="details.popUpShow.listOfLoadedWagons"
     width="80%"
-    append-to-body
-    :fullscreen="details.fullscreenObj.listOfLoadedWagonsPopUp"
-    :show-close="false"
-    class="listOfLoadedWagonsPopUp"
+    title="配载清单"
+    :exportName="details.selectionList[0] ? details.selectionList[0].carsNo : ''"
+    isFullscreen
   >
-    <!-- 标题 -- 头部控件区 -->
-    <template #header="{ close, titleId, titleClass }">
-      <div class="my-header flex-c-sb">
-        <div class="fwb" :id="titleId" :class="titleClass">配载清单</div>
-        <div class="flex-c-c">
-          <!-- 全屏显示按钮 -->
-          <el-button
-            type="text"
-            @click="handleFullScrean('open', 'listOfLoadedWagonsPopUp')"
-            v-if="!details.fullscreenObj.listOfLoadedWagonsPopUp"
-          >
-            <el-icon class=""><FullScreen /></el-icon>
-          </el-button>
-          <el-button
-            type="text"
-            @click="handleFullScrean('close', 'listOfLoadedWagonsPopUp')"
-            v-else
-          >
-            <el-icon class=""><CopyDocument /></el-icon>
-          </el-button>
-
-          <!-- 弹窗关闭按钮 -->
-          <el-button type="text">
-            <el-icon class="" @click="close"><Close /></el-icon>
-          </el-button>
-        </div>
-      </div>
-    </template>
-
-    <div
-      :class="{
-        dialog_container: true,
-        fullScreen: details.fullscreenObj.listOfLoadedWagonsPopUp,
-      }"
-    >
-      <TripartiteTransferPrintTemplate
-        ref="truckLoadingDetailNodeRef"
-        v-if="details.popUpShow.listOfLoadedWagons"
-        :waybillInfo="details.listOfLoadedWagonsData"
-      />
-    </div>
-    <div class="flex-c-c mt10">
-      <el-button icon="el-icon-circle-close" @click="details.popUpShow.listOfLoadedWagons = false">
-        取 消
-      </el-button>
-      <el-button type="primary" icon="Download" @click="handleExportTruckLoadingDetail">
-        导 出
-      </el-button>
-      <el-button type="primary" icon="Printer" @click="handlePrint"> 打 印 </el-button>
-    </div>
-  </el-dialog>
+    <TripartiteTransferPrintTemplate :waybillInfo="details.listOfLoadedWagonsData" />
+  </MyPrint>
 
   <!-- 发车提示 -->
   <DeleteWarningDialog
@@ -1496,23 +1445,6 @@ const handleSubmitSiginImg = async () => {
     details.loadingObj.pageLoading = false;
   }
 };
-
-/** 配载打印 */
-const handlePrint = () => {
-  const nodeList = document.querySelectorAll('.listOfLoadedWagonsPopUp table');
-
-  console.log('nodeList :>> ', nodeList);
-
-  print(nodeList);
-};
-
-/** 装车清单导出 */
-const handleExportTruckLoadingDetail = () => {
-  exportExcelByDom(
-    truckLoadingDetailNodeRef.value.$el,
-    details.selectionList[0].carsNo + '' + dateNow() + '.xlsx'
-  );
-};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index 96e49ecd..7820168e 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -539,70 +539,18 @@
   </el-dialog>
 
   <!-- 配载清单 -->
-  <el-dialog
-    title="配载清单"
+  <MyPrint
     v-model="details.popUpShow.listOfLoadedWagons"
     width="80%"
-    :before-close="beforeClose"
-    append-to-body
-    :fullscreen="details.fullscreenObj.listOfLoadedWagonsPopUp"
-    :show-close="false"
-    class="listOfLoadedWagonsPopUp"
+    title="配载清单"
+    :exportName="details.selectionList[0] ? details.selectionList[0].carsNo : ''"
+    isFullscreen
   >
-    <!-- 标题 -- 头部控件区 -->
-    <template #header="{ close, titleId, titleClass }">
-      <div class="my-header flex-c-sb">
-        <div class="fwb" :id="titleId" :class="titleClass">配载清单</div>
-        <div class="flex-c-c">
-          <!-- 全屏显示按钮 -->
-          <el-button
-            type="text"
-            @click="handleFullScrean('open', 'listOfLoadedWagonsPopUp')"
-            v-if="!details.fullscreenObj.listOfLoadedWagonsPopUp"
-          >
-            <el-icon class=""><FullScreen /></el-icon>
-          </el-button>
-          <el-button
-            type="text"
-            @click="handleFullScrean('close', 'listOfLoadedWagonsPopUp')"
-            v-else
-          >
-            <el-icon class=""><CopyDocument /></el-icon>
-          </el-button>
-
-          <!-- 弹窗关闭按钮 -->
-          <el-button type="text">
-            <el-icon class="" @click="close"><Close /></el-icon>
-          </el-button>
-        </div>
-      </div>
-    </template>
-
-    <div
-      :class="{
-        dialog_container: true,
-        fullScreen: details.fullscreenObj.listOfLoadedWagonsPopUp,
-      }"
-    >
-      <ArteryPrintTemplate
-        ref="truckLoadingDetailNodeRef"
-        v-if="details.popUpShow.listOfLoadedWagons"
-        :waybillInfo="details.listOfLoadedWagonsData"
-      />
-    </div>
-
-    <div class="flex-c-c mt10">
-      <el-button icon="el-icon-circle-close" @click="details.popUpShow.listOfLoadedWagons = false">
-        取 消
-      </el-button>
-
-      <el-button type="primary" icon="Download" @click="handleExportTruckLoadingDetail">
-        导 出
-      </el-button>
-
-      <el-button type="primary" icon="Printer" @click="handlePrint"> 打 印 </el-button>
-    </div>
-  </el-dialog>
+    <ArteryPrintTemplate
+      :waybillInfo="details.listOfLoadedWagonsData"
+      ref="truckLoadingDetailNodeRef"
+    />
+  </MyPrint>
 
   <!-- 卸车清单 -->
   <el-dialog title="卸车清单" v-model="details.popUpShow.unloadReport" width="780px" append-to-body>
@@ -1719,24 +1667,6 @@ const handleDirectGoMarketDetails = ({ row }) => {
   });
 };
 
-/** 配载打印 */
-const handlePrint = () => {
-  const nodeList = document.querySelectorAll('.listOfLoadedWagonsPopUp .VehicleStowageTable');
-
-  print(nodeList);
-};
-
-/** 装车清单导出 */
-const handleExportTruckLoadingDetail = () => {
-  exportExcelByDom(
-    truckLoadingDetailNodeRef.value.$el,
-    details.selectionList[0].carsNo + ' - ' + dateNow() + '.xlsx'
-  );
-};
-
-/** 配载图片显示 */
-const handleShowVehicleImgs = async ({ row }) => {};
-
 /** 导出 */
 const handleExport = () => {
   ElMessageBox.confirm('确定导出吗?', '提示', {
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index a06ea247..0aab4598 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -253,8 +253,8 @@
             <el-tag
               v-if="slotProps.scope.row.isCustomer"
               :class="slotProps.scope.row.isCustomer === '1' ? 'green' : 'red'"
-              >{{ slotProps.scope.row.isCustomerName }}</el-tag
-            >
+              >{{ slotProps.scope.row.isCustomerName }}
+            </el-tag>
           </template>
 
           <template
@@ -513,74 +513,18 @@
   </el-dialog>
 
   <!-- 配载清单 -->
-  <el-dialog
-    title="配载清单"
+  <MyPrint
     v-model="details.popUpShow.listOfLoadedWagons"
     width="80%"
-    destroy-on-close
-    append-to-body
-    :fullscreen="details.fullscreenObj.listOfLoadedWagonsPopUp"
-    :show-close="false"
-    class="listOfLoadedWagonsPopUp"
+    title="配载清单"
+    :exportName="details.selectionList[0] ? details.selectionList[0].carsNo : ''"
+    isFullscreen
   >
-    <!-- 标题 -- 头部控件区 -->
-    <template #header="{ close, titleId, titleClass }">
-      <div class="my-header flex-c-sb">
-        <div class="fwb" :id="titleId" :class="titleClass">配载清单</div>
-        <div class="flex-c-c">
-          <!-- 全屏显示按钮 -->
-          <el-button
-            type="text"
-            @click="handleFullScrean('open', 'listOfLoadedWagonsPopUp')"
-            v-if="!details.fullscreenObj.listOfLoadedWagonsPopUp"
-          >
-            <el-icon class=""><FullScreen /></el-icon>
-          </el-button>
-          <el-button
-            type="text"
-            @click="handleFullScrean('close', 'listOfLoadedWagonsPopUp')"
-            v-else
-          >
-            <el-icon class=""><CopyDocument /></el-icon>
-          </el-button>
-
-          <!-- 弹窗关闭按钮 -->
-          <el-button type="text">
-            <el-icon class="" @click="close"><Close /></el-icon>
-          </el-button>
-        </div>
-      </div>
-    </template>
-
-    <div v-loading="details.loadingObj.truckLoadingDetailPopUpLoading">
-      <div
-        :class="{
-          dialog_container: true,
-          fullScreen: details.fullscreenObj.listOfLoadedWagonsPopUp,
-        }"
-      >
-        <ArteryPrintTemplate
-          v-if="details.popUpShow.listOfLoadedWagons"
-          :waybillInfo="details.listOfLoadedWagonsData"
-          ref="truckLoadingDetailNodeRef"
-        />
-      </div>
-      <div class="dialog-footer">
-        <el-button
-          icon="el-icon-circle-close"
-          @click="details.popUpShow.listOfLoadedWagons = false"
-        >
-          取 消
-        </el-button>
-
-        <el-button type="primary" icon="Download" @click="handleExportTruckLoadingDetail">
-          导 出
-        </el-button>
-
-        <el-button type="primary" icon="Printer" @click="handlePrint"> 打 印 </el-button>
-      </div>
-    </div>
-  </el-dialog>
+    <ArteryPrintTemplate
+      :waybillInfo="details.listOfLoadedWagonsData"
+      ref="truckLoadingDetailNodeRef"
+    />
+  </MyPrint>
 
   <!-- 列表配置显示 -->
   <edittablehead
@@ -1530,32 +1474,6 @@ const handleShowListOfLoadedWagons = async () => {
   }
 };
 
-/** 配载打印 */
-const handlePrint = () => {
-  const nodeList = document.querySelectorAll('.listOfLoadedWagonsPopUp table');
-  console.log(nodeList, 123);
-  print(nodeList);
-};
-
-/** 装车清单导出 */
-const handleExportTruckLoadingDetail = () => {
-  exportExcelByDom(
-    truckLoadingDetailNodeRef.value.$el,
-    details.selectionList[0].carsNo + ' - ' + dateNow() + '.xlsx'
-  );
-};
-
-/** 配载图片显示 */
-const handleShowVehicleImgs = async ({ row }) => {
-  $router.push({
-    path: '/distribution/artery/VehicleNodeImgs',
-    query: {
-      name: `${row.carsNo} - 配载图片`,
-      loadId: row.id,
-    },
-  });
-};
-
 /** 导出 */
 const handleExport = () => {
   ElMessageBox.confirm('确定导出吗?', '提示', {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index 4659e9f8..d2f0206f 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -287,26 +287,6 @@
     :columnList="columnList"
     v-model="columnList"
   ></edittablehead>
-
-  <el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
-    <div>
-      <div v-html="html"></div>
-
-      <!-- <div v-for="(item,index) in qrCodeObj">
-            <el-row>
-              <el-col :span="24" >
-                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
-              </el-col>
-            </el-row>
-          </div> -->
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-      <el-button type="primary" @click="printTemplate">打 印</el-button>
-      <el-button type="primary" @click="isShow = false">确 定</el-button>
-      <el-button @click="isShow = false">取 消</el-button>
-    </span>
-  </el-dialog>
 </template>
 
 <script>
@@ -349,8 +329,6 @@ export default {
       view: false,
       // 打印模版
       html: '',
-      // 是否显示打印模版
-      isShow: false,
       // 查询信息
       query: {},
       //数据统计
@@ -784,19 +762,6 @@ export default {
 
       //费用列表
     },
-
-    /**
-     * 批量打印
-     */
-    printBatchOrder() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      const ids = Array.from(this.selectionList).join(',');
-      printBatch({ ids, type: 1 });
-      this.isShow = true;
-    },
     aaa() {
       let addvalueInfos = [];
       this.form.addvalueType.forEach((item, index) => {
@@ -1148,13 +1113,6 @@ export default {
       //   this.form = res.data.data;
       // });
     },
-
-    /**
-     * 打印
-     */
-    printTemplate() {
-      print();
-    },
   },
 };
 </script>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index c767307f..0e76f627 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -203,18 +203,6 @@
           </el-pagination>
         </div>
       </el-row>
-
-      <!-- 打印模块 -->
-      <!-- <el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
-        <div ref="tableRef">
-          <div v-html="html"></div>
-        </div>
-        <span slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="printTemplate">打 印</el-button>
-          <el-button type="primary" @click="handleExport">导 出</el-button>
-          <el-button @click="isShow = false">关 闭</el-button>
-        </span>
-      </el-dialog> -->
     </div>
 
     <el-dialog
@@ -304,7 +292,7 @@
       </template>
     </el-dialog>
   </basic-container>
-
+  <!-- 打印模块 -->
   <MyPrint :html="html" v-model="isShow" width="70%"></MyPrint>
 
   <edittablehead
@@ -1044,77 +1032,6 @@ export default {
           this.statistics = res.data.data;
         }
       );
-      // getDetail(row.id).then(res => {
-      //   this.form = res.data.data;
-      // });
-    },
-    /**
-     * 打印
-     */
-    printTemplate() {
-      print();
-    },
-    /** 导出 */
-    handleExport() {
-      console.log('this.$refs.tableRef :>> ', this.$refs.tableRef);
-
-      const table = this.$refs.tableRef;
-
-      /* 将表格转换为 Workbook 对象 */
-      const wb = XLSX.utils.table_to_book(table);
-
-      console.log('wb :>> ', wb);
-
-      wb.Sheets.Sheet1;
-
-      //单元格外侧框线
-      const borderAll = {
-        top: {
-          style: 'thin',
-        },
-        bottom: {
-          style: 'thin',
-        },
-        left: {
-          style: 'thin',
-        },
-        right: {
-          style: 'thin',
-        },
-      };
-
-      for (const key in wb.Sheets.Sheet1) {
-        const item = wb.Sheets.Sheet1[key];
-
-        const type = getObjType(item);
-
-        console.log('type :>> ', type);
-
-        if (type !== 'object') continue;
-
-        item.s = {
-          border: borderAll,
-          font: {
-            // name: "微软雅黑",
-            // sz: 16,
-            color: { rgb: '000000' },
-            bold: true,
-            italic: false,
-            underline: false,
-          },
-          fill: {
-            fgColor: { rgb: 'C5D9F1' },
-          },
-          alignment: {
-            horizontal: 'center',
-            vertical: 'center',
-            wrapText: false, // 自动换行
-          },
-        };
-      }
-
-      /* 导出 Workbook 到 Excel 文件 */
-      XLSX.writeFile(wb, 'data.xlsx');
     },
   },
 };
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 7ada45d7..9f2748cf 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -807,7 +807,14 @@
     </div>
 
     <!-- 打印模块 -->
-    <MyPrint :html="html" v-model="isShowPrint" type="titlePrint" width="780px"></MyPrint>
+    <MyPrint
+      :html="html"
+      v-model="isShowPrint"
+      :isShowExport="false"
+      type="titlePrint"
+      width="780px"
+    ></MyPrint>
+
     <MyPrint :html="html" v-model="dialogVisibleF" width="70%"></MyPrint>
 
     <el-dialog
@@ -4700,20 +4707,6 @@ export default {
         })
         .catch(() => {});
     },
-    /**printTemplate
-     * 打印
-     */
-    printTemplatePackage() {
-      const orderNode = document.querySelectorAll('.BarCode>div>div');
-      console.log('orderNode :>> ', orderNode);
-
-      print(orderNode, 'titlePrint');
-    },
-    printTemplate() {
-      const orderNode = document.querySelectorAll('.waybill>div>div');
-      console.log('orderNode :>> ', orderNode);
-      print(orderNode);
-    },
     handleSubmit() {
       this.$refs.form.validate(valid => {
         if (valid) {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index c2cd7c9d..39c41bfa 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -196,21 +196,6 @@
           </el-pagination>
         </div>
       </div>
-
-      <!-- <el-dialog v-model="dydialogVisible" title="二维码" width="50%">
-        <distributionDeliveryListmar></distributionDeliveryListmar>
-      </el-dialog> -->
-      <!-- 打印模块 -->
-      <!-- <el-dialog title="二维码" :visible.sync="isShow" width="70%" v-model="isShow">
-        <div>
-          <div v-html="html"></div>
-        </div>
-        <span slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="printTemplate">打 印</el-button>
-          <el-button type="primary" @click="isShow = false">确 定</el-button>
-          <el-button @click="isShow = false">取 消</el-button>
-        </span>
-      </el-dialog> -->
     </div>
   </basic-container>
 
@@ -898,13 +883,6 @@ export default {
         this.loadingObj.pageLoading = false;
       }
     },
-
-    /**
-     * 打印
-     */
-    printTemplate() {
-      print();
-    },
   },
 };
 </script>
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 67fc35c2..d2c7beda 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -338,19 +338,16 @@
           </span>
         </template>
       </el-dialog>
-
-      <!-- <el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
-        <div class="print_QRCode">
-          <div v-html="html"></div>
-        </div>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" icon="Printer" @click="printTemplate">打 印</el-button>
-        </span>
-      </el-dialog> -->
     </div>
 
-    <MyPrint :html="html" v-model="dialogVisible" title="二维码" type="titlePrint" />
+    <!-- 打印 -->
+    <MyPrint
+      :html="html"
+      v-model="dialogVisible"
+      :isShowExport="false"
+      title="二维码"
+      type="titlePrint"
+    />
 
     <el-dialog v-model="waybillrecipient" title="修改运单收货人">
       <el-form
@@ -663,10 +660,6 @@ export default {
       if (!index) delete this.queryPage[row.prop];
       this.package();
     },
-    printTemplate() {
-      const orderNodeList = document.querySelectorAll('.print_QRCode>div>div');
-      print(orderNodeList, 'titlePrint');
-    },
     //提交物品数据
     handleSubmitMethod() {
       // console.log(">>>",this.formMaterial);
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index 6ee485c0..158e8d38 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -283,16 +283,8 @@
         </div>
       </el-row>
 
-      <el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
-        <div class="printQr">
-          <div v-html="html"></div>
-        </div>
-        <span slot="footer" class="dialog-footer">
-          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-          <el-button type="primary" @click="printTemplate">打 印</el-button>
-          <el-button @click="dialogVisible = false">取 消</el-button>
-        </span>
-      </el-dialog>
+      <!-- 打印 -->
+      <MyPrint :html="html" v-model="dialogVisible" width="80vw" title="二维码" />
     </div>
   </basic-container>
   <edittablehead
@@ -1669,15 +1661,6 @@ export default {
       }
     },
 
-    /**
-     * 调用打印机
-     */
-    printTemplate() {
-      // const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
-      const orderNodeList = document.querySelectorAll('.printQr>div>div');
-      print(orderNodeList);
-    },
-
     /** 设置列表高度 */
     async setListHeight() {
       // 等待子组件渲染完毕
@@ -1728,9 +1711,9 @@ export default {
 // .el-tab-pane{
 //   margin-top: -20px;
 // }
-:deep(.el-dialog) {
-  width: fit-content !important;
-}
+// :deep(.el-dialog) {
+//   width: fit-content !important;
+// }
 .el-input__inner {
   font-weight: normal;
 }
diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
index 5e4bfcd2..1b15c8ad 100644
--- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
@@ -242,25 +242,27 @@
           </el-pagination>
         </div>
       </el-row>-->
-      <el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
+      <!-- <el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
         <div>
           <div v-html="html"></div>
-
-          <!-- <div v-for="(item,index) in qrCodeObj">
-            <el-row>
-              <el-col :span="24" >
-                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
-              </el-col>
-            </el-row>
-          </div> -->
         </div>
         <span slot="footer" class="dialog-footer">
-          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
           <el-button type="primary" @click="printTemplate">打 印</el-button>
           <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
           <el-button @click="dialogVisible = false">取 消</el-button>
         </span>
-      </el-dialog>
+      </el-dialog> -->
+
+      <!-- 打印 -->
+      <MyPrint
+        :html="html"
+        width="780px"
+        v-model="dialogVisible"
+        :isShowExport="false"
+        title="二维码"
+        type="titlePrint"
+      />
+
       <el-dialog title="包条码" :visible.sync="dialogPack" width="1180px" v-model="dialogPack">
         <el-text type="primary" icon="el-icon-view" @click="handleBatchDetail('1')"
           >批量打印</el-text
@@ -1606,12 +1608,7 @@ export default {
         });
       }
     },
-    //打印
-    printTemplate() {
-      // const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
-      // 调用打印方法打印表单
-      print('', 'titlePrint');
-    },
+
     //查看包条码
     handleQRCode(row) {
       // this.title = '查看'
diff --git a/src/views/finance/CustomerSettlement.vue b/src/views/finance/CustomerSettlement.vue
index b261606a..61a40868 100644
--- a/src/views/finance/CustomerSettlement.vue
+++ b/src/views/finance/CustomerSettlement.vue
@@ -16,7 +16,7 @@
               filterable
               clearable
               placeholder="请选择目的仓"
-              style="width: 240px"
+              style="width: 100%"
             >
               <el-option
                 v-for="item in warehouseList"
@@ -30,7 +30,7 @@
             <el-select
               v-model="details.query.balanceStatus"
               placeholder="请选择"
-              style="width: 240px"
+              style="width: 100%"
               clearable
             >
               <el-option label="未结算" value="0" />
@@ -303,6 +303,25 @@ const initOnLoad = (params = {}) => {
   onLoad(params);
 };
 
+// 初始化时间
+const initTime = () => {
+  const date = new Date();
+  const _defaultTime = [];
+
+  _defaultTime[0] = dayjs(
+    dayjs(date.getTime() - 1000 * 60 * 60 * 24 * 7).format('YYYY-MM-DD')
+  ).format('YYYY-MM-DD HH:mm:ss');
+  _defaultTime[1] = dayjs(
+    new Date(dayjs(date.getTime()).format('YYYY-MM-DD')).getTime() +
+      1000 * 60 * 60 * 24 -
+      8 * 60 * 60 * 1000 -
+      1
+  ).format('YYYY-MM-DD HH:mm:ss');
+
+  details.query.ReconciliationconfirmationTime = _defaultTime;
+};
+
+initTime();
 initOnLoad();
 
 /** 搜索 */
diff --git a/src/views/mail/reservation/list.vue b/src/views/mail/reservation/list.vue
index 97d14ad5..7463f621 100644
--- a/src/views/mail/reservation/list.vue
+++ b/src/views/mail/reservation/list.vue
@@ -204,16 +204,8 @@
         </div>
       </el-row>
 
-      <el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
-        <div>
-          <div v-html="html"></div>
-        </div>
-        <span slot="footer" class="dialog-footer">
-          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-          <el-button type="primary" @click="printTemplate">打 印</el-button>
-          <el-button @click="dialogVisible = false">取 消</el-button>
-        </span>
-      </el-dialog>
+      <!-- 打印 -->
+      <MyPrint :html="html" v-model="dialogVisible" width="80vw" title="二维码" />
     </div>
   </basic-container>
   <edittablehead
@@ -288,7 +280,7 @@ import { getStockUpArea, stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import dayjs from 'dayjs';
 import print from '@/utils/print';
 import { downloadXls, handleClearTableQuery } from '@/utils/util';
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus';
 export default {
   data() {
     return {
@@ -945,33 +937,26 @@ export default {
       // console.log('this.activename :>> ', this.activename);
     },
     cancelReservationConfirm(row) {
-      ElMessageBox.confirm(
-    '是否确认取消预约?',
-    '提示',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }
-  )
-    .then(() => {
-      let data={
-        ids:row.id
-      }
-      $_batchCancelReservation(data).then(res => {
-        if(res.data.code == 200){
-      ElMessage({
-        type: 'success',
-        message:res.data.msg,
+      ElMessageBox.confirm('是否确认取消预约?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
-          this.onLoad(this.page);
-        }
-      });
-
-    })
-    .catch(() => {
-    })
-
+        .then(() => {
+          let data = {
+            ids: row.id,
+          };
+          $_batchCancelReservation(data).then(res => {
+            if (res.data.code == 200) {
+              ElMessage({
+                type: 'success',
+                message: res.data.msg,
+              });
+              this.onLoad(this.page);
+            }
+          });
+        })
+        .catch(() => {});
     },
     ddd() {
       this.form.deliveryType === '';
@@ -1403,14 +1388,6 @@ export default {
         this.html;
       }
     },
-
-    /**
-     * 调用打印机
-     */
-    printTemplate() {
-      const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
-      print(orderNodeList);
-    },
   },
 };
 </script>
@@ -1418,9 +1395,7 @@ export default {
 // .el-tab-pane{
 //   margin-top: -20px;
 // }
-:deep(.el-dialog) {
-  width: fit-content !important;
-}
+
 .el-input__inner {
   font-weight: normal;
 }
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index d917835f..d442f72d 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -178,16 +178,15 @@
     v-model="columnList"
   ></edittablehead>
 
-  <el-dialog title="二维码" :visible.sync="dialogVisibleF" width="780px" v-model="dialogVisibleF">
-    <div>
-      <div v-html="html"></div>
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-      <el-button type="primary" @click="printTemplate">打 印</el-button>
-      <el-button @click="dialogVisibleF = false">取 消</el-button>
-    </span>
-  </el-dialog>
+  <!-- 打印 -->
+  <MyPrint
+    :html="html"
+    width="780px"
+    v-model="dialogVisibleF"
+    :isShowExport="false"
+    title="二维码"
+    type="titlePrint"
+  />
 </template>
 
 <script>
@@ -698,7 +697,7 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40,
+        total: 0,
       },
       // 表单数据
       form: {},
@@ -1103,11 +1102,6 @@ export default {
         return dateTimeString;
       }
     },
-    /** 打印 */
-    printTemplate() {
-      const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
-      print(orderNodeList, 'titlePrint');
-    },
   },
 };
 </script>
diff --git a/src/views/waybill/orderDetails.vue b/src/views/waybill/orderDetails.vue
index e9ee94a9..6d5abe6d 100644
--- a/src/views/waybill/orderDetails.vue
+++ b/src/views/waybill/orderDetails.vue
@@ -78,23 +78,15 @@
     </div>
   </basic-container>
 
-  <!-- 打印二维码 -->
-  <el-dialog
-    class="el-dialog-QRCode"
-    title="二维码"
-    :visible.sync="details.popUpShow.QRCodeVisible"
+  <!-- 打印 -->
+  <MyPrint
+    :html="details.html"
     width="780px"
     v-model="details.popUpShow.QRCodeVisible"
-  >
-    <div>
-      <div v-html="details.html"></div>
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-      <el-button type="primary" @click="printTemplate">打 印</el-button>
-      <el-button @click="details.popUpShow.QRCodeVisible = false">取 消</el-button>
-    </span>
-  </el-dialog>
+    :isShowExport="false"
+    title="二维码"
+    type="titlePrint"
+  />
 
   <!-- 列表配置显示 -->
   <edittablehead
@@ -344,12 +336,6 @@ const selectionChange = (list: any) => {
   details.selectionList = list;
 };
 
-/** 打印包条码 */
-const printTemplate = () => {
-  const orderNodeList = document.querySelectorAll('.el-dialog-QRCode .el-dialog__body>div>div>div');
-  print(orderNodeList);
-};
-
 /** 查看包明细 */
 const handleShowPackageOrderList = ({ row }) => {
   $router.push({
diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue
index cb414e0d..cb227b4c 100644
--- a/src/views/waybill/orderPackageList.vue
+++ b/src/views/waybill/orderPackageList.vue
@@ -715,11 +715,6 @@ const batchPrintOrder = ({ row }) => {
   });
 };
 
-/** 打印包条码 */
-const printTemplate = () => {
-  const orderNodeList = document.querySelectorAll('.el-dialog-QRCode .el-dialog__body>div>div>div');
-  print(orderNodeList);
-};
 // 导出
 const ExportData = () => {
   tcTableexport.value = true;
diff --git a/src/views/waybill/orderPackageListDetails.vue b/src/views/waybill/orderPackageListDetails.vue
index 05f702e8..a9490e1f 100644
--- a/src/views/waybill/orderPackageListDetails.vue
+++ b/src/views/waybill/orderPackageListDetails.vue
@@ -757,12 +757,6 @@ const printOrder = async ({ row }) => {
   }
 };
 
-/** 打印包条码 */
-const printTemplate = () => {
-  const orderNodeList = document.querySelectorAll('.el-dialog-QRCode .el-dialog__body>div>div>div');
-  print(orderNodeList);
-};
-
 /** 入库 */
 const handlePutInStorage = ({ row }) => {
   console.log('row :>> ', row);
diff --git a/src/views/waybill/orderPackageListDetailsByMarket.vue b/src/views/waybill/orderPackageListDetailsByMarket.vue
index b6d27bad..571ecc7b 100644
--- a/src/views/waybill/orderPackageListDetailsByMarket.vue
+++ b/src/views/waybill/orderPackageListDetailsByMarket.vue
@@ -733,12 +733,6 @@ const printOrder = async ({ row }) => {
   }
 };
 
-/** 打印包条码 */
-const printTemplate = () => {
-  const orderNodeList = document.querySelectorAll('.el-dialog-QRCode .el-dialog__body>div>div>div');
-  print(orderNodeList);
-};
-
 /** 入库 */
 const handlePutInStorage = ({ row }) => {
   console.log('row :>> ', row);