From 1b63cf22b4f488bb78135bd25669105cc64d4712 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 19 十二月 2024 17:01:55 +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/CreateBasicData.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
index cc85ddf..6951b52 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
@@ -222,7 +222,11 @@
<el-row>
<el-col :span="4">{{ $t('orderBasicData.alias') }}:</el-col>
<el-col :span="12">
- <el-input v-model="basic.nickname"/>
+ <el-input v-if="basic.basicType.length>0 && basic.basicType[1]!=='process'" v-model="basic.nickname"/>
+ <el-select v-model="basic.nickname" v-else>
+ <el-option :label="$t('orderBasicData.commonProcess')" value="" />
+ <el-option :label="$t('orderBasicData.laminatingProcess')" value="laminating" />
+ </el-select>
</el-col>
</el-row>
<el-row v-if="basic.basicType.length!==0 && basic.basicType[1]==='icon'" >
--
Gitblit v1.8.0