From 430ab98c6225a276bab44c5eebb304fc6206cb73 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 25 九月 2024 16:03:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 947d2dc..16ce982 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
@@ -27,6 +27,12 @@
{ label: t('mainIngredientStock.materialReturnType'),
value: "returningType",
},
+ /*{ label: t('mainIngredient.originalFilm'),
+ value: "originalFilm",
+ },
+ { label: t('mainIngredient.accessories'),
+ value: "accessories",
+ },*/
])
let props = defineProps({
@@ -57,6 +63,12 @@
else if(basic.value.operateType[0]==='returningType'){
basic.value.type=t('mainIngredientStock.materialReturnType')
}
+ /*else if(basic.value.operateType[0]==='originalFilm'){
+ basic.value.type=t('mainIngredient.originalFilm')
+ }
+ else if(basic.value.operateType[0]==='accessories'){
+ basic.value.type=t('mainIngredient.accessories')
+ }*/
if(basic.value.operateType[0]==='' || basic.value.input===''){
return
}
@@ -109,7 +121,7 @@
v-model="basic.operateType"
:options="options"
clearable
- placeholder=""
+ :placeholder="$t('processCard.pleaseSelect')"
:disabled="props.rowIndex"
/>
</el-col>
--
Gitblit v1.8.0