From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..0cc060a 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},
@@ -38,9 +41,9 @@
],//琛ㄦ牸琛ㄥご瀛楁
data:[],//琛ㄦ牸鏁版嵁
- url :'/Delivery/getSelectDeliveryDetailProductReport',
- exportUrl :'/Delivery/exportDeliveryDetailProductReport',
- exportName:t('delivery.shipmentProductClassificationReport'),
+ url :'/delivery/getSelectDeliveryDetailProductReport',
+ exportUrl :'/delivery/exportDeliveryDetailProductReport',
+ exportName:t('delivery.page.shipmentProductClassificationReport'),
footList:['quantity','area','money']
})
--
Gitblit v1.8.0