From 5a7587ab79e03983ae88866b2b3ea370e9beb7f1 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 24 Jul 2024 10:12:46 +0800
Subject: [PATCH] =?UTF-8?q?mes=E8=B4=A8=E9=87=8F=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C&=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/J-Picker/jPicker.vue           |  3 ++-
 src/pages/login/login/index.vue               |  2 +-
 .../quality/Materialinspection/index.vue      | 22 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/components/J-Picker/jPicker.vue b/src/components/J-Picker/jPicker.vue
index e05a6d9..fe3f1b7 100644
--- a/src/components/J-Picker/jPicker.vue
+++ b/src/components/J-Picker/jPicker.vue
@@ -37,7 +37,7 @@
                 <span v-if="duoyukey"><span>&nbsp;&nbsp;&nbsp;&nbsp;</span>采购单:{{ item[duoyukey] }}</span>
               </view>
 
-              <view>{{ item[showKey] || item }}</view>
+              <view style="white-space: pre-wrap; line-height: 16px">{{ item[showKey] || item }}</view>
             </view>
           </picker-view-column>
         </picker-view>
@@ -234,6 +234,7 @@ export default {
     // border-left:1px solid #000000;
     width: 100%;
     display: inline-block;
+    white-space: normal;
   }
 }
 
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 7132770..d552dc0 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.82'; //正式版本号
+  version = '0.0.83'; //正式版本号
   //version = '0.0.4'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 8a68348..ed7cc3f 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -864,6 +864,12 @@ export default class PurchaseWHSRM extends BasePage {
   async selectischeck(e: any) {
     this.selectischeckType = e.pickerName;
     this.formdata.sfxvzq = this.selectischeckType.value;
+    if (this.formdata.sfxvzq == '1') {
+      this.selectpgzgList = {};
+      this.selectZLType = {};
+      this.formdata.pgzg = null;
+      this.formdata.pgzr = null;
+    }
   }
   async selectpgzgCode(e: any) {
     this.selectpgzgList = e.pickerName;
@@ -1093,6 +1099,20 @@ export default class PurchaseWHSRM extends BasePage {
           });
           return;
         }
+        if (this.selectischeckType.value == '0' && !this.formdata.pgzg) {
+          (this.$refs.uToast as any).show({
+            title: '请选择QC主管',
+            type: 'default',
+          });
+          return;
+        }
+        if (this.selectischeckType.value === '0' && !this.formdata.pgzr) {
+          (this.$refs.uToast as any).show({
+            title: '请选择质量主管',
+            type: 'default',
+          });
+          return;
+        }
       }
     }
 
@@ -1308,7 +1328,7 @@ export default class PurchaseWHSRM extends BasePage {
         // sqr: this.model.sqrlist[0].userId,
       };
     }
-    console.log(query, this.formdata);
+    //console.log('9999ggggg',query);
     await this.model.commitCheckTaskList(query);
     if (this.model.SubmitCode.code == '200') {
       (this.$refs.uToast as any).show({