From 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 11 八月 2025 10:07:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 84 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 29 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 53f6376..7f7be78 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -33,7 +33,10 @@
printLike: null,
printProject:null,
merges:null,
- printFc:null
+ printFc:null,
+ flashback:null,
+ landingSequence:null,
+ compound:null
})
const {currentRoute} = useRouter()
@@ -61,14 +64,21 @@
if (merges == '') {
merges = null
}
+
+//鎸囧畾灞傚悓鏋�
+let compound = props.compound
+if (compound == '') {
+ compound = null
+}
let name=company.companyName
+let sole = company.soleQRCode
let printNumberFc = props.printFc
data.value.printList = JSON.parse(props.printList)
let flowCardCount = ''
onMounted(() => {
if(props.printProject!=null){
- request.post(`/processCard/getSelectPrintProject/${printProject}/${merges}`).then((res) => {
+ request.post(`/processCard/getSelectPrintProject/${printProject}/${merges}/${props.flashback}/${props.landingSequence}`).then((res) => {
if (res.code == 200) {
load(res.data.data)
} else {
@@ -77,7 +87,7 @@
}
})
}else{
- request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}`, data.value).then((res) => {
+ request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}/${props.flashback}/${compound}/${props.landingSequence}`, data.value).then((res) => {
if (res.code == 200) {
load(res.data.data)
} else {
@@ -95,33 +105,45 @@
const handleGetQRCode = async () => {
let technologyNumber=''
for (let i = 0; i < produceList.value.length; i++) {
- if (produceList.value[i].detail[0].qrcode!="" && produceList.value[i].detail[0].qrcode!=null){
- technologyNumber = produceList.value[i].detail[0].qrcode.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃,鍚堝苟鏍囩
- }else {
- technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ if (sole==true){
+ if (produceList.value[i].detail[0].qrcode!="" && produceList.value[i].detail[0].qrcode!=null){
+ technologyNumber = produceList.value[i].detail[0].qrcode.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃,鍚堝苟鏍囩
+ }else {
+ technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ }
}
+ else{
+ technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ }
+
produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
+ if (compound == null ){
+ 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
+ });
+ }
+ else {
+ technologyNumber = compound
+ for (let j = 0; j < technologyNumber.length; j++) {
+ const processId = produceList.value[i].detail[0].process_id;
+ const url = `${processId}/${technologyNumber[j]}`;
+ // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
+ const qrcodeData = await QRCode.toDataURL(url);
+ produceList.value[i].detail[0]["qrcodeList"].push({
+ qrcode: qrcodeData,
+ technologyNumber: technologyNumber[j]
+ });
+ }
+ }
- 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
- });
- // for (let j = 0; j < technologyNumber.length; j++) {
- // const processId = produceList.value[i].detail[0].process_id;
- // const url = `${processId}/${technologyNumber[j]}`;
- // // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
- // const qrcodeData = await QRCode.toDataURL(url);
- // produceList.value[i].detail[0]["qrcodeList"].push({
- // qrcode: qrcodeData,
- // technologyNumber: technologyNumber[j]
- // });
- //
- // }
+
+
}
};
@@ -263,7 +285,10 @@
<div id="bj" v-if="printFc=='true'" style="float: right;font-size: 28px">{{ id + 1 }}</div>
<div id="bj" v-else style="float: right;font-size: 28px"></div>
<div>{{ company.companyName }}</div>
- <div>鐢熶骇娴佺▼鍗�<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span></div>
+ <div>
+ 鐢熶骇娴佺▼鍗�<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span>
+ <span style="font-weight: bold" v-if="props.compound!=null">({{ props.compound }}灞傚悓鏋�)</span>
+ </div>
<div style="font-weight: bolder;display: flex;justify-content:space-between">
<div>
鎵撳嵃浜猴細{{user.user.userName}}
@@ -288,7 +313,8 @@
<td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
<td colspan="2">{{ items.customer_name }}</td>
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
- <td colspan="4" style="min-width: 250px;">{{ 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>
@@ -382,7 +408,7 @@
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
<td colspan="31">
<span style="display: flex;">
- <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
+ <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 250px">
<div class='qrCode' style="width: 80px;height: 80px;">
<img :src=qrCodeItems.qrcode>
</div>
--
Gitblit v1.8.0