Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

chenlu

2024-04-18 c3e3920e4e7fcda3dd986c00bb80188381e93015

 north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue

@@ -84,13 +84,25 @@
  })
  productName+="}"

  let materialStore={
    id:ruleForm.value.id,
    type:value.value,
    json:productName,
    width:BasicData.value[0].Type,
    height:BasicData.value[1].Type
  let materialStore

  if(value.value==='原片'){
     materialStore={
      id:ruleForm.value.id,
      type:value.value,
      json:productName,
      width:BasicData.value[0].Type,
      height:BasicData.value[1].Type
    }
  }else if(value.value==='辅料'){
     materialStore={
      id:ruleForm.value.id,
      type:value.value,
      json:productName,
    }
  }


  console.log(materialStore)
  if(isBool){
    request.post("/MaterialStore/saveMaterialStore", materialStore).then((res) => {