diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue index 645aa40..f14095b 100644 --- a/src/views/invoicing/consumable/information.vue +++ b/src/views/invoicing/consumable/information.vue @@ -51,7 +51,12 @@ - + + + + @@ -106,6 +111,9 @@ + + + @@ -386,7 +394,7 @@ export default { }, // 选择的类型 tableDatatypetable(item) { - this.ruleForm.conCode = item.conTypeCode + // this.ruleForm.conCode = item.conTypeCode this.ruleForm.conNames = item.conTypeName this.ruleForm.conTypeId = item.id this.typedialogshow = false diff --git a/src/views/invoicing/consumable/specifications.vue b/src/views/invoicing/consumable/specifications.vue index df628b7..615448a 100644 --- a/src/views/invoicing/consumable/specifications.vue +++ b/src/views/invoicing/consumable/specifications.vue @@ -472,11 +472,10 @@ export default { }); this.informationdialogshowedit = false } else { - - - let { id, consInfoId, surplusStock } = this.addSelect[0] - // 1为共享库存 - if (this.addSelect[0].isDistribute != 1) { + let { id, consInfoId, surplusStock,isDistribute } = this.addSelect[0] + // isDistribute1为共享库存-商品,0不共享是多规格 + // 如果isDistribute为0 是多规格的时候 + if (isDistribute != 1) { surplusStock = this.addSelect[0].skuList[0].surplusStock } let obj = { @@ -490,6 +489,9 @@ export default { ele.skuId = ele.id ele.conInfoId = consInfoId // ele.surplusStock = surplusStock + if (isDistribute == 1) { + ele.surplusStock = surplusStock + } if (!ele.skuId || !ele.surplusStock) { isgongx = true } else { @@ -500,18 +502,9 @@ export default { this.$message.error('请选择耗材信息与输入耗材值') return } + obj.skuInfos = this.addSelect[0].skuList - // } else { - - // if (!consInfoId) { - // this.$message.error('请选择耗材信息') - // return - // } - // if (!surplusStock) { - // this.$message.error('请输入耗材值') - // return - // } - // } + await posttbProskuCons(obj) this.$message({ message: '新增成功', @@ -519,12 +512,6 @@ export default { }); this.ALLisDistribute = null this.dialogshow = false - - - - - - } this.$refs[formName].resetFields() this.getTableData()