From 7de91ce6313b98cadd5935f3a9c3c9861f58dd45 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Thu, 16 May 2024 10:44:52 +0800
Subject: [PATCH] =?UTF-8?q?0.0.53=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/Materialinspection/index.vue      | 86 +++++++++++--------
 src/pages/shouye/me.vue                       |  2 +-
 2 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 084f8fa..b281688 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -182,30 +182,33 @@
           </u-form-item>
 
           <div class="" v-show="selectList.value == 'checkTypeLL'">
-            <u-form-item label="是否发起oa:">
-              <u-radio-group v-model="formdata.startOA">
-                <u-radio v-for="(n, indexn) in listselectoa" :key="indexn" :name="n.type" :disabled="n.disabled">
-                  {{ n.name }}
-                </u-radio>
-              </u-radio-group>
-            </u-form-item>
             <u-form-item label="最终判定:">
               <!-- <u-input v-model="formdata.checkResult" placeholder="" type="text" /> -->
-              <u-radio-group v-model="formdata.checkResult">
+              <u-radio-group v-model="formdata.checkResult" @change="changeradio1(formdata.checkResult)">
                 <u-radio v-for="(n, indexn) in listselectdetermine" :key="indexn" :name="n.type" :disabled="n.disabled">
                   {{ n.name }}
                 </u-radio>
               </u-radio-group>
             </u-form-item>
-            <u-form-item label="不合格描述:">
-              <u-input style="background: #fafafa; border: 1px dashed #e2e2e2; padding: 10px 5px" v-model="formdata.remark" placeholder="" type="textarea" />
-            </u-form-item>
-            <u-form-item label="来料类别:">
-              <jPicker sureColor="#ff0000" :moren="moren5" @bindpicker="selectProductlocCode4" showKey="label" valKey="value" :val="selectmaterialType.value" :options="model.locList2" />
-            </u-form-item>
-            <u-form-item label="物料来源:">
-              <jPicker sureColor="#ff0000" :moren="moren6" @bindpicker="selectProductlocCode5" showKey="label" valKey="value" :val="selectmaterialFromList.value" :options="model.locList3" />
-            </u-form-item>
+            <div v-show="formdata.checkResult == 'N'">
+              <u-form-item label="是否发起oa:">
+                <u-radio-group v-model="formdata.startOA">
+                  <u-radio v-for="(n, indexn) in listselectoa" :key="indexn" :name="n.type" :disabled="n.disabled">
+                    {{ n.name }}
+                  </u-radio>
+                </u-radio-group>
+              </u-form-item>
+
+              <u-form-item label="不合格描述:">
+                <u-input style="background: #fafafa; border: 1px dashed #e2e2e2; padding: 10px 5px" v-model="formdata.remark" placeholder="" type="textarea" />
+              </u-form-item>
+              <u-form-item label="来料类别:">
+                <jPicker sureColor="#ff0000" :moren="moren5" @bindpicker="selectProductlocCode4" showKey="label" valKey="value" :val="selectmaterialType.value" :options="model.locList2" />
+              </u-form-item>
+              <u-form-item label="物料来源:">
+                <jPicker sureColor="#ff0000" :moren="moren6" @bindpicker="selectProductlocCode5" showKey="label" valKey="value" :val="selectmaterialFromList.value" :options="model.locList3" />
+              </u-form-item>
+            </div>
           </div>
 
           <!-- <u-form-item v-if="isshow1" label="不合格数量:">
@@ -545,6 +548,10 @@ export default class PurchaseWHSRM extends BasePage {
   radioChange(e) {
     console.log(e);
   }
+  // 判定选择
+  changeradio1(checkResult) {
+    console.log(checkResult);
+  }
   async selectProductlocCode(e: any) {
     this.selectList = e.pickerName;
     let query = {
@@ -706,14 +713,14 @@ 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;
-    }
+    // console.log(this.detaillistceshi, this.isvalue, this.isquality);
+    // if (this.isvalue) {
+    //   (this.$refs.uToast as any).show({
+    //     title: '检查标准不能为空',
+    //     type: 'default',
+    //   });
+    //   return;
+    // }
     // if (this.isvalue2) {
     //   (this.$refs.uToast as any).show({
     //     title: '请选择不良分类',
@@ -728,6 +735,7 @@ export default class PurchaseWHSRM extends BasePage {
     //   });
     //   return;
     // }
+
     if (this.formdata.sampleQuality === null || this.formdata.sampleQuality === '') {
       (this.$refs.uToast as any).show({
         title: '抽样数量不能为空',
@@ -745,19 +753,21 @@ export default class PurchaseWHSRM extends BasePage {
       }
     }
     if (this.selectList.value == 'checkTypeLL') {
-      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.checkResult == 'N') {
+        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;
+        }
       }
     }
 
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index 082f0f4..3d66e10 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -66,7 +66,7 @@ export default class RawHome extends BasePage {
   model = model;
   src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
   today = dayjs().format('YYYY-MM-DD dddd');
-  version = '0.0.52';
+  version = '0.0.53';
   checkversion: any = {};
   sessiondata: any = '';
   onLoad() {