Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-03-21 7ec26ace7100b90b87603acd9dbbc8012a51eed0

 north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue

@@ -15,22 +15,22 @@
  input:''
})
let options=ref([
  { label: t('mainIngredientStock.inventoryOrganization'),
  { label: t('ingredientsStock.inventoryOrganization'),
    value: "inventoryOrganization",
  },
  { label: t('mainBasicData.takeOut'),
  { label: t('warehouseBasicData.takeOut'),
    value: "takeOut",
  },
  { label: t('mainIngredientStock.materialOutboundType'),
  { label: t('ingredientsStock.materialOutboundType'),
    value: "outboundType",
  },
  { label: t('mainIngredientStock.materialReturnType'),
  { label: t('ingredientsStock.materialReturnType'),
    value: "returningType",
  },
  /*{ label: t('mainIngredient.originalFilm'),
  /*{ label: t('ingredients.originalFilm'),
    value: "originalFilm",
  },
  { label: t('mainIngredient.accessories'),
  { label: t('ingredients.accessories'),
    value: "accessories",
  },*/
])
@@ -52,22 +52,22 @@
const emit =  defineEmits(['gaveParent'])
const saveBasicData =  () =>{
  if (basic.value.operateType[0]==='inventoryOrganization'){
    basic.value.type=t('mainIngredientStock.inventoryOrganization')
    basic.value.type=t('ingredientsStock.inventoryOrganization')
  }
  else if(basic.value.operateType[0]==='takeOut'){
    basic.value.type=t('mainBasicData.takeOut')
    basic.value.type=t('warehouseBasicData.takeOut')
  }
  else if(basic.value.operateType[0]==='outboundType'){
    basic.value.type=t('mainIngredientStock.materialOutboundType')
    basic.value.type=t('ingredientsStock.materialOutboundType')
  }
  else if(basic.value.operateType[0]==='returningType'){
    basic.value.type=t('mainIngredientStock.materialReturnType')
    basic.value.type=t('ingredientsStock.materialReturnType')
  }
  /*else if(basic.value.operateType[0]==='originalFilm'){
    basic.value.type=t('mainIngredient.originalFilm')
    basic.value.type=t('ingredients.originalFilm')
  }
  else if(basic.value.operateType[0]==='accessories'){
    basic.value.type=t('mainIngredient.accessories')
    basic.value.type=t('ingredients.accessories')
  }*/
  if(basic.value.operateType[0]==='' || basic.value.input===''){
    return
@@ -88,7 +88,7 @@
  submitArr.type = basic.value.type
  submitArr.operateTypeName = basic.value.input
  if(basic.value.input===''){
    ElMessage.warning(t('mainIngredient.pleaseEnterData'))
    ElMessage.warning(t('ingredients.pleaseEnterData'))
  }else{
    request.post(`/BasicWarehouse/updateBasicWarehouse`, submitArr).then(res => {
      if (res.data) {
@@ -115,7 +115,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.operateType"