From 4f63402e8eee76d9ed12a5682eed2d4cd6d1945d Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Wed, 28 May 2025 16:35:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E6=8A=A5=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Yangwl <1726150332@qq.com>
---
 package.json                               |  4 +-
 src/views/mes/monthProductionSut/index.vue | 55 ++++++++++++++++------
 src/views/wms/returnorderzs/index.vue      |  7 ++-
 3 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 6036dad..e01e26a 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "echarts": "5.4.0",
     "echarts-gl": "^2.0.9",
     "element-ui": "2.15.12",
-    "file-saver": "2.0.5",
+    "file-saver": "^2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",
@@ -69,7 +69,7 @@
     "vue-seamless-scroll": "^1.1.23",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
-    "xlsx": "^0.17.0"
+    "xlsx": "^0.17.5"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
diff --git a/src/views/mes/monthProductionSut/index.vue b/src/views/mes/monthProductionSut/index.vue
index a50e14e..ac36e05 100644
--- a/src/views/mes/monthProductionSut/index.vue
+++ b/src/views/mes/monthProductionSut/index.vue
@@ -13,22 +13,23 @@
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['mes:scrap:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['mes:scrap:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
     <el-tabs type="border-card" @tab-click="handleTabClick">
       <el-tab-pane label="当月产线产量汇总" >
-        <el-table :data="tableData" border style="width: 100%" :header-cell-style="getHeaderCellStyle" :summary-method="getSummaries" show-summary>
+        <el-button @click="exportExcel1">导出</el-button>
+        <el-table :data="tableData" id="exportTable1" border style="width: 100%" :header-cell-style="getHeaderCellStyle" :summary-method="getSummaries" show-summary>
           <el-table-column prop="equipment_name" label="产线" fixed="left" width="150"></el-table-column>
           <el-table-column prop="category" label="类别" fixed="left" width="150"></el-table-column>
           <el-table-column prop="total_monthly_summary" label="当月汇总" fixed="left" width="150"></el-table-column>
@@ -39,7 +40,8 @@
       </el-tab-pane>
 
       <el-tab-pane label="当月产线品类汇总" >
-        <el-table :data="tableDatas" border style="width: 100%" :header-cell-style="getHeaderCellStyle" :summary-method="getSummaries" show-summary>
+        <el-button @click="exportExcel2">导出</el-button>
+        <el-table :data="tableDatas" id="exportTable2" border style="width: 100%" :header-cell-style="getHeaderCellStyle" :summary-method="getSummaries" show-summary>
           <el-table-column prop="category" label="类别" fixed="left" width="150"></el-table-column>
           <el-table-column prop="total_monthly_summarys" label="当月汇总" fixed="left" width="150"></el-table-column>
           <el-table-column v-for="day in days" :key="day" :prop="day" :label="`${day.replace('day', '')}`" :width="150" align="center" :formatter="formatNullToZero">
@@ -54,6 +56,8 @@
 <script>
 import { getmonthProductionSut } from "@/api/mes/reportWork";
 import * as echarts from 'echarts';
+import FileSaver from 'file-saver'
+import * as XLSX from 'xlsx'
 
 export default {
   name: "Index",
@@ -92,7 +96,28 @@ export default {
     pad(number) {
       return number.toString().padStart(2, '0');
     },
+    async exportExcel1() {
+      const table = document.querySelector('#exportTable1').cloneNode(true)
+      // 删除fixed区域避免重复内容
+      if (table.querySelector('.el-table__fixed')) {
+        table.removeChild(table.querySelector('.el-table__fixed'))  // :ml-citation{ref="3,8" data="citationList"}
+      }
 
+      const wb = XLSX.utils.table_to_book(table, { raw: true })
+      const wbout = XLSX.write(wb, { bookType: 'xlsx', type: 'array' })
+      FileSaver.saveAs(new Blob([wbout]), '当月产线产量汇总.xlsx')  // :ml-citation{ref="4,7" data="citationList"}
+    },
+    exportExcel2() {
+      const table = document.querySelector('#exportTable2').cloneNode(true)
+      // 删除fixed区域避免重复内容
+      if (table.querySelector('.el-table__fixed')) {
+        table.removeChild(table.querySelector('.el-table__fixed'))  // :ml-citation{ref="3,8" data="citationList"}
+      }
+
+      const wb = XLSX.utils.table_to_book(table, { raw: true })
+      const wbout = XLSX.write(wb, { bookType: 'xlsx', type: 'array' })
+      FileSaver.saveAs(new Blob([wbout]), '当月产线品类汇总.xlsx')  // :ml-citation{ref="4,7" data="citationList"}
+    },
     getHeaderCellStyle({rowIndex, columnIndex}) {
       if (rowIndex === 0 && columnIndex === 0) {
         return 'background-color: #afccfd; color: #000000;'; // 蓝色
diff --git a/src/views/wms/returnorderzs/index.vue b/src/views/wms/returnorderzs/index.vue
index 0ac9629..91afcfe 100644
--- a/src/views/wms/returnorderzs/index.vue
+++ b/src/views/wms/returnorderzs/index.vue
@@ -723,11 +723,14 @@ export default {
       printJS({
         printable: params.printable, // 'printFrom', // 标签元素id
         type: params.type || 'html',
-        dpi: 360, // 清晰度
+        // dpi: 360, // 清晰度
+        dpi: 600,
         //font_size: "",// 设置字体大小
         header: params.header, // '表单',
         targetStyles: ['*'],
-
+        style: `
+            body { font-family: "黑体"; font-weight: bold; }
+            table { border-collapse: separate; border-width: 1.5pt; }`,  // 加粗字体和边框线:ml-citation{ref="9" data="citationList"}
         //没用//style:'body {margin: 2mm;padding: 0;}.fy{page-break-after: always;} table { width:100%;height:800px;border-collapse: collapse;} table, th, td { border: 2px solid black; white-space: pre-wrap; word-break: break-all;} .el-table .cell{padding-left:1px;padding-right:1px;border: 2px solid black;}',
         ignoreElements: params.ignore || [], // ['no-print']
         properties: params.properties || null