diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue index 58a9ce3..0bf7712 100644 --- a/src/views/modules/yieldReport/com_finish_roll.vue +++ b/src/views/modules/yieldReport/com_finish_roll.vue @@ -1242,6 +1242,9 @@ export default { /*结束卷的具体操作*/ finishRollOperation(){ //验证通过提交到后台 + if(this.isFqc ){ + this.pageData.createNewRollFlag ='Y' + } let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)}; //处理信息 finishRollWithNoFqc(postData).then(({data}) => { diff --git a/src/views/modules/yieldReport/com_finish_schedule.vue b/src/views/modules/yieldReport/com_finish_schedule.vue index f8e9a30..bcbeac3 100644 --- a/src/views/modules/yieldReport/com_finish_schedule.vue +++ b/src/views/modules/yieldReport/com_finish_schedule.vue @@ -1303,7 +1303,7 @@ checkValidApprovedQty() { //首先判断数值是否通过判断 let approvedQty = this.pageData.approvedQty; - if (approvedQty == null || approvedQty == '') { + if (approvedQty == null || approvedQty === '') { this.$message.error(this.labels.pleaseEnterTotalApprovedQty); this.pageData.approvedQty = 0;//重新赋值 return false; @@ -1315,11 +1315,15 @@ //首先判断数值是否通过判断 let approvedQty = this.pageData.approvedQty; let defectedQty = this.pageData.defectedQty; - if (approvedQty == null || approvedQty == '') { + debugger;; + console.log(0==null ) + console.log(0=='' ) + if (approvedQty == null || approvedQty === '') { this.$message.error(this.labels.pleaseEnterTotalApprovedQty); this.pageData.approvedQty = 0;//重新赋值 return false; } + debugger;; if (approvedQty < 0) { this.$message.error(this.labels.totalApprovedQtyMustMoreTanZero); this.pageData.approvedQty = 0;//重新赋值