From 0a567fd9c3baeb8022c77fa1a6a96d4c60cfa11c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 23 五月 2024 08:18:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue b/north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue
index a7ed662..45dc608 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue
@@ -24,6 +24,8 @@
{field: 'endOperationOrderNumber', width: '100',title: '璋冩嫧搴忓彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'operator', width: '100',title: t('productStock.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'operateTime', width:'140', title: t('productStock.productionDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'processId', width:'140', title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'type', width:'140', title: '棰嗗嚭绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'reviewed', width: '100',title: t('productStock.reviewed'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'reviewedTime', width: '140',title: t('productStock.approvedDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'remarks', width: '140',title: t('productStock.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -31,6 +33,8 @@
],//琛ㄦ牸琛ㄥご瀛楁
data:[],//琛ㄦ牸鏁版嵁
url :'/FinishedGoodsInventory/getSelectFinishedOperateLogReport',
+ exportUrl :'/FinishedGoodsInventory/exportFinishedOperateLogReport',
+ exportName:'鎴愬搧鎶ヨ〃',
footList:['quantity']
})
--
Gitblit v1.8.0