From c46cb6a71c35f38c7f23a2d01ad686f46a3d0e0b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 六月 2024 15:14:44 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
index edd95e8..d8a37ef 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
@@ -214,12 +214,12 @@
filterMethod: filterChanged
},
{
- field: 'material_name', width: 120, title: t('mainIngredient.materialName'), filters: [{data: ''}],
+ field: 'material_name', width: 120, title: t('mainIngredientStock.materialName'), filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
- field: 'producer',title: t('mainIngredient.producer'), filters: [{data: ''}],
+ field: 'producer',title: t('mainIngredientStock.producer'), filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
@@ -232,7 +232,7 @@
{field: 'height', title: t('order.height'), showOverflow: "ellipsis"},
{field: 'quantity', title: t('report.quantityClaimed')},
{field: 'area', title: t('report.areaClaimed')},
- {field: 'date_of_manufacture', title: t('mainIngredient.dateOfManufacture')},
+ {field: 'date_of_manufacture', title: t('mainIngredientStock.dateOfManufacture')},
{field: 'date', title: t('report.dateClaimed')},
],//琛ㄥご鎸夐挳
--
Gitblit v1.8.0