From bfb2de990eb9cdb3f1bf8dfbdab5135f78b7dc6f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 23 十二月 2025 11:09:23 +0800
Subject: [PATCH] 提交 图片上传添加尺寸
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue | 61 ++++++------------------------
1 files changed, 13 insertions(+), 48 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 0467bcf..c8474ee 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -55,19 +55,7 @@
let name=company.companyName
let replenishQRCode=company.replenishQRCode
-//鍘婚櫎閲嶅瀵硅薄
-// let uniqueObjects = {};
-// // 閬嶅巻鍘熷鏁版嵁鏁扮粍
-// data.value.printList.forEach(obj => {
-// // 鏋勫缓涓�涓敮涓�閿紝渚嬪 'NG24071502A001_1'
-// let key = `${obj.process_id}_${obj.technology_number}_${obj.order_number}`;
-//
-// // 濡傛灉璇ラ敭涓嶅瓨鍦ㄤ簬 uniqueObjects 涓紝鍒欏皢璇ュ璞℃坊鍔犲埌 uniqueObjects 涓�
-// if (!uniqueObjects[key]) {
-// uniqueObjects[key] = obj;
-// }
-// });
-// data.value.printList = Object.values(uniqueObjects);
+
let flowCardCount = null
onMounted(() => {
request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}/${mergeTechnologyNumber}`, data.value).then((res) => {
@@ -95,43 +83,13 @@
});
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
- // 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 => {
let technologyNumberMerge = printMerge.split('').join(',');
item.detail[0].technologyNumberMerge = technologyNumberMerge
})
//澶勭悊缂栧彿鍒�
- //瀹氫箟瀛樻斁缂栧彿鏁扮粍
+ //瀹氫箟瀛樻斁缂栧彿鏁扮粍 澶╂触
const s01Values = [];
for (let i = 0; i < produceList.value.length; i++) {
const s01Values = [];
@@ -172,8 +130,10 @@
}, {});
// 灏嗗悎骞跺悗鐨勫璞¤浆鎹㈠洖鏁扮粍
- produceList.value = Object.values(mergedData);
+ if (company.printReplenishMerge){
+ produceList.value = Object.values(mergedData);
+ }
flowCardCount=produceList.value.length
handleSummary()
@@ -191,12 +151,15 @@
}
)
+const techNumberLength = ref()
+const qrcodeLength =ref()
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 = [];
@@ -292,7 +255,7 @@
<span v-if="name=='澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
娴佺▼鍗″彿锛� {{
itemFlow.process_id
- }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
+ }}/{{ itemFlow.technologyNumber }}
</div>
</div>
</td>
@@ -310,9 +273,11 @@
<td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
<td colspan="3">{{ itemTr.edging_type }}</td>
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
- <td colspan="8">{{ itemTr.glass_child }}</td>
+ <td v-if="itemTr.qrcodeList.length*1>1" colspan="8">澶氬眰鍚堝苟锛岃鎯呰浜у搧鍚嶇О</td>
+ <td v-else colspan="8">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
+ <td v-if="!company.processFontSize" :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
+ <td v-else :colspan="2+item.processList.length*2" style="font-size: 18px;">{{ itemTr.product_name }}</td>
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
--
Gitblit v1.8.0