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/PrintProcessReplenish.vue | 104 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 72 insertions(+), 32 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 67c6553..06223e8 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -21,7 +21,8 @@
const data = ref({
- printList: []
+ printList: [],
+ processName:[]
})
let props = defineProps({
@@ -53,6 +54,7 @@
data.value.printList = JSON.parse(props.printList)
let name=company.companyName
+let replenishQRCode=company.replenishQRCode
//鍘婚櫎閲嶅瀵硅薄
// let uniqueObjects = {};
// // 閬嶅巻鍘熷鏁版嵁鏁扮粍
@@ -71,6 +73,7 @@
request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}/${mergeTechnologyNumber}`, data.value).then((res) => {
if (res.code == 200) {
produceList.value = deepClone(res.data.data)
+ data.processName = res.data.data[0].processNameList
//澶勭悊鍗曠墖鍘氬害
for (let j = 0; j < produceList.value.length; j++) {
@@ -93,33 +96,34 @@
produceList.value[j].detail[0].weight = sumWeight
}
//澶勭悊鍚堝苟鎵撳嵃
- if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
-
- produceList.value.forEach(item => {
- item.detail[0].technologyNumber = printMerge;
- });
-
- //鍚堝苟鎵撳嵃宸ヨ壓娴佺▼澶勭悊
- if (like == null) {
- let process = produceList.value[0].detail[0].process
- let indexOfJiaJiao = process.indexOf('澶硅兌');
- if (indexOfJiaJiao !== -1) {
- // 浣跨敤 substring 鎴彇 "澶硅兌" 鍚庨潰鐨勯儴鍒嗭紝鍖呮嫭 "澶硅兌" 鏈韩
- let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
- produceList.value.forEach(item => {
- item.detail[0].process = afterJiaJiao
- })
- }
-
- let indexOfProceList = produceList.value[0].processList
- let getProceList = indexOfProceList.findIndex(item => item.process === '澶硅兌');
-
- if (getProceList !== -1) {
- // 浣跨敤 filter 鏂规硶杩囨护鍑� "澶硅兌" 鍙婂叾涔嬪悗鐨勫璞�
- produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
- }
- }
- }
+ // if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
+ //
+ // produceList.value.forEach(item => {
+ // item.detail[0].technologyNumber = printMerge;
+ // });
+ //
+ // //鍚堝苟鎵撳嵃宸ヨ壓娴佺▼澶勭悊
+ // if (like == null) {
+ // let process = produceList.value[0].detail[0].process
+ // console.log(process)
+ // let indexOfJiaJiao = process.indexOf('澶硅兌');
+ // if (indexOfJiaJiao !== -1) {
+ // // 浣跨敤 substring 鎴彇 "澶硅兌" 鍚庨潰鐨勯儴鍒嗭紝鍖呮嫭 "澶硅兌" 鏈韩
+ // let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
+ // produceList.value.forEach(item => {
+ // item.detail[0].process = afterJiaJiao
+ // })
+ // }
+ //
+ // let indexOfProceList = produceList.value[0].processList
+ // let getProceList = indexOfProceList.findIndex(item => item.process === '澶硅兌');
+ //
+ // if (getProceList !== -1) {
+ // // 浣跨敤 filter 鏂规硶杩囨护鍑� "澶硅兌" 鍙婂叾涔嬪悗鐨勫璞�
+ // produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
+ // }
+ // }
+ // }
produceList.value.forEach(item => {
@@ -172,9 +176,12 @@
flowCardCount=produceList.value.length
-
handleSummary()
- handleGetQRCode()
+ if (replenishQRCode == 2){
+ handleGetQRCodeTj()//澶╂触鎵爜鏋姤宸ラ渶瑕佸悎骞跺眰鍙蜂簩缁寸爜
+ }else{
+ handleGetQRCode()//鎷嗗垎灞傚彿浜岀淮鐮�
+ }
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -184,8 +191,40 @@
}
)
-
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].mergeTechnologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
@@ -262,7 +301,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