From d20289401001352bb20ca0bd614f4ef3e2c749d0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 06 八月 2024 17:43:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue
index 0f4d372..7b1ee18 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue
@@ -16,11 +16,14 @@
{field: 'orderDetail.productName',width:120, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'delivery.paymentTerms',width:120, title: t('delivery.paymentTerms'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'delivery.project',width:140, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'quantity',width:120, title: t('order.quantity'), sortable: true},
+ {field: 'quantity',width:120, title: t('order.quantity'),sortable: true},
{field: 'price',width:120, title: t('order.price'), sortable: true},
{field: 'area',width:120, title: t('productStock.totalArea'), sortable: true},
{field: 'order.otherMoney',width:120, title: t('basicData.otherAmounts'), sortable: true},
{field: 'money',width:120, title: t('delivery.money'), sortable: true},
+ {field: 'delivery.freight',width:120, title: t('delivery.freight'), sortable: true},
+ {field: 'delivery.freightPrice',width:120, title: t('delivery.freightPrice'), sortable: true},
+ {field: 'delivery.freightQuantity',width:120, title: t('delivery.freightQuantity'), sortable: true},
{field: 'delivery.customerId',width:120, title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'delivery.customerName',width:120, title: t('customer.customerName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'delivery.deliveryDate',width:120, title: t('delivery.deliveryDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
--
Gitblit v1.8.0