From aba8d16e058d6177122c37ea34baf77b09d801d4 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 7 Feb 2025 09:13:35 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=94=AE=E5=90=8Ebug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aftersales/aftersalesWorkOrderend.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index 00928002..dd85c3ed 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -2966,7 +2966,7 @@ const AppealEstablished = () => {
 
   .right {
     width: 100%;
-
+    width: 31.8%;
     :deep(.el-card__body) {
       padding: 10px !important;
     }

From d19a7edc20f58fd74c8f8638ed0cd959a55ec9c3 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 7 Feb 2025 09:34:43 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aftersales/aftersalesWorkOrderend.vue | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index dd85c3ed..51591590 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -2962,24 +2962,23 @@ const AppealEstablished = () => {
 
   :deep(.el-affix) {
     width: 30% !important;
-  }
-
-  .right {
+    .right {
     width: 100%;
-    width: 31.8%;
-    :deep(.el-card__body) {
+   .el-card__body{
       padding: 10px !important;
     }
-
-    :deep(.el-timeline) {
+    .el-timeline{
       padding: 0;
     }
-
     .content {
       position: relative;
     }
   }
 
+
+  }
+
+
   :deep(.el-card) {
     box-shadow: -1px -1px 4px 0px #e3e3e3;
     border-top-left-radius: 20px;

From 07bba9d862cbd3ded5afb8a31293ca4cf8258af6 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 8 Feb 2025 17:35:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  6 ++
 src/components/MyPrint/MyPrint.vue            | 28 ++++++++-
 .../WaybillPrintTemplate.vue                  | 59 ++++++++++---------
 src/store/index.js                            |  2 +
 src/store/modules/print.js                    | 55 +++++++++++++++++
 src/utils/print.js                            | 18 +++---
 6 files changed, 128 insertions(+), 40 deletions(-)
 create mode 100644 src/store/modules/print.js

diff --git a/src/App.vue b/src/App.vue
index dd860cda..329c06b4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,6 +5,12 @@
 <script lang="ts" setup>
 import watermark from '@/utils/watermark.js';
 watermark.set('货无忧');
+import { useStore } from 'vuex';
+
+const $store = useStore();
+
+console.log('$store :>> ', $store);
+$store.commit('GET_PRINT_LIST');
 </script>
 
 <style lang="scss">
diff --git a/src/components/MyPrint/MyPrint.vue b/src/components/MyPrint/MyPrint.vue
index 65bc3559..37497e57 100644
--- a/src/components/MyPrint/MyPrint.vue
+++ b/src/components/MyPrint/MyPrint.vue
@@ -54,6 +54,19 @@
         >
           打 印
         </el-button>
+
+        <el-select
+          v-model="activeIndex"
+          placeholder="打印机"
+          style="width: 200px; margin-left: 10px"
+        >
+          <el-option
+            v-for="item in $store.state.print.printList"
+            :label="item.label"
+            :value="item.value"
+            :key="item.label"
+          />
+        </el-select>
       </div>
     </el-dialog>
   </div>
@@ -67,6 +80,9 @@ import { getObjType } from '@/utils/util';
 import * as XLSX from 'xlsx';
 import { exportExcelByDom } from '@/utils/export';
 import { dateNow } from '@/utils/date';
+import { useStore } from 'vuex';
+
+const $store = useStore();
 
 const props = defineProps({
   /** 打印内容 */
@@ -125,6 +141,16 @@ const visible = computed({
   },
 });
 
+const activeIndex = computed({
+  get() {
+    return $store.state.print[props.type + 'ActiveIndex'];
+  },
+  set(activeIndex) {
+    // 设置打印机
+    $store.commit('SET_PRINT_ACTIVE', { activeIndex, type: props.type });
+  },
+});
+
 const details = reactive({
   /** 打印loading */
   printLoading: false,
@@ -227,7 +253,7 @@ const printTemplate = () => {
   const nodeArr = document.querySelectorAll('.printSmallText');
 
   for (let i = 0; i < nodeArr.length; i++) {
-    const val = nodeArr[i];
+    const val = nodeArr[i] as any;
     val.style.fontSize = '0.5rem';
     val.style.lineHeight = '0.7rem';
   }
diff --git a/src/components/WaybillPrintTemplate/WaybillPrintTemplate.vue b/src/components/WaybillPrintTemplate/WaybillPrintTemplate.vue
index 7bb68129..6a10c4e8 100644
--- a/src/components/WaybillPrintTemplate/WaybillPrintTemplate.vue
+++ b/src/components/WaybillPrintTemplate/WaybillPrintTemplate.vue
@@ -18,6 +18,19 @@
             打 印(自定义模板)
           </el-button>
 
+          <el-select
+            v-model="activeIndex"
+            placeholder="打印机"
+            style="width: 200px; margin-left: 10px"
+          >
+            <el-option
+              v-for="item in $store.state.print.printList"
+              :label="item.label"
+              :value="item.value"
+              :key="item.label"
+            />
+          </el-select>
+
           <el-form-item label="是否显示运费" style="margin: 0px 0px 0px 10px">
             <el-checkbox v-model="isShowFreight" @change="handleShowFreight"></el-checkbox>
           </el-form-item>
@@ -37,6 +50,7 @@ import * as XLSX from 'xlsx';
 import { onMounted } from 'vue';
 import { nextTick } from 'vue';
 import { watch } from 'vue';
+import { useStore } from 'vuex';
 
 const props = defineProps({
   html: {
@@ -68,6 +82,7 @@ const props = defineProps({
 const isShowFreight = ref(false);
 
 const $emit = defineEmits(['update:modelValue']);
+const $store = useStore();
 
 const visible = computed({
   get: () => props.modelValue,
@@ -76,6 +91,16 @@ const visible = computed({
   },
 });
 
+const activeIndex = computed({
+  get() {
+    return $store.state.print.titlePrintActiveIndex;
+  },
+  set(activeIndex) {
+    // 设置打印机
+    $store.commit('SET_PRINT_ACTIVE', { activeIndex, type: 'titlePrint' });
+  },
+});
+
 const handleClose = () => {
   visible.value = false;
 };
@@ -163,60 +188,39 @@ const handleExport = () => {
 const printTemplate = (type: 'haveTem' | 'notHaveTem') => {
   const printNode = document.querySelectorAll('.printCode > div > div');
 
-  // const cloneNodeList = [];
-
-  // for (let i = 0; i < printNode.length; i++) {
-  //   cloneNodeList.push(printNode[i].cloneNode(true));
-  // }
-
-  // for (let i = 0; i < printNode.length; i++) {
-  //   const element = printNode[i];
-
-  //   for (let j = 0; j < element.childNodes.length; j++) {
-  //     const child = element.childNodes[j];
-
-  //     console.log('child :>> ', child.childNodes);
-  //     // if (child.className !== 'image-container') continue;
-  //     // // child.style.setProperty('--isShow', type === 'haveTem' ? 'flex' : 'none');
-  //     // child.style.setProperty('--aa', type === 'haveTem' ? '#000' : '#fff');
-  //     // child.style.setProperty('--height', type === 'haveTem' ? 'auto' : '0px');
-  //     // break;
-  //   }
-  // }
-
   const imgNode = document.querySelectorAll('.printCode img');
   console.log('imgNode :>> ', imgNode);
   // return
   for (let index = 0; index < imgNode.length; index++) {
-    const element = imgNode[index];
+    const element = imgNode[index] as any;
     element.style.display = type === 'haveTem' ? 'block' : 'none';
   }
 
   const titleArr = document.querySelectorAll('.printCode .title');
 
   for (let index = 0; index < titleArr.length; index++) {
-    const element = titleArr[index];
+    const element = titleArr[index] as any;
     element.style.color = type === 'haveTem' ? '#000' : '#fff';
   }
 
   const borderLeftArr = document.querySelectorAll('.printCode .border-table-row-left');
 
   for (let index = 0; index < borderLeftArr.length; index++) {
-    const element = borderLeftArr[index];
+    const element = borderLeftArr[index] as any;
     element.style.borderColor = type === 'haveTem' ? '#000' : '#fff';
   }
 
   const table = document.querySelectorAll('.printCode .border-table');
 
   for (let index = 0; index < table.length; index++) {
-    const element = table[index];
+    const element = table[index] as any;
     element.style.borderColor = type === 'haveTem' ? '#000' : '#fff';
   }
 
   const lineArr = document.querySelectorAll('.printCode .line');
 
   for (let index = 0; index < lineArr.length; index++) {
-    const element = lineArr[index];
+    const element = lineArr[index] as any;
     element.style.borderColor = type === 'haveTem' ? '#000' : '#fff';
   }
 
@@ -229,8 +233,7 @@ const handleShowFreight = value => {
   console.log('freightNode :>> ', freightNode);
 
   for (let index = 0; index < freightNode.length; index++) {
-    const element = freightNode[index];
-    console.dir(element);
+    const element = freightNode[index] as any;
     element.style.color = value ? '#000' : '#fff';
   }
 };
diff --git a/src/store/index.js b/src/store/index.js
index c48f7938..d218709a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -7,6 +7,7 @@ import dict from './modules/dict';
 import isRefresh from './modules/isRefresh';
 import Customer from './modules/Customer';
 import getters from './getters';
+import print from './modules/print';
 
 const store = createStore({
   modules: {
@@ -17,6 +18,7 @@ const store = createStore({
     dict,
     isRefresh,
     Customer,
+    print,
   },
   getters,
 });
diff --git a/src/store/modules/print.js b/src/store/modules/print.js
new file mode 100644
index 00000000..d62a1e94
--- /dev/null
+++ b/src/store/modules/print.js
@@ -0,0 +1,55 @@
+import { setStore, getStore } from 'utils/store'; // 从 'utils/store' 导入 setStore 和 getStore 方法
+import { getLodop } from '@/utils/LodopFuncs';
+
+const print = {
+  state: {
+    /** 本地打印机列表 */
+    printList: [],
+    /** 打印机 -- 配送单类型 */
+    deliveryPrintActiveIndex: 0,
+    /** 打印机 -- 标签打印机类型 */
+    titlePrintActiveIndex: 0,
+  },
+  mutations: {
+    /** 获取当前设备的打印机 */
+    GET_PRINT_LIST(state) {
+      const timer = setTimeout(() => {
+        let LODOP = getLodop();
+        const _count = LODOP.GET_PRINTER_COUNT();
+
+        const _name = LODOP.GET_PRINTER_NAME(-1);
+
+        const _deliveryPrintActiveName = window.localStorage.getItem('deliveryPrintActiveName');
+        const _titlePrintActiveName = window.localStorage.getItem('titlePrintActiveName');
+
+        for (let index = 0; index < _count; index++) {
+          const name = LODOP.GET_PRINTER_NAME(index);
+
+          _deliveryPrintActiveName &&
+            _deliveryPrintActiveName === name &&
+            (state.deliveryPrintActiveIndex = index);
+
+          _titlePrintActiveName &&
+            _titlePrintActiveName === name &&
+            (state.titlePrintActiveIndex = index);
+
+          if (name === _name) {
+            !_deliveryPrintActiveName && (state.deliveryPrintActiveIndex = index);
+            !_titlePrintActiveName && (state.titlePrintActiveIndex = index);
+          }
+          state.printList.push({ label: name, value: index });
+        }
+        clearTimeout(timer);
+      }, 2000);
+    },
+    /** 设置打印机 */
+    SET_PRINT_ACTIVE(state, action) {
+      state[action.type + 'ActiveIndex'] = action.activeIndex;
+      window.localStorage.setItem(
+        action.type + 'ActiveName',
+        state.printList[action.activeIndex].label
+      );
+    },
+  },
+};
+export default print;
diff --git a/src/utils/print.js b/src/utils/print.js
index dfb4a3c2..39ae80ce 100644
--- a/src/utils/print.js
+++ b/src/utils/print.js
@@ -1,10 +1,12 @@
 import { getLodop } from '@/utils/LodopFuncs';
 import hwyPrintNew from '@/utils/print/index';
 import { ElMessage } from 'element-plus';
+import store from '@/store/';
 
 /** 处理标签打印 */
-const handleTitlePrint = (LODOP, templateData) => {
+const handleTitlePrint = (LODOP, templateData, type) => {
   LODOP.PRINT_INITA('');
+  LODOP.SET_PRINTER_INDEX(store.state.print[type + 'ActiveIndex']);
   // LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
   LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
   // LODOP.SET_PRINT_STYLE('FontColor', '#000000');
@@ -19,8 +21,9 @@ const handleTitlePrint = (LODOP, templateData) => {
 };
 
 /** 打印配送单 */
-const handleDeliveryPrint = (LODOP, templateData) => {
+const handleDeliveryPrint = (LODOP, templateData, type) => {
   LODOP.PRINT_INITA('');
+  LODOP.SET_PRINTER_INDEX(store.state.print[type + 'ActiveIndex']);
   // LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
   LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
   // LODOP.SET_PRINT_STYLE('FontColor', '#000000');
@@ -47,13 +50,6 @@ const print = (nodeList, type = 'deliveryPrint') => {
   // 初始化打印实例
   let LODOP = getLodop();
 
-  // const _count = LODOP.GET_PRINTER_COUNT();
-
-  // for (let index = 0; index < _count; index++) {
-  //   const name = LODOP.GET_PRINTER_NAME(index);
-  //   console.log('name :>> ', name);
-  // }
-
   // 当列表内没有元素时, 退出函数
   if (nodeList.length === 0) return;
 
@@ -64,8 +60,8 @@ const print = (nodeList, type = 'deliveryPrint') => {
     let templateData = orderNode.innerHTML;
     // let templateData="<h1>1111</h1>"
 
-    if (type === 'titlePrint') handleTitlePrint(LODOP, templateData);
-    else handleDeliveryPrint(LODOP, templateData);
+    if (type === 'titlePrint') handleTitlePrint(LODOP, templateData, type);
+    else handleDeliveryPrint(LODOP, templateData, type);
     // LODOP.NewPage();
     LODOP.PRINT(); //直接打印
     // LODOP.PRINT_DESIGN();

From 719a308f2971d23773b83613e0ce26e8b6516a58 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 8 Feb 2025 17:35:51 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/reportforms/AuditTimelinessRatioReport.js        | 2 +-
 src/option/reportforms/PackageAllTrunklineTimePageReport.js | 2 +-
 src/views/reportforms/AuditTimelinessRatioReport.vue        | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/option/reportforms/AuditTimelinessRatioReport.js b/src/option/reportforms/AuditTimelinessRatioReport.js
index c3bdf9b2..56772596 100644
--- a/src/option/reportforms/AuditTimelinessRatioReport.js
+++ b/src/option/reportforms/AuditTimelinessRatioReport.js
@@ -83,7 +83,7 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'hasCheckNum',
+    prop: 'notCheckNum',
     label: '未审单数',
     type: 1,
     values: '',
diff --git a/src/option/reportforms/PackageAllTrunklineTimePageReport.js b/src/option/reportforms/PackageAllTrunklineTimePageReport.js
index 159c0074..35ce3e9f 100644
--- a/src/option/reportforms/PackageAllTrunklineTimePageReport.js
+++ b/src/option/reportforms/PackageAllTrunklineTimePageReport.js
@@ -359,7 +359,7 @@ export const columnList = [
   {
     prop: 'hoursTime',
     label: '标准时效(小时)',
-    type: 6,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
diff --git a/src/views/reportforms/AuditTimelinessRatioReport.vue b/src/views/reportforms/AuditTimelinessRatioReport.vue
index 80819a66..dc0aff65 100644
--- a/src/views/reportforms/AuditTimelinessRatioReport.vue
+++ b/src/views/reportforms/AuditTimelinessRatioReport.vue
@@ -316,6 +316,12 @@ const onLoad = async (params = {}) => {
     details.page.total = data.total;
 
     handleTranslationDataSeclect(details.data, details.columnList);
+
+    for (let i = 0; i < details.data.length; i++) {
+      const value = details.data[i];
+
+      value.notCheckNum = value.totalNum - value.hasCheckNum;
+    }
   } catch (error) {
     console.log('error :>> ', error);
   } finally {