From 9951032b617a3097fd35101e9381d06babf5dcb4 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 2 Feb 2023 14:05:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=89=AF=E5=93=81=E6=95=B0=E9=87=8F=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E4=B8=BA=E7=A9=BA=202023=E5=B9=B42=E6=9C=881=E6=97=A5?=
 =?UTF-8?q?=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/yieldReport/com_finish_roll.vue     | 3 +++
 src/views/modules/yieldReport/com_finish_schedule.vue | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

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;//重新赋值