From 41bed51ce75e182c751d73b11a8a69b3f9a98524 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 十一月 2024 10:52:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/en.js | 4 ++--
north-glass-erp/northglass-erp/src/layout/MainErpView.vue | 35 ++++++++++++++++++++++++++---------
2 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index dc71d0d..20b68c8 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -722,7 +722,7 @@
produce:'Produce',
traveler:'Traveler',
warehousing:'Warehousing',
- unpaidQuantity:"Unpaid Quantity ",
+ unpaidQuantity:"Quantity not shipped",
availableStock:'Available Stock',
deliveryQuantity:'Delivery Quantity',
pleaseEnterTheAmountOfFunds:'Please enter the project name',
@@ -950,7 +950,7 @@
productionScheduling:'Production scheduling report',
yieldReport:'Yield report',
workingProcedure:'Process',
- inventoryArea:'Stock area',
+ inventoryArea:'Stock area锛坢虏锛�',
pleaseSelectADateFirst:'Please select the date first',
pleaseSelectAProcessFirst:'Please select the process first',
theFilteringTimeForExportCannotExceed180Days:'The export filtering period cannot exceed 180 days',
diff --git a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
index c4d165c..412d37e 100644
--- a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
+++ b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
@@ -170,19 +170,36 @@
</el-menu>-->
<div class="menu" >
<div v-for="items in menuList">
+ <el-tooltip
+ class="box-item"
+ effect="dark"
+ :content="$t('menu.'+items.id)"
+ placement="right"
+ show-after="500"
+ >
<div class='menu_title' @click="openMenu(items.id)" >{{$t('menu.'+items.id)}}<span class='indicator' >鈻�</span></div>
+ </el-tooltip>
<ul class='enter-x-left' v-show="openFlag==items.id">
-
- <li v-for="menuItem in menuItemList"
- v-show="items.id==menuItem.menuID"
- style="margin-bottom: 2px"
+ <el-tooltip
+ v-for="menuItem in menuItemList"
+ class="box-item"
+ effect="dark"
+ :content="$t('menu.'+menuItem.menu)"
+ placement="right"
+ show-after="500"
>
- <router-link
- :to="{path:menuItem.url}">
- {{ $t('menu.'+menuItem.menu)}}
- </router-link>
+ <li
+ v-show="items.id==menuItem.menuID"
+ style="margin-bottom: 2px"
+ >
- </li>
+ <router-link
+ :to="{path:menuItem.url}">
+ {{ $t('menu.'+menuItem.menu)}}
+ </router-link>
+
+ </li>
+ </el-tooltip>
</ul>
</div>
</div>
--
Gitblit v1.8.0