Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2025-03-26 7a0527e207c59cdcce0b1f7a41bd7457a236ab23

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