补交

廖井涛

2025-11-18 b85a6fbf48fb3ce159e266db4bb760041b1514d9

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialAddition.vue

@@ -55,12 +55,15 @@

// 定义表头上传数据
let titleUploadData = ref({
  id:'',
  materialCode:'',
  producer:'',
  dateOfManufacture:'',
  qualityGuaranteePeriod:'',
  inventoryOrganization:'',
  inventoryArea:'',
  inventoryQuantity:'',
  availableQuantity:'',
  remarks:''
})

@@ -121,7 +124,7 @@

//列查询
const getStoreWork = () => {
  value.value=t('ingredients.originalFilm')
  filterDatas.value.type=value.value
  request.get(`/BasicWarehouse/BasicWarehouseType/${value.value}`).then((res) => {
    if(res.code==200){
      gridOption.columns=[]
@@ -139,11 +142,11 @@
        gridOption.columns.push(column)

      }
      if(value.value==t('ingredients.accessories')){
      /*if(value.value==t('ingredients.accessories')){
        titleUploadData.value.inventoryOrganization=titleSelectJson.value.inventoryOrganization[1].operateTypeName
      }else{
        titleUploadData.value.inventoryOrganization=titleSelectJson.value.inventoryOrganization[0].operateTypeName
      }
      }*/

      getStoreWorks()

@@ -173,6 +176,30 @@
      ElMessage.warning(res.msg)
      router.push("/login")
    }
  })
}

const update = () => {
  gridOption.toolbarConfig.buttons[0].disabled = true
  let flowData = ref({
    title: titleUploadData.value,
    materialInventoryId: props.data.id,
    userName:userStore.user.userName,
    userId:userStore.user.userId

  })

  request.post("/materialInventory/updateMaterialInventory", flowData.value).then((res) => {
    if(res.code==200 && res.data==="true"){
      ElMessage.success(t('basicData.msg.saveSuccess'))
      router.push({path: '/main/ingredientsStock/SelectIngredientsStock', query:{random:Math.random()}})
    }else if(res.data==="false1") {
      ElMessage.warning(t('ingredientsStock.msg1'))
    }else {
      ElMessage.warning(t('basicData.msg.ServerConnectionError'))
    }
  }).finally(()=>{
    gridOption.toolbarConfig.buttons[0].disabled = false
  })
}

@@ -237,7 +264,7 @@
              })
            }


            gridOption.toolbarConfig.buttons[0].disabled = true
            request.post("/materialInventory/saveMaterialInventory", flowData.value).then((res) => {
              if(res.code==200 && res.data==="true"){
                ElMessage.success(t('basicData.msg.saveSuccess'))
@@ -245,25 +272,8 @@
              }else {
                ElMessage.warning(t('basicData.msg.ServerConnectionError'))
              }
            })
          }else{
            let flowData = ref({
              title: titleUploadData.value,
              materialInventoryId: props.data.id,
              userName:userStore.user.userName,
              userId:userStore.user.userId

            })

            request.post("/materialInventory/updateMaterialInventory", flowData.value).then((res) => {
              if(res.code==200 && res.data==="true"){
                ElMessage.success(t('basicData.msg.saveSuccess'))
                router.push({path: '/main/ingredientsStock/SelectIngredientsStock', query:{random:Math.random()}})
              }else if(res.data==="false1") {
                ElMessage.warning("库存存在多条")
              }else {
                ElMessage.warning(t('basicData.msg.ServerConnectionError'))
              }
            }).finally(()=>{
              gridOption.toolbarConfig.buttons[0].disabled = false
            })
          }

@@ -285,7 +295,7 @@
})

onMounted(async ()=>{
  await select()

  if(props.data!=null){
    titleUploadData.value.dateOfManufacture=props.data.dateOfManufacture
    titleUploadData.value.qualityGuaranteePeriod=props.data.qualityGuaranteePeriod
@@ -293,9 +303,15 @@
    titleUploadData.value.inventoryArea=props.data.inventoryArea
    titleUploadData.value.inventoryQuantity=props.data.inventoryQuantity
    titleUploadData.value.remarks=props.data.remarks
    titleUploadData.value.materialCode=props.data.materialCode
    titleUploadData.value.id=props.data.id
    titleUploadData.value.availableQuantity=props.data.availableQuantity
    titleUploadData.value.inventoryOrganization=props.data.inventoryOrganization
    isDisabled=true
  }else{
    await select()
    isDisabled=false
    value.value=t('ingredients.originalFilm')
    getStoreWork()
  }

@@ -324,7 +340,7 @@
        <el-col  :span="2"><el-text>{{$t('ingredientsStock.qualityGuaranteePeriod')}}:</el-text></el-col>
        <el-col  :span="3"><el-input v-model="titleUploadData.qualityGuaranteePeriod" /></el-col>
        <el-col  :span="1"><el-text>{{$t('ingredientsStock.producer')}}:</el-text></el-col>
        <el-col  :span="3"><el-input v-model="titleUploadData.producer" /></el-col>
        <el-col  :span="3"><el-input v-model.trim="titleUploadData.producer" /></el-col>

      </el-row>
      <el-row>
@@ -360,14 +376,15 @@
        </el-select>
      </el-row>
    </div>
    <div class="main-div-customers" style="height: 350px">
    <div class="main-div-customers"  style="height: 350px">
      <el-button v-if="props.type===2" type="primary" @click="update">{{$t('basicData.save')}}</el-button>
      <vxe-grid
          height="100%"
          class="mytable-scrollbar"
          ref="xGrids"
          v-bind="gridOption"
          v-on="gridEvent"

          v-if="props.type===1"
      >
        <template #num1_filter="{ column, $panel }">
          <div>