From 7104751e2f26872d4891d01d42ee88cf19715d01 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 七月 2025 17:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue b/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
index 4fd17fe..f2aad7d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
@@ -96,6 +96,7 @@
})
}
+const orderOtherMoney = ref(null)
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
let inputVal = form.orderId
@@ -108,6 +109,21 @@
// total.dataTotal = res.data.total.total*1
// total.pageTotal= res.data.total.pageTotal
// pageTotal.value = res.data.total
+ orderOtherMoney.value = res.data.orderOtherMoney
+ orderOtherMoney.value.forEach(item => {
+ let column = {
+ field: `${item.column}`,
+ width: 100,
+ title: item.alias,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ sortable: true
+ }
+
+ gridOptions.columns.push(column)
+
+ })
produceList = deepClone(res.data.data)
xGrid.value.reloadData(produceList)
} else {
@@ -189,7 +205,7 @@
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
- field: 'processId', width: 120, title: t('processCard.processId'), filters: [{data: ''}],
+ field: 'processId', width: 135, title: t('processCard.processId'), filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
@@ -217,8 +233,12 @@
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
- {field: 'childWidth', width: 120, title: t('order.width')},
- {field: 'childHeight', width: 120, title: t('order.height')},
+ {field: 'childWidth', width: 120, title: t('order.width'), filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'childHeight', width: 120, title: t('order.height'), filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
{field: 'quantity', width: 120, title: t('order.quantity')},
{field: 'area', width: 100, title: t('order.area')},
--
Gitblit v1.8.0