From 33c054fb8479c7439c9031aeb84a895718e6465e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 25 十二月 2025 15:25:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue
index 348276f..c726441 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue
@@ -34,10 +34,7 @@
})
onMounted(()=>{
getTags()
- filterData.value = orderInfo.selectProcessCardFilter.data
- orderInfo.selectProcessCardFilter.list.forEach(item =>{
- xGrid.value.getColumnByField(item.field).filters = item.column.filters
- })
+
//鍚敤琛ㄦ牸鎷栧姩閫変腑
addListener(xGrid.value, gridOptions)
if(props.orderId===null || props.orderId===undefined || props.orderId===''){
@@ -397,16 +394,16 @@
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
return
}
-
- let id = ""
- for (let i = 0; i < selectRecords.length; i++) {
- if (i + 1 === selectRecords.length) {
- id += selectRecords[i].id
- } else {
- id += selectRecords[i].id + "|"
- }
- }
- printRow.value.list = JSON.stringify(selectRecords)
+ //鍘婚櫎閲嶅鐨勫嬀閫夊唴瀹�
+ const uniqueRecords = Array.from(
+ new Map(
+ selectRecords.map(item => [
+ `${item.process_id}_${item.technology_number}`,
+ item
+ ])
+ ).values()
+ )
+ printRow.value.list = JSON.stringify(uniqueRecords)
printRow.value.printMergeVal = printMerge.value
printRow.value.like = null
printRow.value.merge = company.flowCardMerge
@@ -429,14 +426,6 @@
return
}
- let id = ""
- for (let i = 0; i < selectRecords.length; i++) {
- if (i + 1 === selectRecords.length) {
- id += selectRecords[i].id
- } else {
- id += selectRecords[i].id + "|"
- }
- }
lastList.value = []
labelRow.value.list = JSON.stringify(selectRecords)
labelRow.value.faceOrientation = faceOrientation
@@ -543,6 +532,7 @@
:merge-cells="mergeCells"
@cell-dblclick="handleCellDblClick"
v-on="gridEvents"
+ :checkbox-config="{labelField: 'name', highlight: true, range: true}"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
--
Gitblit v1.8.0