From 7a0527e207c59cdcce0b1f7a41bd7457a236ab23 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 三月 2025 10:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 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 661bbb9..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,15 +55,18 @@
 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(() => {
-  console.log(printProject)
       if(props.printProject!=null){
-        request.post(`/processCard/getSelectPrintProject/${printProject}`).then((res) => {
+        request.post(`/processCard/getSelectPrintProject/${printProject}/${merges}`).then((res) => {
           if (res.code == 200) {
-            console.log(res.data.data)
             load(res.data.data)
           } else {
             ElMessage.warning(res.msg)
@@ -70,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 {
@@ -96,7 +100,7 @@
     produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
 
     const processId = produceList.value[i].detail[0].process_id;
-    const url = `${processId}/${technologyNumber}`;
+    const url = `${processId}/${technologyNumber}`
     // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
     const qrcodeData = await QRCode.toDataURL(url);
     produceList.value[i].detail[0]["qrcodeList"].push({
@@ -199,10 +203,10 @@
   }
 
 
-  produceList.value.forEach(item => {
-    let technologyNumberMerge = printMerge.split('').join(',');
-    item.detail[0].technologyNumberMerge = technologyNumberMerge
-  })
+  // produceList.value.forEach(item => {
+  //   let technologyNumberMerge = printMerge.split('').join(',');
+  //   item.detail[0].technologyNumberMerge = technologyNumberMerge
+  // })
   //澶勭悊缂栧彿鍒�
   //瀹氫箟瀛樻斁缂栧彿鏁扮粍
   const s01Values = [];
@@ -255,7 +259,7 @@
           <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px  "/></div>
           <div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
           <div>{{ company.companyName }}</div>
-          <div>鐢熶骇娴佺▼鍗�<span v-if="printProject!=null">({{ printProject }})</span></div>
+          <div>鐢熶骇娴佺▼鍗�<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span></div>
           <div  style="font-weight: bolder;display: flex;justify-content:space-between">
             <div>
               鎵撳嵃浜猴細{{user.user.userName}} &nbsp;&nbsp;
@@ -267,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