From b3be0c127eaa43f4a1342909fa7111889fca02cc Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 26 八月 2025 08:15:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue | 5 ++++-
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue
index 93b9ca0..53c26ea 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue
@@ -44,6 +44,8 @@
{field: 'width',width:120, title: t('order.width') ,editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'height',width:140, title: t('order.height'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'quantity',width:140, title: t('order.quantity'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'deliveryNum',width:140, title: t('delivery.deliveryQuantity'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'deliveryArea',width:140, title: t('report.shippedArea'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'processingNote',width:200, title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'price',width:140, title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'area',width:150, title: t('order.trueArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
@@ -72,7 +74,7 @@
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity",'grossArea','area','computeGrossArea','computeArea','perimeter']
+ const List = ["quantity",'grossArea','area','computeGrossArea','computeArea','perimeter','deliveryNum','deliveryArea']
if (List.includes(column.field)) {
return footSum(data, column.field)
}
@@ -115,6 +117,7 @@
const getDetail = async ()=> {
await request.post(`/order/getOrderDetailById/${props.orderId}`).then(res=>{
res.data.forEach(item => {
+ item.deliveryArea = item.deliveryNum *item.computeArea
item.otherColumns = JSON.parse(item.otherColumns)
})
xGrid.value.reloadData(res.data)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index 13383ee..0c55c15 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -98,8 +98,8 @@
{field: 'quantity',slots: { default: 'show'}, width: 90,title: t('order.quantity')},
{field: 'glassQuantity', width: 90,title: t('order.glassQuantity')},
{field: 'grossArea',slots: { default: 'show'}, width: 90,title: t('order.area')},
- {field: 'shippedQuantity',slots: { default: 'show'},width: 120, title: t('delivery.deliveryQuantity')},
- {field: 'shippedArea',slots: { default: 'show'},width: 120, title: t('report.shippedArea')},
+ {field: 'shippedQuantity',slots: { default: 'show'},width: 120, title: t('delivery.deliveryQuantity'),visible:false},
+ {field: 'shippedArea',slots: { default: 'show'},width: 120, title: t('report.shippedArea'),visible:false},
{field: 'Storage',slots: { default: 'show'},width: 120, title: t('report.inventoryNum')},
// {field: 'inventoryArea',slots: { default: 'show'},width: 120, title: t('report.inventoryArea')},
{field: 'StorageArea',slots: { default: 'show'},width: 120, title: t('report.StorageArea')},
--
Gitblit v1.8.0