diff --git a/src/views/foodManage/purchaseManage/contractList/edit.vue b/src/views/foodManage/purchaseManage/contractList/edit.vue index 20f5e24e..c529f39b 100644 --- a/src/views/foodManage/purchaseManage/contractList/edit.vue +++ b/src/views/foodManage/purchaseManage/contractList/edit.vue @@ -623,7 +623,8 @@ export default { this.noMaterial = false; if(this.contractMaterialList.length>0){ this.contractMaterialList.forEach(item=>{ - if(Number((item.singlePrice*item.orderNum).toFixed(2))==0){ + // if(Number((item.singlePrice*item.orderNum).toFixed(2))==0){ + if(Number(item.orderNum)==0){ this.noMaterial = true }else{ let obj = Object.assign({}, item) @@ -634,7 +635,7 @@ export default { }) } if(this.noMaterial){ - this.$modal.msgError("请输入单价和数量!"); + this.$modal.msgError("请输入数量!"); }else{ this.noMaterial = true; if(this.contractMaterialList.length>0){ @@ -692,7 +693,8 @@ export default { this.noMaterial = false; if(this.contractMaterialList.length>0){ this.contractMaterialList.forEach(item=>{ - if(item.singlePrice==0 || item.orderNum==0){ + // if(item.singlePrice==0 || item.orderNum==0){ + if(Number(item.orderNum)==0){ this.noMaterial = true }else{ let obj = Object.assign({}, item) @@ -703,7 +705,7 @@ export default { }) } if(this.noMaterial){ - this.$modal.msgError("请输入单价和数量!"); + this.$modal.msgError("请输入数量!"); }else{ this.noMaterial = true; if(this.contractMaterialList.length>0){ diff --git a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue index 562002be..c259b659 100644 --- a/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue +++ b/src/views/foodManage/purchaseManage/purchaseOrder/edit.vue @@ -689,7 +689,8 @@ export default { this.noMaterial = false; if(this.materialList.length>0){ this.materialList.forEach(item=>{ - if(Number((item.singlePrice*item.orderNum).toFixed(2))==0){ + // if(Number((item.singlePrice*item.orderNum).toFixed(2))==0){ + if(Number(item.orderNum)==0){ this.noMaterial = true }else{ let obj = Object.assign({}, item) @@ -702,7 +703,7 @@ export default { }) } if(this.noMaterial){ - this.$modal.msgError("请输入正确的单价和数量!"); + this.$modal.msgError("请输入正确的数量!"); }else{ this.noMaterial = true; if(this.materialList.length>0){ @@ -752,7 +753,8 @@ export default { this.noMaterial = false; if(this.materialList.length>0){ this.materialList.forEach(item=>{ - if(Number((item.singlePrice*item.orderNum).toFixed(2))==0){ + // if(Number((item.singlePrice*item.orderNum).toFixed(2))==0){ + if(Number(item.orderNum)==0){ this.noMaterial = true }else{ let obj = Object.assign({}, item) @@ -765,7 +767,7 @@ export default { }) } if(this.noMaterial){ - this.$modal.msgError("请输入单价和数量!"); + this.$modal.msgError("请输入正确的数量!"); }else{ this.noMaterial = true; if(this.materialList.length>0){ diff --git a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue index a33348ef..9743ae45 100644 --- a/src/views/foodManage/purchaseManage/purchasePlan/edit.vue +++ b/src/views/foodManage/purchaseManage/purchasePlan/edit.vue @@ -461,7 +461,8 @@ export default { this.noMaterial = false; if(this.materialList.length>0){ this.materialList.forEach(item=>{ - if(Number((item.unitPrice*item.purchaseNum).toFixed(2))==0){ + // if(Number((item.unitPrice*item.purchaseNum).toFixed(2))==0){ + if(Number(item.purchaseNum)==0){ this.noMaterial = true }else{ let obj = Object.assign({}, item) @@ -474,7 +475,7 @@ export default { }) } if(this.noMaterial){ - this.$modal.msgError("请输入参考价和采购数量!"); + this.$modal.msgError("请输入采购数量!"); }else{ this.noMaterial = true; if(this.materialList.length>0){ @@ -524,7 +525,8 @@ export default { this.noMaterial = false; if(this.materialList.length>0){ this.materialList.forEach(item=>{ - if(Number((item.unitPrice*item.purchaseNum).toFixed(2))==0){ + // if(Number((item.unitPrice*item.purchaseNum).toFixed(2))==0){ + if(Number(item.purchaseNum)==0){ this.noMaterial = true }else{ let obj = Object.assign({}, item) @@ -537,7 +539,7 @@ export default { }) } if(this.noMaterial){ - this.$modal.msgError("请输入参考价和采购数量!"); + this.$modal.msgError("请输入采购数量!"); }else{ this.noMaterial = true; if(this.materialList.length>0){ diff --git a/src/views/foodManage/stockManage/warehouseIn/edit.vue b/src/views/foodManage/stockManage/warehouseIn/edit.vue index e25e261d..260aa0db 100644 --- a/src/views/foodManage/stockManage/warehouseIn/edit.vue +++ b/src/views/foodManage/stockManage/warehouseIn/edit.vue @@ -553,7 +553,7 @@ export default { if(this.materialList.length>0){ this.materialList.forEach(item=>{ this.$set(item,"purNum",Number(item.purNum)) - if(item.unitPrice==0 || item.purNum==0 || item.supplierId==null || !item.productDate|| !item.expireTime){ + if(item.purNum==0 || item.supplierId==null || !item.productDate|| !item.expireTime){ this.noMaterial = true }else{ let obj = Object.assign({}, item) @@ -618,7 +618,7 @@ export default { if(this.materialList.length>0){ this.materialList.forEach(item=>{ this.$set(item,"purNum",Number(item.purNum)) - if(item.unitPrice==0 || item.purNum==0 || item.supplierId==null || !item.productDate|| !item.expireTime){ + if(item.purNum==0 || item.supplierId==null || !item.productDate|| !item.expireTime){ this.noMaterial = true }else{ let obj = Object.assign({}, item)