From 99d0bb96043ba5d6db66bbfb00f67ca4e09f3ffb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 07 三月 2025 09:08:33 +0800
Subject: [PATCH] 小片尺寸和成品尺寸不相同时，打印显示小片信息

---
 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index f0ab825..15431b4 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -31,7 +31,8 @@
   printList: null,
   printMerge: null,
   printLike: null,
-  printProject:null
+  printProject:null,
+  merges:null
 })
 
 const {currentRoute} = useRouter()
@@ -54,12 +55,17 @@
 if (like == '') {
   like = null
 }
+//鏍囪鍚堝苟鐨勬祦绋嬪崱
+let merges = props.merges
+if (merges == '') {
+  merges = null
+}
 let name=company.companyName
 data.value.printList = JSON.parse(props.printList)
 let flowCardCount = ''
 onMounted(() => {
       if(props.printProject!=null){
-        request.post(`/processCard/getSelectPrintProject/${printProject}`).then((res) => {
+        request.post(`/processCard/getSelectPrintProject/${printProject}/${merges}`).then((res) => {
           if (res.code == 200) {
             load(res.data.data)
           } else {
@@ -68,7 +74,7 @@
           }
         })
       }else{
-        request.post(`/processCard/getSelectPrinting/${merge}/${like}`, data.value).then((res) => {
+        request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}`, data.value).then((res) => {
           if (res.code == 200) {
             load(res.data.data)
           } else {
@@ -265,7 +271,8 @@
               </span>
             </div>
             <div>
-              <span v-if="name!='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
+              <span v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
+              {{itemFlow.rack}}
               娴佺▼鍗″彿锛� {{
                 itemFlow.process_id
               }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�

--
Gitblit v1.8.0