From 9f604366cb3d9fead4ce98de9893f53b885b9120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Mon, 25 Nov 2024 11:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E8=BD=AC=E5=8D=A1=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/md/workstation/index.vue |  2 +-
 src/views/mes/pro/procard/index.vue    | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/mes/md/workstation/index.vue b/src/views/mes/md/workstation/index.vue
index 3490dda..b04f800 100644
--- a/src/views/mes/md/workstation/index.vue
+++ b/src/views/mes/md/workstation/index.vue
@@ -553,7 +553,7 @@ export default {
       getWorkstation(workstationId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "查看车间信息";
+        this.title = "查看工作站信息";
         this.optType = "view";
         this.getBarcodeUrl();
       });
diff --git a/src/views/mes/pro/procard/index.vue b/src/views/mes/pro/procard/index.vue
index 400b87a..68a470b 100644
--- a/src/views/mes/pro/procard/index.vue
+++ b/src/views/mes/pro/procard/index.vue
@@ -195,6 +195,7 @@
 
 <script>
 import { listProcard, getProcard, delProcard, addProcard, updateProcard } from "@/api/mes/pro/procard";
+import { printBarcodeLabel } from "@/api/print/print";
 import BarcodeImg from "@/components/barcodeImg/index.vue"
 import Procardprocess from "./process.vue"
 import WorkorderSelect from "@/components/workorderSelect/single.vue"
@@ -303,8 +304,17 @@ export default {
     },
     //跳转到报表展示界面
     handlePrint(row){
-      var reportName = "pro_card";
-      window.open(`${this.website.reportUrl}/preview?_u=mysql:`+reportName+`&&cardId=`+row.cardId);
+      //先检查是否有配置默认的打印机
+      const key = 'defaultPrinter';
+      const printer = localStorage.getItem(key);
+      if(value !=null){
+        const param = { bussinessId: this.form.cardId , bussinessCode: this.form.cardCode, printerCode: printer.printerCode };
+        printBarcodeLabel(param);
+      }else{
+        this.$modal.msgError("请在打印管理-打印机配置功能中指定默认打印机！");
+      }
+      //var reportName = "pro_card";
+      //window.open(`${this.website.reportUrl}/preview?_u=mysql:`+reportName+`&&cardId=`+row.cardId);
     },
     /** 提交按钮 */
     submitForm() {