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 | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 c6c4468..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) {
@@ -178,13 +178,11 @@
const isLt2M = file.size / 1024 / 1024 < 5;
if (!isJPG) {
- this.$message.error('涓婁紶澶村儚鍥剧墖鍙兘鏄� JPG鎴栬�匬NG 鏍煎紡!')
- this.$refs.upload.clearFiles()
+ ElMessage.warning(t('orderBasicData.msg2'))
return
}
if (!isLt2M) {
- this.$message.error('涓婁紶澶村儚鍥剧墖澶у皬涓嶈兘瓒呰繃 5MB!')
- this.$refs.upload.clearFiles()
+ ElMessage.warning(t('orderBasicData.msg1'))
return
}
@@ -204,13 +202,13 @@
<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"
@change="handleChange"
:options="options"
- placeholder=""
+ :placeholder="$t('processCard.pleaseSelect')"
:disabled="props.rowIndex"
/>
</el-col>
@@ -224,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'" >
@@ -239,8 +241,8 @@
action="https://jsonplaceholder.typicode.com/posts/"
:file-list="fileList"
:auto-upload="false">
- <el-button slot="trigger" size="small" type="primary" >閫夊彇鏂囦欢</el-button>
- <div slot="tip" class="el-upload__tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�5m</div>
+ <el-button slot="trigger" size="small" type="primary" >{{ $t('orderBasicData.selectFile') }}</el-button>
+ <div slot="tip" class="el-upload__tip">{{ $t('orderBasicData.msg3') }}</div>
</el-upload>
</el-col>
</el-row>
--
Gitblit v1.8.0