ERP_override.git

			@@ -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'" >