From d1b52dd8e9a8de2c95ec4f97791812ea88543124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=96?=
 <10034423+lihaoyuelijing@user.noreply.gitee.com>
Date: Mon, 2 Sep 2024 17:36:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B00.0.100?=
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      | 44 ++++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index ebbc488..95957a2 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.99'; //正式版本号
+  version = '0.0.100'; //正式版本号
   //version = '0.0.11'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index f4d3d5b..11d343e 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -1288,27 +1288,29 @@ export default class PurchaseWHSRM extends BasePage {
     }
     //来料oa校验
     if (this.selectList.value == 'checkTypeLL') {
-      if (this.formdata.startOA == '1') {
-        if (this.formdata.materialType === null || this.formdata.materialType === '') {
-          (this.$refs.uToast as any).show({
-            title: '请选择来料类别',
-            type: 'default',
-          });
-          return;
-        }
-        if (this.formdata.materialFrom === null || this.formdata.materialFrom === '') {
-          (this.$refs.uToast as any).show({
-            title: '请选择物料来源',
-            type: 'default',
-          });
-          return;
-        }
-        if (this.formdata.storageFrom === null || this.formdata.storageFrom === '') {
-          (this.$refs.uToast as any).show({
-            title: '请选择仓储报检人',
-            type: 'default',
-          });
-          return;
+      if (this.formdata.checkResult == 'N') {
+        if (this.formdata.startOA == '1') {
+          if (this.formdata.materialType === null || this.formdata.materialType === '') {
+            (this.$refs.uToast as any).show({
+              title: '请选择来料类别',
+              type: 'default',
+            });
+            return;
+          }
+          if (this.formdata.materialFrom === null || this.formdata.materialFrom === '') {
+            (this.$refs.uToast as any).show({
+              title: '请选择物料来源',
+              type: 'default',
+            });
+            return;
+          }
+          if (this.formdata.storageFrom === null || this.formdata.storageFrom === '') {
+            (this.$refs.uToast as any).show({
+              title: '请选择仓储报检人',
+              type: 'default',
+            });
+            return;
+          }
         }
       }
     }