ERP_override.git

			@@ -110,30 +110,41 @@

			}

			// 使用一个对象来存储合并后的结果
			const mergedData = produceList.value.reduce((acc, item) => {
			const processId = item.detail[0].process_id;
			// detail 为空直接跳过
			const firstDetail = item?.detail?.[0]
			if (!firstDetail) return acc

			// 如果该 process_id 尚未在 acc 中，初始化其数组
			if (!acc[processId]) {
			acc[processId] = {
			const processId = firstDetail.process_id
			const technologyNumber = firstDetail.technologyNumber

			const key = company.printReplenishMerge
			? processId
			: `${processId}_${technologyNumber}`

			// 初始化分组
			if (!acc[key]) {
			acc[key] = {
			processId,
			technologyNumber,
			processList: item.processList,
			detailList: [],
			detail: item.detail
			};
			}
			}

			// 合并 detailList
			acc[processId].detailList = acc[processId].detailList.concat(item.detailList);
			// 合并 detailList
			if (Array.isArray(item.detailList) && item.detailList.length) {
			acc[key].detailList.push(...item.detailList)
			}

			return acc;
			}, {});
			return acc
			}, {})

			// 将合并后的对象转换回数组

			if (company.printReplenishMerge){
			//if (company.printReplenishMerge){
			produceList.value = Object.values(mergedData);
			}
			//}
			flowCardCount=produceList.value.length

			handleSummary()

			@@ -28,7 +28,7 @@
			<el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/processCard/productionScheduling' }">{{$t('processCard.scheduling')}}
			</el-breadcrumb-item>
			<el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/processCard/selectPrintFlowCard' }" >{{ $t('basicData.print') }}</el-breadcrumb-item>
			<!-- <el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/processCard/printProgressProcessCard' }" >{{ $t('processCard.printProgressProcessCard') }}</el-breadcrumb-item>-->
			<el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/processCard/printProgressProcessCard' }" >{{ $t('processCard.printProgressProcessCard') }}</el-breadcrumb-item>
			<el-breadcrumb-item @click="changeRouter(6)" :class="indexFlag===6?'indexTag':''" :to="{ path: '/main/processCard/selectPrintProject' }" >{{$t('processCard.engineeringPrinting')}}</el-breadcrumb-item>
			<el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/processCard/selectPrintFlowCard' }" style="display: none">{{ $t('basicData.print') }}</el-breadcrumb-item>
			</el-breadcrumb>

	north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue	37 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史