From 1d193f2cc23f54634ef8ed73c11436fbe76bb575 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 19 八月 2024 14:13:39 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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 01712d3..b3c0880 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -54,7 +54,7 @@
// }
// });
// data.value.printList = Object.values(uniqueObjects);
-let flowCardCount = data.value.printList.length
+let flowCardCount = null
onMounted(() => {
request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}`, data.value).then((res) => {
if (res.code == 200) {
@@ -136,7 +136,31 @@
}
- //澶勭悊鍚岄厤缃墦鍗�
+ // 浣跨敤涓�涓璞℃潵瀛樺偍鍚堝苟鍚庣殑缁撴灉
+ const mergedData = produceList.value.reduce((acc, item) => {
+ const processId = item.detail[0].process_id;
+
+ // 濡傛灉璇� process_id 灏氭湭鍦� acc 涓紝鍒濆鍖栧叾鏁扮粍
+ if (!acc[processId]) {
+ acc[processId] = {
+ processList: item.processList,
+ detailList: [],
+ detail: item.detail
+ };
+ }
+
+ // 鍚堝苟 detailList
+ acc[processId].detailList = acc[processId].detailList.concat(item.detailList);
+
+ return acc;
+ }, {});
+
+// 灏嗗悎骞跺悗鐨勫璞¤浆鎹㈠洖鏁扮粍
+ produceList.value = Object.values(mergedData);
+
+ flowCardCount=produceList.value.length
+
+
handleSummary()
handleGetQRCode()
} else {
@@ -395,7 +419,7 @@
</tr>
<tr v-for="(itemtextareas,index) in item.detail" :key="index">
<td colspan="29" rowspan="6" style="width: 480px;height: 150px ">
- <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px">{{itemtextareas.processing_note}}</textarea>
+ <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px;text-align: left">{{itemtextareas.processing_note}}</textarea>
</div>
</td>
</tr>
--
Gitblit v1.8.0