From c069f2cce3c10a773e8c474c0031e316ffd8ad9e Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 十一月 2025 10:57:02 +0800
Subject: [PATCH] 打印流程卡新增北玻logo
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 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 19b675a..b234f5b 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -54,6 +54,7 @@
data.value.printList = JSON.parse(props.printList)
let name=company.companyName
+let replenishQRCode=company.replenishQRCode
//鍘婚櫎閲嶅瀵硅薄
// let uniqueObjects = {};
// // 閬嶅巻鍘熷鏁版嵁鏁扮粍
@@ -69,7 +70,6 @@
// data.value.printList = Object.values(uniqueObjects);
let flowCardCount = null
onMounted(() => {
- console.log(mergeTechnologyNumber)
request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}/${mergeTechnologyNumber}`, data.value).then((res) => {
if (res.code == 200) {
produceList.value = deepClone(res.data.data)
@@ -176,9 +176,12 @@
flowCardCount=produceList.value.length
-
handleSummary()
- handleGetQRCode()
+ if (replenishQRCode == 2){
+ handleGetQRCodeTj()//澶╂触鎵爜鏋姤宸ラ渶瑕佸悎骞跺眰鍙蜂簩缁寸爜
+ }else{
+ handleGetQRCode()//鎷嗗垎灞傚彿浜岀淮鐮�
+ }
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -188,11 +191,43 @@
}
)
-
const handleGetQRCode = async () => {
+ for (let i = 0; i < produceList.value.length; i++) {
+ const detailItem = produceList.value[i].detail[0];
+ const detailList = produceList.value[i].detailList;
+
+ const mergeTechNumber = detailItem.mergeTechnologyNumber.toString();
+ const processId = detailItem.process_id;
+
+ detailItem.qrcodeList = [];
+
+ //鍌ㄥ瓨灞傚彿
+ const seenTechNumbers = new Set();
+
+ for (let j = 0; j < detailList.length; j++) {
+ const techNum = detailList[j].technology_number;
+
+ //鏈夊垯璺宠繃
+ if (seenTechNumbers.has(techNum)) continue;
+ const url = `${processId}/${techNum}`;
+
+ const qrcodeData = await QRCode.toDataURL(url);
+ detailItem.qrcodeList.push({
+ qrcode: qrcodeData,
+ technologyNumber: techNum
+ });
+
+ seenTechNumbers.add(techNum);
+ }
+ }
+};
+
+
+
+const handleGetQRCodeTj = async () => {
let technologyNumber=''
for (let i = 0; i < produceList.value.length; i++) {
- const technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ const technologyNumber = produceList.value[i].detail[0].mergeTechnologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
const processId = produceList.value[i].detail[0].process_id;
@@ -243,7 +278,7 @@
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="34">
-
+ <div style="float: left;"><img id="img-pic" style="width: 42px;height: 32px" src="@/assets/northGlass.ico" alt=""></div>
<div id="bj" style="float: right;font-size: 28px">琛� {{ id + 1 }}</div>
<div style="left: 150px">{{ company.companyName }}</div>
<div>鐢熶骇娴佺▼鍗�</div>
@@ -340,18 +375,14 @@
</td>
</tr>
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
- <td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
- <div>
-
- </div>
- </td>
-
<td>瀹屽伐绛惧悕</td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="1"></td>
<template v-for=" n in item.processList.length">
<td colspan="2"></td>
</template>
@@ -363,6 +394,8 @@
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="1"></td>
<template v-for=" n in item.processList.length">
<td colspan="2"></td>
</template>
@@ -370,10 +403,12 @@
<tr>
<td>璐ㄦ绛惧悕</td>
<td colspan="2"></td>
- <td colspan="2">鐢熶骇绛惧悕</td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="1"></td>
<template v-for=" n in item.processList.length">
<td colspan="2"></td>
</template>
@@ -398,7 +433,9 @@
</tr>
<tr v-for="(itemtextareas,index) in item.detail" :key="index">
<td colspan="34" rowspan="6" style="width: 99%;height: 150px ">
- <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px;text-align: left">{{itemtextareas.processing_note}}</textarea>
+ <div v-if="name=='娴欐睙宸ㄦ槦鍢夋嘲鏂版潗鏂欐湁闄愬叕鍙�'" style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 16px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
+ </div>
+ <div v-else style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 14px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
</div>
</td>
</tr>
--
Gitblit v1.8.0