From f73f87119dd1b609c7f94e86659c1a05c6bcfd4f Mon Sep 17 00:00:00 2001
From: lzttt <1803073139@qq.com>
Date: Sat, 12 Oct 2024 12:41:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=EF=BC=88=E5=89=8D=E7=AB=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/repair/tickets/Tickets.js             |  9 ++++++
 .../repair/tickets/Components/TicketTable.vue | 31 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/api/repair/tickets/Tickets.js b/src/api/repair/tickets/Tickets.js
index 4e46991..a663a3d 100644
--- a/src/api/repair/tickets/Tickets.js
+++ b/src/api/repair/tickets/Tickets.js
@@ -46,6 +46,15 @@ export function setTicketsPaid(data){
   })
 }
 
+// 打印导出
+export function setTicketsPrint(data){
+  return request({
+    url: preUrl + "/print",
+    method: 'post',
+    data
+  })
+}
+
 // 新增客户、车辆信息
 export function updateCustomerAndCar(data){
   return request({
diff --git a/src/views/repair/tickets/Components/TicketTable.vue b/src/views/repair/tickets/Components/TicketTable.vue
index a0ae1c3..9c5d499 100644
--- a/src/views/repair/tickets/Components/TicketTable.vue
+++ b/src/views/repair/tickets/Components/TicketTable.vue
@@ -115,6 +115,10 @@
                      @click="handleVoid(scope.row)"
           >作废
           </el-button>
+          <el-button v-if="TicketType !== 'tv'" size="mini" type="text" icon="el-icon-print"
+                     @click="handlePrint(scope.row)"
+          >打印
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -145,7 +149,7 @@
 </template>
 
 <script>
-import {setTicketsVoid, setTicketsPaid} from "@/api/repair/tickets/Tickets";
+import { setTicketsVoid, setTicketsPaid, setTicketsPrint } from '@/api/repair/tickets/Tickets'
 import TicketsShow from "@/views/repair/tickets/Components/TicketsShow.vue";
 
 export default {
@@ -196,6 +200,31 @@ export default {
       } catch {
       }
     },
+
+      async handlePrint(row) {
+      //console.log('Handling print for:', row);
+      this.$confirm('确认打印吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(async () => {
+        const response = await this.$http.post('/repair/tickets/print', row);
+        console.log('Print request data:', row); // 调试输出请求数据
+        // 处理文件下载或预览
+        const fileUrl = response.data.url; // 假设返回文件的下载链接
+        window.open(fileUrl); // 直接打开文件或下载, 可以根据需求调整
+      }).catch(() => {
+      });
+    },
+    async doPrint(data) {
+      try {
+        await setTicketsPrint(data)
+        this.$modal.msgSuccess("导出打印成功")
+        this.$emit("setPrint")
+      } catch {
+      }
+    },
+
     handlePaid(row) {
       this.$prompt('结算备注', '提示', {
         confirmButtonText: '确定',

From 75c1a042e173eb974cbc5963d01a75f0ae4ee4f9 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Sat, 12 Oct 2024 17:43:59 +0800
Subject: [PATCH 2/2] 1

---
 src/api/repair/tickets/Tickets.js             | 10 +++----
 .../repair/tickets/Components/TicketTable.vue | 28 +++++++------------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/api/repair/tickets/Tickets.js b/src/api/repair/tickets/Tickets.js
index a663a3d..433baa5 100644
--- a/src/api/repair/tickets/Tickets.js
+++ b/src/api/repair/tickets/Tickets.js
@@ -46,12 +46,12 @@ export function setTicketsPaid(data){
   })
 }
 
-// 打印导出
-export function setTicketsPrint(data){
+
+export function print(id) {
   return request({
-    url: preUrl + "/print",
-    method: 'post',
-    data
+    url: preUrl + "/print/" + id,
+    method: 'get'
+
   })
 }
 
diff --git a/src/views/repair/tickets/Components/TicketTable.vue b/src/views/repair/tickets/Components/TicketTable.vue
index 9c5d499..1396a1c 100644
--- a/src/views/repair/tickets/Components/TicketTable.vue
+++ b/src/views/repair/tickets/Components/TicketTable.vue
@@ -99,7 +99,7 @@
           <dict-tag :type="DICT_TYPE.REPAIR_TICKETS_STATUS" v-model="scope.row.ticketsStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" fixed="right" align="center" width="180">
+      <el-table-column label="操作" fixed="right" align="center" width="230">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleShow(scope.row)"
           >查看
@@ -115,7 +115,7 @@
                      @click="handleVoid(scope.row)"
           >作废
           </el-button>
-          <el-button v-if="TicketType !== 'tv'" size="mini" type="text" icon="el-icon-print"
+          <el-button size="mini" type="text" icon="el-icon-printer"
                      @click="handlePrint(scope.row)"
           >打印
           </el-button>
@@ -149,7 +149,7 @@
 </template>
 
 <script>
-import { setTicketsVoid, setTicketsPaid, setTicketsPrint } from '@/api/repair/tickets/Tickets'
+import {setTicketsVoid, setTicketsPaid, setTicketsPrint} from '@/api/repair/tickets/Tickets'
 import TicketsShow from "@/views/repair/tickets/Components/TicketsShow.vue";
 
 export default {
@@ -200,22 +200,14 @@ export default {
       } catch {
       }
     },
-
-      async handlePrint(row) {
-      //console.log('Handling print for:', row);
-      this.$confirm('确认打印吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(async () => {
-        const response = await this.$http.post('/repair/tickets/print', row);
-        console.log('Print request data:', row); // 调试输出请求数据
-        // 处理文件下载或预览
-        const fileUrl = response.data.url; // 假设返回文件的下载链接
-        window.open(fileUrl); // 直接打开文件或下载, 可以根据需求调整
-      }).catch(() => {
-      });
+    /**
+     * 打印
+     */
+    async handlePrint(row) {
+      // window.location.href = process.env.VUE_APP_BASE_API + '/admin-api/repair/tickets/print/'+row.id;
+      window.open(process.env.VUE_APP_BASE_API + '/admin-api/repair/tickets/print/'+row.id)
     },
+
     async doPrint(data) {
       try {
         await setTicketsPrint(data)