From e83c4ff0cf6a87eba1bb2393fad5152d06866e0f Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Fri, 20 Oct 2023 09:33:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0=202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/application/mk/basic-pages/list.vue       |  7 ++++++
 .../BaseDepartment/BaseDepartment/List.vue    | 25 ++++++++++++++++---
 .../Mes/MesProcesses/MesProcesses/List.vue    | 22 ++++++++++++++--
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/application/mk/basic-pages/list.vue b/src/application/mk/basic-pages/list.vue
index d830fbe..7151c92 100644
--- a/src/application/mk/basic-pages/list.vue
+++ b/src/application/mk/basic-pages/list.vue
@@ -24,6 +24,8 @@
         <a-button type="primary" icon="delete" @click="pageDelete()">批量删除</a-button>
         <a-button type="primary" style="margin-left: 5px;" icon="print" v-if="options.enabledPrint"
           @click="pagePrint()">打印</a-button>
+        <a-button type="primary" style="margin-left: 5px;" icon="print" v-if="options.enabledPrint2"
+          @click="pagePrint2()">打印2</a-button>
 
         <a-button type="primary" style="margin-left: 5px;" icon="export" v-if="options.enabledExport"
           @click="pageExport()">导出</a-button>
@@ -175,6 +177,11 @@ export default {
       let tableData = JSON.parse(JSON.stringify(this.$refs.xGrid.getTableData().fullData));
       this.$emit("print", { tableData: tableData });
 
+    },
+    pagePrint2() {
+      let tableData = JSON.parse(JSON.stringify(this.$refs.xGrid.getTableData().fullData));
+      this.$emit("print2", { tableData: tableData });
+
     },
     pageExport() {
       let jsonRows = [];
diff --git a/src/pages/Middle/Mes/BaseDepartment/BaseDepartment/List.vue b/src/pages/Middle/Mes/BaseDepartment/BaseDepartment/List.vue
index 58057ad..e58a56e 100644
--- a/src/pages/Middle/Mes/BaseDepartment/BaseDepartment/List.vue
+++ b/src/pages/Middle/Mes/BaseDepartment/BaseDepartment/List.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-page-list :desc="desc" :options="pageOptions" @print="pagePrint"></basic-page-list>
+  <basic-page-list :desc="desc" :options="pageOptions" @print="pagePrint" @print2="pagePrint2"></basic-page-list>
 </template>
 
 <script>
@@ -40,6 +40,7 @@ export default {
         keyName: 'id', // 主键字段名 
         listFieldName: 'BaseDepartment',
         enabledPrint: true,
+        enabledPrint2: true,
         addPageUrl: "/BaseDepartment/BaseDepartmentAdd",
         editPageUrl: "/BaseDepartment/BaseDepartmentUpdate/",
 
@@ -113,10 +114,10 @@ export default {
       tdata.table = JSON.parse(JSON.stringify(tableData));
       tdata.table.forEach(item => {
         item.qrcode = JSON.stringify({
-          id : item.id.toString(),
-          types :"department"
+          id: item.id.toString(),
+          types: "department"
         });
-      }) 
+      })
 
       console.log(tdata.table)
       hiprint.init(); // 初始化打印组件
@@ -126,6 +127,22 @@ export default {
       hiprintTemplate.print(tdata, { printer: '', title: '部门' }); // 打印
     },
 
+    pagePrint2({ tableData }) {
+
+      let hiprint = this.$hiPrint; // 获取打印组件
+      let tdata = {};
+      tdata.table = JSON.parse(JSON.stringify(tableData));
+      tdata.table.forEach(item => {
+        item.qrcode =  '1#'+item.code;
+      })
+
+      console.log(tdata.table)
+      hiprint.init(); // 初始化打印组件
+      var hiprintTemplate = new hiprint.PrintTemplate({ // 创建打印模板
+        template: settings.printTemplate_department // 模板内容
+      });
+      hiprintTemplate.print(tdata, { printer: '', title: '部门' }); // 打印
+    },
 
   },
   watch: {
diff --git a/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue b/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
index 2a0f458..1acb1ed 100644
--- a/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
+++ b/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
@@ -25,7 +25,7 @@
       </div>
       <div class="right">
 
-        <basic-page-list ref="listPage" :desc="desc" @importData="pageImport" @print="pagePrint" :options="pageOptions">
+        <basic-page-list ref="listPage" :desc="desc" @importData="pageImport" @print="pagePrint" @print2="pagePrint2" :options="pageOptions">
           <template v-slot:column2="{ row }">
             <vue-qr class="qr-code" :text="row.qr_code" :size="120" />
           </template>
@@ -54,7 +54,9 @@ export default {
   },
   data() {
     return {
-      pageOptions: {},
+      pageOptions: {
+ 
+      },
 
       modelName: "",
 
@@ -137,6 +139,21 @@ export default {
       });
       hiprintTemplate.print(tdata, { printer: '', title: '工序' }); // 打印
     },
+    pagePrint2({ tableData }) {
+ 
+      let hiprint = this.$hiPrint; // 获取打印组件
+      let tdata =  {}; 
+      tdata.table = JSON.parse(JSON.stringify(tableData)); 
+      tdata.table.forEach(item => { 
+       item.qrcode = '2#' + item.code;
+      }) 
+      console.log(tdata); 
+      hiprint.init(); // 初始化打印组件
+      var hiprintTemplate = new hiprint.PrintTemplate({ // 创建打印模板
+        template: settings.printTemplate_processes // 模板内容
+      });
+      hiprintTemplate.print(tdata, { printer: '', title: '工序' }); // 打印
+    },
     pageImport({ data }) {
       let rows = [];
       data.forEach(item => {
@@ -185,6 +202,7 @@ export default {
         enabledImport: true,
         enabledImportTemplate: true,
         enabledPrint: true,
+        enabledPrint2: true,
         exportColumns: [
           { title: '编码', field: "code" },
           { title: '工序名称', field: "name" },