From 7b4db76ca25423bf78a2135b37a4198bb85137cc Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Fri, 26 Jul 2024 14:04:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E9=AA=8C=E4=BF=AE?=
 =?UTF-8?q?=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      | 39 ++++++++++++++-----
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index abd71fd..cb7edd2 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.84'; //正式版本号
+  version = '0.0.85'; //正式版本号
   //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 ed7cc3f..35969dd 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -110,6 +110,9 @@
             <div class="details">
               <div>供应商单位 : {{ clickitem.supplierName }}</div>
             </div>
+            <div v-if="selectList.value === 'checkTypeCP'" class="details">
+              <div style="display: flex; flex-direction: row"><view style="line-height: 70rpx">样本数量: </view><u-input border v-model="sampleQuality"></u-input></div>
+            </div>
           </div>
           <!-- <div style="text-align: center">
             <u-button style="width: 100%; height: 35px; margin: auto" @click="onOk" size="mini" type="primary">同步信息</u-button>
@@ -117,16 +120,20 @@
           <view class="item" v-for="(item, index) in detaillistceshi" :key="index">
             <div class="item1">项目名称: {{ item.ruleName }}</div>
             <div style="font-weight: 600; margin-bottom: 3px">检查标准: {{ item.checkStandard }}</div>
-            <div class="item1 item2 item3" v-if="item.propertyCode == '0'">
-              <div class="item1">检查结果: {{ item.itemMethod }}</div>
-              <div class="select">
-                <u-radio-group v-model="item.status" @change="radioGroupChange(item, item.status, index)">
-                  <u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type" :disabled="n.disabled">
-                    {{ n.name }}
-                  </u-radio>
-                </u-radio-group>
+            <div v-if="item.propertyCode == '0'">
+              <div class="item1 item2 item3">
+                <div class="item1">检查结果: {{ item.itemMethod }}</div>
+                <div class="select">
+                  <u-radio-group v-model="item.status" @change="radioGroupChange(item, item.status, index)">
+                    <u-radio @change="radioChange" v-for="(n, indexn) in listselect" :key="indexn" :name="n.type" :disabled="n.disabled">
+                      {{ n.name }}
+                    </u-radio>
+                  </u-radio-group>
+                </div>
               </div>
+              <div><view>实际值：</view><u-input border v-model="item.actualValue"></u-input></div>
             </div>
+
             <div class="item1 item2" style="width: 100%" v-if="item.propertyCode == '1'">
               <div class="input-box" id="input-box1" style="display: flex; align-items: center">
                 实际值:
@@ -517,6 +524,7 @@ export default class PurchaseWHSRM extends BasePage {
   deptlist: any = [];
   supplierlist: any = [];
   abnormallist: any = [];
+  sampleQuality = null; //成品检验样本数量
   // 引入原生插件
   // 调用插件的 mpaasScan 方法
 
@@ -918,6 +926,7 @@ export default class PurchaseWHSRM extends BasePage {
   nopoup() {
     this.show = false;
     this.form3.barCodewl = '';
+    this.sampleQuality = null;
   }
   async getlist() {
     let query = {
@@ -1115,7 +1124,13 @@ export default class PurchaseWHSRM extends BasePage {
         }
       }
     }
-
+    if (this.selectList.value == 'checkTypeCP' && !this.sampleQuality) {
+      (this.$refs.uToast as any).show({
+        title: '请输入样本数量',
+        type: 'default',
+      });
+      return;
+    }
     // if (this.isquality) {
     //   (this.$refs.uToast as any).show({
     //     title: '数量不能为空',
@@ -1157,6 +1172,9 @@ export default class PurchaseWHSRM extends BasePage {
       } else {
         item.files = [];
       }
+      if (this.selectList.value === 'checkTypeCP') {
+        item.sampleQuality = this.sampleQuality;
+      }
     });
     let query = {};
     if (this.selectList.value == 'checkTypeSC' || this.selectList.value == 'checkTypeSCXJ') {
@@ -1347,6 +1365,7 @@ export default class PurchaseWHSRM extends BasePage {
   }
   clear() {
     this.formdata.sampleQuality = null;
+    this.sampleQuality = null;
   }
   confirm() {
     if (this.tagslist.length <= 0) {
@@ -1529,6 +1548,7 @@ export default class PurchaseWHSRM extends BasePage {
         success: (res) => {
           if (res.confirm) {
             this.show = false;
+            this.sampleQuality = null;
           } else if (res.cancel) {
             console.log('不关闭');
           }
@@ -1545,6 +1565,7 @@ export default class PurchaseWHSRM extends BasePage {
           success: (res) => {
             if (res.confirm) {
               this.show = false;
+              this.sampleQuality = null;
             } else if (res.cancel) {
               console.log('不关闭');
             }