From e9f8d23f55f64903d834308f9f167aaf3195c20d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 30 七月 2025 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
index 6a34a28..fc8c7e7 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -175,7 +175,6 @@
flowCardCount=produceList.value.length
-
handleSummary()
handleGetQRCode()
} else {
@@ -186,24 +185,44 @@
}
)
-
-
const handleGetQRCode = async () => {
- let technologyNumber=''
for (let i = 0; i < produceList.value.length; i++) {
- const technologyNumber = produceList.value[i].detail[0].mergeTechnologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
- produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
+ const detail = produceList.value[i].detail[0];
+ const processId = detail.process_id;
+ const mergeStr = detail.mergeTechnologyNumber?.toString() || '';
- const processId = produceList.value[i].detail[0].process_id;
- const url = `${processId}/${technologyNumber}`;
- // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
- const qrcodeData = await QRCode.toDataURL(url);
- produceList.value[i].detail[0]["qrcodeList"].push({
- qrcode: qrcodeData,
- technologyNumber: technologyNumber
- });
+ detail.qrcodeList = []; // 鍒濆鍖�
+
+ for (let j = 0; j < mergeStr.length; j++) {
+ const singleTech = mergeStr[j]; // 鍙栧嚭姣忎竴浣嶅瓧绗�
+ const url = `${processId}/${singleTech}`;
+ const qrcodeData = await QRCode.toDataURL(url);
+ detail.qrcodeList.push({
+ qrcode: qrcodeData,
+ technologyNumber: singleTech
+ });
+ }
}
};
+
+
+// const handleGetQRCode = async () => {
+// let technologyNumber=''
+// for (let i = 0; i < produceList.value.length; i++) {
+//
+// const technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+// produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
+// const merge = produceList.value[i].detail[0].mergeTechnologyNumber.toString();
+// const processId = produceList.value[i].detail[0].process_id;
+// const url = `${processId}/${technologyNumber}`;
+// // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
+// const qrcodeData = await QRCode.toDataURL(url);
+// produceList.value[i].detail[0]["qrcodeList"].push({
+// qrcode: qrcodeData,
+// technologyNumber: technologyNumber
+// });
+// }
+// };
//鏍规嵁杈撳叆鐨勬暟閲忛噸鏂版眹鎬�
@@ -265,7 +284,8 @@
<td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
<td colspan="2">{{ items.customer_name }}</td>
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
- <td colspan="8" style="min-width: 300px;">{{ items.project }}</td>
+ <td v-if="name=='娲涢槼鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�'" colspan="4" style="min-width: 250px;">{{ items.projectBatch }}</td>
+ <td v-else colspan="4" style="min-width: 250px;">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
<td :colspan="2+item.processList.length*2" style="width: 500px">{{ items.process }}</td>
</tr>
--
Gitblit v1.8.0