From 7a0527e207c59cdcce0b1f7a41bd7457a236ab23 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 三月 2025 10:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 7f7d912..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
@@ -140,7 +140,7 @@
basic.value.input=basic.value.input+"mm"
}
}
- console.log(basic.value)
+ basic.value.input=basic.value.input.trim()
request.post(`/basicData/addBasicData`, basic.value).then(res => {
if (res.data) {
ElMessage.success(t('basicData.msg.saveSuccess'))
@@ -157,7 +157,7 @@
let submitArr = props.rowIndex
submitArr.basicType = basic.value.basicType[0]
submitArr.basicCategory = basic.value.basicType[1]
- submitArr.basicName = basic.value.input
+ submitArr.basicName = basic.value.input.trim()
submitArr.nickname = basic.value.nickname
request.post(`/basicData/updateBasicData`, submitArr).then(res => {
if (res.data) {
@@ -202,7 +202,7 @@
<template>
<div>
<el-row>
- <el-col :span="4">{{ $t('orderBasicData.basicType') }}:</el-col>
+ <el-col :span="4">{{ $t('orderBasicData.page.searchOrderBasicData') }}:</el-col>
<el-col :span="12">
<el-cascader
v-model="basic.basicType"
@@ -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