From c3360be51c33fbdf16a379156d29cc5cd919e50e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 13 六月 2024 16:15:07 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue
index cada649..8198765 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue
@@ -42,16 +42,16 @@
   //琛ㄥご鍙傛暟
   columns:[
     {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
-    {type: 'seq', title: '搴忓彿', width: 80 ,fixed:"left",},
-    {field:'level',title: '绫诲埆绛夌骇'},
-    {field:'typeName',title: '鍚嶇О'},
-    {field:'createTime',title: '鍒涘缓鏃ユ湡'}
+    {type: 'seq', title: t('basicData.number'), width: 80 ,fixed:"left",},
+    {field:'level',title: t('orderBasicData.level')},
+    {field:'typeName',title: t('orderBasicData.name')},
+    {field:'createTime',title: t('basicData.creationTime')}
   ],
 
   //琛ㄥご鎸夐挳
   toolbarConfig: {
     buttons: [
-      {'code': 'add', 'name': '鏂板',status: 'primary'},
+      {'code': 'add', 'name': t('basicData.insert'),status: 'primary'},
     ],
 
     // import: false,
@@ -65,11 +65,11 @@
 const glassType = reactive([
   {
     value:1,
-    label:'涓�绾х被鍒�'
+    label:t('orderBasicData.firstLevel')
   },
   {
     value: 2,
-    label: '浜岀骇绫诲埆',
+    label: t('orderBasicData.towLevel'),
     children: []
   }
 ])
@@ -139,7 +139,7 @@
   submit.value.type = type
   request.post(`/basicGlassType/add`, submit.value).then(res => {
     if (res.code==='200') {
-      ElMessage.success('淇濆瓨鎴愬姛')
+      ElMessage.success(t('basicData.msg.saveSuccess'))
       router.push({
         path:'/main/orderBasicData/searchGlassType',
         query:{random:Math.random()
@@ -188,8 +188,8 @@
           <el-input v-model="submit.value"/>
       </el-row>
       <el-row>
-        <el-button v-if="!rowIndex" @click="saveBasicData('add')"   type="primary">鏂板</el-button>
-        <el-button v-else @click="saveBasicData('update')" type="primary">淇敼</el-button>
+        <el-button v-if="!rowIndex" @click="saveBasicData('add')"   type="primary">{{ $t('basicData.insert') }}</el-button>
+        <el-button v-else @click="saveBasicData('update')" type="primary">{{ $t('basicData.update') }}</el-button>
       </el-row>
     </el-dialog>
 

--
Gitblit v1.8.0