From eef4b7ca66cc2fb34d2d2cb0a4a8643f2bb0f838 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 18 十月 2024 13:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue b/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue
index e2de328..b31a144 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue
@@ -46,9 +46,9 @@
columns:[
{title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
{type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left",},
- {field:'operateTypeName',title: t('mainBasicData.operateTypeName')},
- {field:'operateType',title: t('mainBasicData.operateType')},
- {field:'type',title: t('mainBasicData.type')},
+ {field:'operateTypeName',title: t('warehouseBasicData.operateTypeName')},
+ {field:'operateType',title: t('warehouseBasicData.operateType')},
+ {field:'type',title: t('warehouseBasicData.type')},
{field:'createTime',title: t('basicData.creationTime')},
--
Gitblit v1.8.0