From e463ec25a4b153c31030041bc506580d2c37ab4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=96?=
 <10034423+lihaoyuelijing@user.noreply.gitee.com>
Date: Tue, 25 Jun 2024 15:44:18 +0800
Subject: [PATCH] =?UTF-8?q?0.0.72=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=B8=8D=E5=90=88=E6=A0=BC=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue               |  2 +-
 .../quality/Materialinspection/index.vue      | 40 +++++++++++++------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index a2a6ae2..beefeaf 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.71'; //正式版本号
+  version = '0.0.72'; //正式版本号
   //version = '0.0.3'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 80c4feb..9cbd520 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -385,6 +385,7 @@ export default class PurchaseWHSRM extends BasePage {
   isvalue2 = false;
   isvalue3 = false;
   isquality = false;
+  isremark = false;
   isgetAutoJudge = false;
   isfocus = false;
   isshow1 = false;
@@ -739,6 +740,7 @@ export default class PurchaseWHSRM extends BasePage {
     this.isvalue2 = false;
     this.isvalue3 = false;
     this.isquality = false;
+    this.isremark = false;
     let typeCode = '';
     this.nodelist.forEach((item) => {
       if (this.selectList.value == item.orderCode) {
@@ -752,11 +754,13 @@ export default class PurchaseWHSRM extends BasePage {
         }
       }
     });
-    // this.detaillistceshi.forEach((item) => {
-    //   if (item.defectCode == null || item.defectCode == '') {
-    //     this.isvalue2 = true;
-    //   }
-    // });
+    this.detaillistceshi.forEach((item) => {
+      if (item.status == 'N') {
+        if (item.remark == null || item.remark == '') {
+          this.isremark = true;
+        }
+      }
+    });
     // this.detaillistceshi.forEach((item) => {
     //   if (item.defectQuality == null || item.defectQuality == '') {
     //     this.isvalue3 = true;
@@ -786,6 +790,15 @@ export default class PurchaseWHSRM extends BasePage {
         return;
       }
     }
+    if (this.selectList.value != 'checkTypeLL') {
+      if (this.isremark) {
+        (this.$refs.uToast as any).show({
+          title: '不合格描述不能为空',
+          type: 'default',
+        });
+        return;
+      }
+    }
     // if (this.isvalue2) {
     //   (this.$refs.uToast as any).show({
     //     title: '请选择不良分类',
@@ -808,13 +821,15 @@ export default class PurchaseWHSRM extends BasePage {
       });
       return;
     }
-    if (this.formdata.checkResult == 'N') {
-      if (this.formdata.remark === null || this.formdata.remark === '') {
-        (this.$refs.uToast as any).show({
-          title: '不合格描述不能为空',
-          type: 'default',
-        });
-        return;
+    if (this.selectList.value == 'checkTypeLL') {
+      if (this.formdata.checkResult == 'N') {
+        if (this.formdata.remark === null || this.formdata.remark === '') {
+          (this.$refs.uToast as any).show({
+            title: '不合格描述不能为空',
+            type: 'default',
+          });
+          return;
+        }
       }
     }
     if (this.selectList.value == 'checkTypeLL') {
@@ -878,7 +893,6 @@ export default class PurchaseWHSRM extends BasePage {
         item.files = [];
       }
     });
-
     let query = {
       sampleQuality: this.formdata.sampleQuality,
       updateBy: session.userName,