From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/sd/basicData/SearchProcessAttributeConfig.vue |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchProcessAttributeConfig.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchProcessAttributeConfig.vue
index 57dde0d..bdaa1d6 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchProcessAttributeConfig.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchProcessAttributeConfig.vue
@@ -45,9 +45,9 @@
     {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
     {type: 'seq', title: t('basicData.number'), width: 80 ,fixed:"left",},
     {field:'level',title: t('orderBasicData.level')},
-    {field:'processType',title: t('鍒悕'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+    {field:'processType',title: t('orderBasicData.alias'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
     {field:'processName',title: t('orderBasicData.name'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
-    {field:'inputType',title: t('绫诲瀷')},
+    {field:'inputType',title: t('machine.type')},
     {field:'createTime',title: t('basicData.creationTime')}
   ],
 
@@ -144,15 +144,15 @@
 
 const saveBasicData =  (type) =>{
   if(submit.value.glassLevel[0]===null){
-    ElMessage.warning("璇烽�夋嫨绫诲埆")
+    ElMessage.warning(t('orderBasicData.please1'))
     return
   }
   if(submit.value.processName===null||submit.value.processName===""){
-    ElMessage.warning("璇疯緭鍏ュ悕绉�")
+    ElMessage.warning(t('orderBasicData.please2'))
     return
   }
   if(submit.value.processType===null||submit.value.processType===""){
-    ElMessage.warning("璇疯緭鍏ュ埆鍚�")
+    ElMessage.warning(t('orderBasicData.please3'))
     return
   }
   submit.value.type = type
@@ -217,13 +217,13 @@
         />
       </el-row>
       <el-row>
-          鍒悕锛�<el-input style="width: 250px;" v-model="submit.processType"/>
+        {{ $t('orderBasicData.alias') }}锛�<el-input style="width: 250px;" v-model="submit.processType"/>
       </el-row>
       <el-row>
-          鍚嶇О锛�<el-input style="width: 250px;" v-model="submit.processName"/>
+        {{ $t('orderBasicData.name') }}锛�<el-input style="width: 250px;" v-model="submit.processName"/>
       </el-row>
       <el-row>
-          绫诲瀷锛�<el-input style="width: 250px;" v-model="submit.inputType"/>
+        {{ $t('machine.type') }}锛�<el-input style="width: 250px;" v-model="submit.inputType"/>
       </el-row>
       <el-row>
         <el-button v-if="!rowIndex" @click="saveBasicData('add')"   type="primary">{{ $t('basicData.insert') }}</el-button>

--
Gitblit v1.8.0