From 0cca79a80d9663b7b5a45bc236c345499b82557a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=96?=
 <10034423+lihaoyuelijing@user.noreply.gitee.com>
Date: Thu, 13 Jun 2024 17:46:38 +0800
Subject: [PATCH] =?UTF-8?q?0.0.68=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E9=AA=8C=E4=BF=AE=E6=94=B9?=
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      | 71 +++++++++++++------
 2 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 833e2d0..93f2ca0 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.67'; //正式版本号
+  version = '0.0.68'; //正式版本号
   //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 9c990a4..080dbb7 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -174,6 +174,11 @@
 		bNoOkquality：B类不良（只过程有）
 		cNoOkquality：C类不良（只过程有） -->
         <u-form class="Belowsform3" ref="form" label-width="230rpx" label-position="left">
+          <div class="" v-show="selectList.value == 'checkTypeSC'">
+            <u-form-item label="首检原因:">
+              <u-input v-model="formdata.reason" placeholder="" />
+            </u-form-item>
+          </div>
           <u-form-item label="抽样数量:">
             <u-input v-model="formdata.sampleQuality" placeholder="" type="number" />
           </u-form-item>
@@ -294,6 +299,11 @@ export default class PurchaseWHSRM extends BasePage {
       name: '不合格',
       radiovalue: null,
     },
+    {
+      type: 'O',
+      name: '不检验',
+      radiovalue: null,
+    },
   ];
   listselectoa: any = [
     {
@@ -354,6 +364,7 @@ export default class PurchaseWHSRM extends BasePage {
     materialFrom: null,
     remark: null,
     startOA: null,
+    reason: null,
   };
   isvalue = false;
   isvalue2 = false;
@@ -713,14 +724,26 @@ export default class PurchaseWHSRM extends BasePage {
       }
     });
 
-    // console.log(this.detaillistceshi, this.isvalue, this.isquality);
-    // if (this.isvalue) {
-    //   (this.$refs.uToast as any).show({
-    //     title: '检查标准不能为空',
-    //     type: 'default',
-    //   });
-    //   return;
-    // }
+    if (this.selectList.value == 'checkTypeSC') {
+      // console.log(this.detaillistceshi, this.isvalue, this.isquality);
+      if (this.isvalue) {
+        (this.$refs.uToast as any).show({
+          title: '实际测量值不能为空',
+          type: 'default',
+        });
+        return;
+      }
+    }
+    if (this.selectList.value == 'checkTypeSC') {
+      // console.log(this.detaillistceshi, this.isvalue, this.isquality);
+      if (this.formdata.reason === null || this.formdata.reason === '') {
+        (this.$refs.uToast as any).show({
+          title: '首检原因不能为空',
+          type: 'default',
+        });
+        return;
+      }
+    }
     // if (this.isvalue2) {
     //   (this.$refs.uToast as any).show({
     //     title: '请选择不良分类',
@@ -852,23 +875,25 @@ export default class PurchaseWHSRM extends BasePage {
       materialType: this.formdata.materialType,
       // 物料来源
       materialFrom: this.formdata.materialFrom,
+      // 物料来源
+      reason: this.formdata.reason,
     };
     console.log(query, this.formdata);
-    await this.model.commitCheckTaskList(query);
-    if (this.model.SubmitCode.code == '200') {
-      (this.$refs.uToast as any).show({
-        title: '成功',
-        type: 'default',
-      });
-      this.show = false;
-      this.getlist();
-      this.clear();
-    } else {
-      (this.$refs.uToast as any).show({
-        title: '失败',
-        type: 'default',
-      });
-    }
+    // await this.model.commitCheckTaskList(query);
+    // if (this.model.SubmitCode.code == '200') {
+    //   (this.$refs.uToast as any).show({
+    //     title: '成功',
+    //     type: 'default',
+    //   });
+    //   this.show = false;
+    //   this.getlist();
+    //   this.clear();
+    // } else {
+    //   (this.$refs.uToast as any).show({
+    //     title: '失败',
+    //     type: 'default',
+    //   });
+    // }
   }
   clear() {
     this.formdata.sampleQuality = null;