From 896424535eedd5da407d2e1d58bda8e1ea588145 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 26 九月 2024 12:35:05 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/en.js | 43 ++++++++++----
north-glass-erp/northglass-erp/src/views/sd/customer/Customer.vue | 4
north-glass-erp/northglass-erp/src/views/sd/order/Order.vue | 10 +-
north-glass-erp/northglass-erp/src/lang/ru.js | 31 +++++++--
north-glass-erp/northglass-erp/src/views/sd/delivery/Delivery.vue | 8 +-
north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue | 5 +
north-glass-erp/northglass-erp/src/lang/zh.js | 45 ++++++++++----
north-glass-erp/northglass-erp/src/views/sd/product/Product.vue | 4
north-glass-erp/northglass-erp/src/views/sd/basicData/BasicData.vue | 4
9 files changed, 104 insertions(+), 50 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 5ddeb30..1460f89 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -95,8 +95,10 @@
}
},
product:{
- ProductHomePage:'Product home page',
- create:'Creat',
+ page:{
+ selectProduct:'Product home page',
+ createProduct:'Creat',
+ },
coloredGlaze:'Coloured glaze',
frostedSand:'Frosted glass',
coating:'Coating film',
@@ -163,8 +165,14 @@
}
},
order:{
- orderHomePage:'Order Home Page',
- orderReport:'Order Detail Report',
+ page:{
+ selectOrder:'Order Home Page',
+ createOrder:'Create',
+ orderReport:'Order Detail Report',
+ orderSummaryReport:'Order Summary Report',
+ orderDetailsSummary:'Order Detail Summary',
+ updateOrderCraft:'Update Order Craft'
+ },
project:'Project',
orderId:'Order ID',
money:'Total Amount',
@@ -210,7 +218,6 @@
areaAmountPerPiece:'Area amount (single piece)',
areaAmountAge:'Area amount (total area)',
errorValue:'Error value',
- orderDetailsSummary:'Order detail summary',
details:'Details',
workmanship:'Technology',
processCard:'Flow card',
@@ -626,6 +633,11 @@
},
customer:{
+ page:{
+ selectCustomer:'Customer Homepage',
+ createCustomer:'Increase Customers',
+ selectCustomerOrder:'Customer Order'
+ },
pleaseEnterTheCustomerName:'Please enter the customer name',
pleaseEnterCustomerLevel:"Please enter customer level ",
pleaseEnterTheAmountOfFunds:'Please enter the amount of funds',
@@ -639,8 +651,6 @@
telephone:"Telephone ",
customerNumber:'Customer Id',
customerName:"Customer",
- customerHomePage:'Customer Homepage',
- increaseCustomers:'Increase Customers',
resetting:'Revoke',
customerOrders:'Customer order',
orderAmount:'Order amount',
@@ -649,6 +659,15 @@
pleaseEnterTheCustomerAbbreviation:'Please enter the customers abbreviation',
},
delivery:{
+ page:{
+ selectDelivery:'Shipping Homepage',
+ selectOrderList:"Order Shipment",
+ shipmentDetailsReport:"Delivery detail report ",
+ shipmentProductClassificationReport:"Category report of shipped products ",
+ createDelivery:'Create delivery',
+ deliveryReport:'Delivery report',
+
+ },
delivery:'Delivery',
place :'Place',
technology:'Technology',
@@ -673,13 +692,9 @@
shippingAddress:'Shipping Address',
deliveryReportDate:'Delivery Report Date',
shipper:"Shipper ",
- shippingHomepage:'Shipping Homepage',
- orderShipment:"Order Shipment ",
deliveryNoteId:'Delivery Note Id',
deliveryNoteNumber:'Delivery Note Number',
deliveryDate:"Delivery Date ",
- shipmentDetailsReport:"Delivery detail report ",
- shipmentProductClassificationReport:"Category report of shipped products ",
contacts:'Contact person',
contactNumber:'Contact number',
salesman:'Salesman',
@@ -755,6 +770,10 @@
userNameCannotBeEmpty:'The user name cannot be empty',
},
orderBasicData:{
+ page:{
+ searchOrderBasicData:'Base type',
+ searchGlassType:'Type of glass',
+ },
order:'Order',
orderType:'Order type',
orderClassify:'Order classification',
@@ -779,9 +798,7 @@
paymentTerms:'Payment terms',
payMethod:'Payment method',
delivery:'Deliver goods',
- basicType:'Base type',
name:'Name',
- glassCategory:'Type of glass',
level:'Class level',
firstLevel:'Primary class',
towLevel:'Secondary class',
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index b4f6b72..7cebf85 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -91,8 +91,10 @@
}
},
product:{
- ProductHomePage:'袚谢邪胁薪邪褟 褋褌褉邪薪懈褑邪 锌褉芯写褍泻褑懈懈',
- create:'小芯蟹写邪薪懈械',
+ page:{
+ selectProduct:'袚谢邪胁薪邪褟 褋褌褉邪薪懈褑邪 锌褉芯写褍泻褑懈懈',
+ createProduct:'小芯蟹写邪薪懈械',
+ },
coloredGlaze:'笑胁械褌薪邪褟 谐谢邪蟹褍褉褜',
frostedSand:'袦褍褋邪',
coating:'袩芯泻褉褘褌懈械',
@@ -159,8 +161,14 @@
}
},
order:{
- orderHomePage:'袚谢邪胁薪邪褟 褋褌褉邪薪懈褑邪 蟹邪泻邪蟹邪',
- orderReport:'袩芯写褉芯斜薪褘泄 芯褌褔械褌 芯 蟹邪泻邪蟹械',
+ page:{
+ selectOrder:'袚谢邪胁薪邪褟 褋褌褉邪薪懈褑邪 蟹邪泻邪蟹邪',
+ createOrder:'小芯蟹写邪薪懈械',
+ orderReport:'袩芯写褉芯斜薪褘泄 芯褌褔械褌 芯 蟹邪泻邪蟹械',
+ orderSummaryReport:'袩芯谢薪褘泄 芯褌褔械褌 芯 蟹邪泻邪蟹械',
+ orderDetailsSummary:'袩芯写褉芯斜薪邪褟 褋胁芯写泻邪 蟹邪泻邪蟹芯胁',
+ updateOrderCraft:'袩褉芯褑械褋褋 邪褍写懈褌邪'
+ },
project:'袧邪蟹胁邪薪懈械 锌褉芯械泻褌邪',
orderId:'孝芯褉谐芯胁褘泄 薪芯屑械褉',
money:'袨斜褖邪褟 褋褍屑屑邪',
@@ -622,6 +630,13 @@
},
customer:{
+ page:{
+ selectCustomer:'袚谢邪胁薪邪褟 褋褌褉邪薪懈褑邪 袣谢懈械薪褌褘',
+ createCustomer:'校胁械谢懈褔械薪懈械 褔懈褋谢邪 泻谢懈械薪褌芯胁',
+ selectCustomerOrder:'袟邪泻邪蟹 泻谢懈械薪褌邪',
+ createDelivery:'小芯蟹写邪薪懈械 芯褌锌褉邪胁泻懈',
+ deliveryReport:'袨褌褔械褌 芯 写芯褋褌邪胁泻械',
+ },
pleaseEnterTheCustomerName:'袙胁械写懈褌械 懈屑褟 泻谢懈械薪褌邪',
pleaseEnterCustomerLevel:'袙胁械写懈褌械 褍褉芯胁械薪褜 泻谢懈械薪褌邪.',
pleaseEnterTheAmountOfFunds:'袙胁械写懈褌械 褋褍屑屑褍',
@@ -635,8 +650,6 @@
telephone:'袣芯薪褌邪泻褌薪褘泄 褌械谢械褎芯薪',
customerNumber:'袧芯屑械褉 泻谢懈械薪褌邪',
customerName:'袧邪蟹胁邪薪懈械 泻谢懈械薪褌邪',
- customerHomePage:'袚谢邪胁薪邪褟 褋褌褉邪薪懈褑邪 袣谢懈械薪褌褘',
- increaseCustomers:'校胁械谢懈褔械薪懈械 褔懈褋谢邪 泻谢懈械薪褌芯胁',
resetting:'小斜褉芯褋懈褌褜',
customerOrders:'袟邪泻邪蟹褘 泻谢懈械薪褌芯胁',
orderAmount:'小褍屑屑邪 蟹邪泻邪蟹邪',
@@ -750,6 +763,10 @@
userNameCannotBeEmpty:'鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖',
},
orderBasicData:{
+ page:{
+ searchOrderBasicData:'袘邪蟹芯胁褘泄 褌懈锌',
+ searchGlassType:'小褌械泻谢芯 泻邪褌械谐芯褉懈懈',
+ },
order:'袟邪泻邪蟹褘',
orderType:'孝懈锌 蟹邪泻邪蟹邪',
orderClassify:'袣谢邪褋褋懈褎懈泻邪褑懈褟 蟹邪泻邪蟹芯胁',
@@ -774,9 +791,7 @@
paymentTerms:'校褋谢芯胁懈褟 锌谢邪褌械卸邪',
payMethod:'肖芯褉屑褘 锌芯谢褍褔械薪懈褟',
delivery:'袛芯褋褌邪胁泻邪',
- basicType:'袘邪蟹芯胁褘泄 褌懈锌',
name:'袠屑褟',
- glassCategory:'小褌械泻谢芯 泻邪褌械谐芯褉懈懈',
level:'袣邪褌械谐芯褉懈褟',
firstLevel:'袣邪褌械谐芯褉懈褟 I',
towLevel:'袣邪褌械谐芯褉懈褟 II',
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 7deec49..f322edc 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -95,8 +95,10 @@
}
},
product:{
- ProductHomePage:'浜у搧棣栭〉',
- create:'鍒涘缓',
+ page:{
+ selectProduct:'浜у搧棣栭〉',
+ createProduct:'鍒涘缓',
+ },
coloredGlaze:'褰╅噳',
frostedSand:'钂欑爞',
coating:'闀�鑶�',
@@ -163,8 +165,14 @@
}
},
order:{
- orderHomePage:'璁㈠崟棣栭〉',
- orderReport:'璁㈠崟鏄庣粏鎶ヨ〃',
+ page:{
+ selectOrder:'璁㈠崟棣栭〉',
+ createOrder:'鍒涘缓',
+ orderReport:'璁㈠崟鏄庣粏鎶ヨ〃',
+ orderSummaryReport:'璁㈠崟鎬绘姤琛�',
+ orderDetailsSummary:'璁㈠崟鏄庣粏姹囨��',
+ updateOrderCraft:'宸ヨ壓瀹℃牳'
+ },
project:'椤圭洰鍚嶇О',
orderId:'閿�鍞崟鍙�',
money:'鎬婚噾棰�',
@@ -210,7 +218,7 @@
areaAmountPerPiece:'闈㈢Н閲戦锛堝崟鐗囷級',
areaAmountAge:'闈㈢Н閲戦锛堟�婚潰绉級',
errorValue:'璇樊鍊�',
- orderDetailsSummary:'璁㈠崟鏄庣粏姹囨��',
+
details:'璇︽儏',
workmanship:'宸ヨ壓',
processCard:'娴佺▼鍗�',
@@ -237,7 +245,7 @@
oneClickStorage:'涓�閿畬宸�',
quantityMount:'鏁伴噺閲戦',
- orderSummaryReport:'璁㈠崟鎬绘姤琛�',
+
msg:{
productCheck:'璇烽�夋嫨浜у搧',
tableLengthNot:'娌℃湁琛ㄦ牸鏁版嵁',
@@ -630,6 +638,11 @@
},
customer:{
+ page:{
+ selectCustomer:'瀹㈡埛棣栭〉',
+ createCustomer:'瀹㈡埛鏂板',
+ selectCustomerOrder:'瀹㈡埛璁㈠崟'
+ },
pleaseEnterTheCustomerName:'璇疯緭鍏ュ鎴峰悕绉�',
pleaseEnterCustomerLevel:"璇疯緭鍏ュ鎴风瓑绾� ",
pleaseEnterTheAmountOfFunds:'璇疯緭鍏ラ噾棰濋搴�',
@@ -643,8 +656,6 @@
telephone:"鑱旂郴鐢佃瘽 ",
customerNumber:'瀹㈡埛缂栧彿',
customerName:"瀹㈡埛鍚嶇О ",
- customerHomePage:'瀹㈡埛棣栭〉',
- increaseCustomers:'瀹㈡埛鏂板',
resetting:'閲嶇疆',
customerOrders:'瀹㈡埛璁㈠崟',
orderAmount:'璁㈠崟閲戦',
@@ -653,6 +664,14 @@
pleaseEnterTheCustomerAbbreviation:'璇疯緭鍏ュ鎴风畝绉�',
},
delivery:{
+ page:{
+ selectDelivery:'鍙戣揣棣栭〉',
+ selectOrderList:"璁㈠崟鍙戣揣 ",
+ shipmentDetailsReport:"鍙戣揣鏄庣粏鎶ヨ〃 ",
+ shipmentProductClassificationReport:"鍙戣揣浜у搧鍒嗙被鎶ヨ〃 ",
+ createDelivery:'鍙戣揣鍒涘缓',
+ deliveryReport:'鍙戣揣鎶ヨ〃'
+ },
delivery:'鍙戣揣',
place :'涓嬪崟',
technology:'宸ヨ壓',
@@ -677,13 +696,9 @@
shippingAddress:'閫佽揣鍦板潃',
deliveryReportDate:'鍙戣揣鎶ヨ〃鏃ユ湡',
shipper:"鍙戣揣鍛� ",
- shippingHomepage:'鍙戣揣棣栭〉',
- orderShipment:"璁㈠崟鍙戣揣 ",
deliveryNoteId:'鍙戣揣鍗曞彿',
deliveryNoteNumber:'鍙戣揣搴忓彿',
deliveryDate:"鍙戣揣鏃ユ湡 ",
- shipmentDetailsReport:"鍙戣揣鏄庣粏鎶ヨ〃 ",
- shipmentProductClassificationReport:"鍙戣揣浜у搧鍒嗙被鎶ヨ〃 ",
contacts:'鑱旂郴浜�',
contactNumber:'鑱旂郴鐢佃瘽',
salesman:'閿�鍞憳',
@@ -758,6 +773,10 @@
userNameCannotBeEmpty:'鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖',
},
orderBasicData:{
+ page:{
+ searchOrderBasicData:'鍩虹绫诲瀷',
+ searchGlassType:'鐜荤拑绫诲埆',
+ },
order:'璁㈠崟',
orderType:'璁㈠崟绫诲瀷',
orderClassify:'璁㈠崟鍒嗙被',
@@ -782,9 +801,7 @@
paymentTerms:'浠樻鏉′欢',
payMethod:'鏀舵鏂瑰紡',
delivery:'閫佽揣',
- basicType:'鍩虹绫诲瀷',
name:'鍚嶇О',
- glassCategory:'鐜荤拑绫诲埆',
level:'绫诲埆绛夌骇',
firstLevel:'涓�绾х被鍒�',
towLevel:'浜岀骇绫诲埆',
diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/BasicData.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/BasicData.vue
index 1519f0c..6336fbf 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/BasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/BasicData.vue
@@ -20,8 +20,8 @@
<div id="main-div">
<div id="div-title">
<el-breadcrumb :separator-icon="ArrowRight">
- <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/orderBasicData/searchBasicData' }">{{ $t('orderBasicData.basicType') }}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/orderBasicData/searchGlassType' }">{{ $t('orderBasicData.glassCategory') }}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/orderBasicData/searchBasicData' }">{{ $t('orderBasicData.page..searchOrderBasicData') }}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/orderBasicData/searchGlassType' }">{{ $t('orderBasicData.page.searchGlassType') }}</el-breadcrumb-item>
<el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">鎶ヨ〃</el-breadcrumb-item>
</el-breadcrumb>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/Customer.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/Customer.vue
index 4b76b4b..4570f9f 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/Customer.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/Customer.vue
@@ -18,8 +18,8 @@
<div id="main-div">
<div id="div-title">
<el-breadcrumb :separator-icon="ArrowRight">
- <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/customer/selectCustomer' }">{{ $t('customer.customerHomePage') }}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/customer/CreateCustomer' }">{{ $t('customer.increaseCustomers') }}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/customer/selectCustomer' }">{{ $t('customer.page.selectCustomer') }}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/customer/createCustomer' }">{{ $t('customer.page.createCustomer') }}</el-breadcrumb-item>
<el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('productStock.reportForms')}}</el-breadcrumb-item>
</el-breadcrumb>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/Delivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/Delivery.vue
index 24de4fc..96907c4 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/Delivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/Delivery.vue
@@ -24,8 +24,8 @@
<div id="main-div">
<div id="div-title">
<el-breadcrumb :separator-icon="ArrowRight">
- <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/delivery/selectDelivery' }">{{$t('delivery.shippingHomepage')}}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/delivery/selectOrderList' }">{{$t('delivery.orderShipment')}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/delivery/selectDelivery' }">{{$t('delivery.page.selectDelivery')}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/delivery/selectOrderList' }">{{$t('delivery.page.selectOrderList')}}</el-breadcrumb-item>
<el-breadcrumb-item
@click="changeRouter(3)"
:class="indexFlag===3?'indexTag':''"
@@ -39,8 +39,8 @@
</span>
<template #dropdown>
<el-dropdown-menu>
- <el-dropdown-item command="/main/delivery/deliveryReport" >{{$t('delivery.shipmentDetailsReport')}}</el-dropdown-item>
- <el-dropdown-item command="/main/delivery/deliveryProductReport">{{$t('delivery.shipmentProductClassificationReport')}}</el-dropdown-item>
+ <el-dropdown-item command="/main/delivery/deliveryReport" >{{$t('delivery.page.shipmentDetailsReport')}}</el-dropdown-item>
+ <el-dropdown-item command="/main/delivery/deliveryProductReport">{{$t('delivery.page.shipmentProductClassificationReport')}}</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/Order.vue b/north-glass-erp/northglass-erp/src/views/sd/order/Order.vue
index d094fb5..ee06c15 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/Order.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/Order.vue
@@ -24,8 +24,8 @@
<div id="main-div">
<div id="div-title">
<el-breadcrumb :separator-icon="ArrowRight">
- <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/order/selectOrder' }">{{$t('order.orderHomePage')}}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/order/createOrder' }">{{$t('basicData.create')}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/order/selectOrder' }">{{$t('order.page.selectOrder')}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/order/createOrder' }">{{$t('order.page.createOrder')}}</el-breadcrumb-item>
<el-breadcrumb-item
@click="changeRouter(3)"
:class="indexFlag===3?'indexTag':''"
@@ -39,9 +39,9 @@
</span>
<template #dropdown>
<el-dropdown-menu>
- <el-dropdown-item command="/main/order/orderSummaryReport" >{{$t('order.orderSummaryReport')}}</el-dropdown-item>
- <el-dropdown-item command="/main/order/orderReport" >{{ $t('order.orderReport') }}</el-dropdown-item>
- <el-dropdown-item command="/main/order/orderProductSummaryReport">{{ $t('order.orderDetailsSummary') }}</el-dropdown-item>
+ <el-dropdown-item command="/main/order/orderSummaryReport" >{{$t('order.page.orderSummaryReport')}}</el-dropdown-item>
+ <el-dropdown-item command="/main/order/orderReport" >{{ $t('order.page.orderReport') }}</el-dropdown-item>
+ <el-dropdown-item command="/main/order/orderProductSummaryReport">{{ $t('order.page.orderDetailsSummary') }}</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/product/Product.vue b/north-glass-erp/northglass-erp/src/views/sd/product/Product.vue
index 8379eba..e0207d7 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/product/Product.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/product/Product.vue
@@ -20,8 +20,8 @@
<div id="main">
<div id="div-title">
<el-breadcrumb :separator-icon="ArrowRight">
- <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/product/selectProduct' }">{{$t('product.ProductHomePage')}}</el-breadcrumb-item>
- <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/product/createProduct' }">{{$t('product.create')}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/product/selectProduct' }">{{$t('product.page.selectProduct')}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/product/createProduct' }">{{$t('product.page.createProduct')}}</el-breadcrumb-item>
<!-- <el-breadcrumb-item :to="{ path: '/main/product/test' }">娴嬭瘯</el-breadcrumb-item>-->
<!-- <el-breadcrumb-item :to="{ path: '/main/product/testSort11' }">娴嬭瘯</el-breadcrumb-item>-->
<el-breadcrumb-item v-show="false" :to="{ path: '/main/product/test1' }">娴嬭瘯</el-breadcrumb-item>
diff --git a/north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue b/north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue
index ccaf7ae..1d975cc 100644
--- a/north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue
+++ b/north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue
@@ -170,6 +170,10 @@
})
request.post(`/permission/getPermissionList/${lang}`).then(res=>{
res.data.forEach(item=>{
+ item.children.forEach(item1=>{
+ item1.label = t(item.label+'.page.'+item1.label)
+ item1.value = item1.label
+ })
item.label = t('menu.'+item.label)
})
options.value = res.data
@@ -189,6 +193,7 @@
const getPermissionList = () => {
request.post(`/permission/getPermission/${checkId.value}/${lang}`,selectValue.value).then(res=>{
res.data.forEach(item=>{
+ item.page = t(item.menu+'.page.'+item.page)
item.menu = t('menu.'+item.menu)
})
pGrid.value.reloadData(res.data)
--
Gitblit v1.8.0