From 7ec26ace7100b90b87603acd9dbbc8012a51eed0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 21 三月 2025 10:32:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue |   48 ++++++++++++++++++++++++++++++------------------
 1 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue b/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue
index e1e6e99..388e116 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue
@@ -15,18 +15,24 @@
   input:''
 })
 let options=ref([
-  { label: "搴撳瓨缁勭粐",
+  { label: t('ingredientsStock.inventoryOrganization'),
     value: "inventoryOrganization",
   },
-  { label: "棰嗗嚭",
+  { label: t('warehouseBasicData.takeOut'),
     value: "takeOut",
   },
-  { label: "鏉愭枡鍑哄簱绫诲瀷",
+  { label: t('ingredientsStock.materialOutboundType'),
     value: "outboundType",
   },
-  { label: "鏉愭枡杩斿簱绫诲瀷",
+  { label: t('ingredientsStock.materialReturnType'),
     value: "returningType",
   },
+  /*{ label: t('ingredients.originalFilm'),
+    value: "originalFilm",
+  },
+  { label: t('ingredients.accessories'),
+    value: "accessories",
+  },*/
 ])
 
 let props = defineProps({
@@ -46,27 +52,33 @@
 const emit =  defineEmits(['gaveParent'])
 const saveBasicData =  () =>{
   if (basic.value.operateType[0]==='inventoryOrganization'){
-    basic.value.type='搴撳瓨缁勭粐'
+    basic.value.type=t('ingredientsStock.inventoryOrganization')
   }
   else if(basic.value.operateType[0]==='takeOut'){
-    basic.value.type='棰嗗嚭'
+    basic.value.type=t('warehouseBasicData.takeOut')
   }
   else if(basic.value.operateType[0]==='outboundType'){
-    basic.value.type='鏉愭枡鍑哄簱绫诲瀷'
+    basic.value.type=t('ingredientsStock.materialOutboundType')
   }
   else if(basic.value.operateType[0]==='returningType'){
-    basic.value.type='鏉愭枡杩斿簱绫诲瀷'
+    basic.value.type=t('ingredientsStock.materialReturnType')
   }
+  /*else if(basic.value.operateType[0]==='originalFilm'){
+    basic.value.type=t('ingredients.originalFilm')
+  }
+  else if(basic.value.operateType[0]==='accessories'){
+    basic.value.type=t('ingredients.accessories')
+  }*/
   if(basic.value.operateType[0]==='' || basic.value.input===''){
     return
   }
   request.post(`/BasicWarehouse/addBasicWarehouse`, basic.value).then(res => {
     if (res.data) {
-      ElMessage.success('淇濆瓨鎴愬姛')
+      ElMessage.success(t('basicData.msg.saveSuccess'))
       emit('gaveParent', true)
     }
   }).catch((err)=>{
-    ElMessage.error('绯荤粺閿欒')
+    ElMessage.error(t('basicData.msg.ServerConnectionError'))
     router.push("/login")
   })
 }
@@ -76,15 +88,15 @@
   submitArr.type = basic.value.type
   submitArr.operateTypeName = basic.value.input
   if(basic.value.input===''){
-    ElMessage.warning('璇疯緭鍏ユ暟鎹�')
+    ElMessage.warning(t('ingredients.pleaseEnterData'))
   }else{
     request.post(`/BasicWarehouse/updateBasicWarehouse`, submitArr).then(res => {
       if (res.data) {
-        ElMessage.success('淇敼鎴愬姛')
+        ElMessage.success(t('basicData.msg.saveSuccess'))
         emit('gaveParent', true)
       }
     }).catch((err)=>{
-      ElMessage.error('绯荤粺閿欒')
+      ElMessage.error(t('basicData.msg.ServerConnectionError'))
       router.push("/login")
     })
   }
@@ -103,19 +115,19 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="4">鍩虹绫诲瀷:</el-col>
+      <el-col :span="4">{{$t('orderBasicData.page.searchOrderBasicData')}}:</el-col>
       <el-col :span="12">
         <el-cascader
             v-model="basic.operateType"
             :options="options"
             clearable
-            placeholder=""
+            :placeholder="$t('processCard.pleaseSelect')"
             :disabled="props.rowIndex"
         />
       </el-col>
     </el-row>
     <el-row>
-      <el-col :span="4">鍚嶇О:</el-col>
+      <el-col :span="4">{{$t('orderBasicData.name')}}:</el-col>
       <el-col :span="12">
         <el-input v-model="basic.input"/>
       </el-col>
@@ -123,8 +135,8 @@
     <el-row>
       <el-col :span="4"></el-col>
       <el-col :span="12">
-        <el-button v-show="!props.rowIndex" @click="saveBasicData" type="primary">鏂板</el-button>
-        <el-button v-show="props.rowIndex" @click="updateBasicData" type="primary">淇敼</el-button>
+        <el-button v-show="!props.rowIndex" @click="saveBasicData" type="primary">{{$t('basicData.insert')}}</el-button>
+        <el-button v-show="props.rowIndex" @click="updateBasicData" type="primary">{{$t('basicData.update')}}</el-button>
 
       </el-col>
     </el-row>

--
Gitblit v1.8.0