diff --git a/src/views/plan/whiteOrder/index.vue b/src/views/plan/whiteOrder/index.vue index 3033193..8f3dd5c 100644 --- a/src/views/plan/whiteOrder/index.vue +++ b/src/views/plan/whiteOrder/index.vue @@ -244,16 +244,20 @@ + - - - + + + + + + - - - + + + @@ -561,8 +565,8 @@ export default { factoryCode: null, orderType: null, orderCode: null, - prodCode: null, - prodDesc: null, + prodCode: '', + prodDesc: '', quantity: null, quantitySplit: null, unit: null, @@ -580,8 +584,8 @@ export default { }, // 表单参数 form: { - prodCode: null, - prodDesc: null, + prodCode: '', + prodDesc: '', planProDate: null, planComplete: null, quantity: null, @@ -973,11 +977,21 @@ export default { var code = ''; var desc = ''; for (let i = 0; i < this.selectMaterielList.length; i++) { - code = code + this.selectMaterielList[i].productCode + ','; - desc = desc + this.selectMaterielList[i].productDescZh + ','; + if(this.form.prodCode.indexOf(this.selectMaterielList[i].productCode)<0){ + code = code + this.selectMaterielList[i].productCode + ','; + } + + if(this.form.prodDesc.indexOf(this.selectMaterielList[i].productDescZh)<0){ + desc = desc + this.selectMaterielList[i].productDescZh + ','; + }else{ + this.$message({ + message: this.selectMaterielList[i].productDescZh+'已经选择', + type: 'warning' + }) + } } - this.form.prodCode = code; - this.form.prodDesc = desc; + this.form.prodCode += code; + this.form.prodDesc += desc; // 关闭选择物料弹窗 this.innerVisible = false; }, @@ -1168,8 +1182,8 @@ export default { factoryCode: null, orderType: null, orderCode: null, - prodCode: null, - prodDesc: null, + prodCode: '', + prodDesc: '', quantity: null, quantitySplit: null, unit: null,