From 2b19b311e4d45d29abca23cb55d88961c7a1e811 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Fri, 17 May 2024 18:00:27 +0800
Subject: [PATCH] =?UTF-8?q?0.0.57=E5=A2=9E=E5=8A=A0=E5=B7=A1=E6=A3=80?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/equipment/Inspection/details.vue    | 64 +++++++++++++------
 src/pages/login/login/index.vue               |  2 +-
 .../quality/Materialinspection/index.vue      | 14 ++--
 3 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/src/pages/equipment/Inspection/details.vue b/src/pages/equipment/Inspection/details.vue
index ce6814f..9702f1c 100644
--- a/src/pages/equipment/Inspection/details.vue
+++ b/src/pages/equipment/Inspection/details.vue
@@ -24,13 +24,14 @@
       </div>
       <view class="single-left">
         <!-- <view>扫描设备码:</view> -->
-        <u-search style="border: 1px solid #a19d9d" :clearabled="false" :disabled="detailsinfolist.equipmentCode == null ? true : true" placeholder="请扫描" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
+        <u-search :clearabled="false" placeholder="请扫描" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
+        <uni-icons type="scan" size="25" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons>
         <!-- <view class="single-right">
           <u-button type="primary" @click="selscteq()">选择</u-button>
-        </view>-->
+        </view> -->
         <!-- <uni-icons type="scan" size="35" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons> -->
       </view>
-      <view class="item" v-for="(item, index) in detailsinfolist.detailList" :key="index">
+      <view class="item" v-show="isaccord" v-for="(item, index) in detailsinfolist.detailList" :key="index">
         <div class="item1">检查项: {{ item.itemName }}</div>
         <div class="item1">检查方法: {{ item.itemMethod }}</div>
         <div v-for="(item1, index1) in item.standardList" :key="index1">
@@ -100,6 +101,7 @@ import chooseOne from '@/components/choose-one/choose-one.vue';
 import jPicker from '@/components/J-Picker/jPicker.vue';
 import { session } from '@/store/modules/session';
 import model1 from '../../equipment/Repairbx/model';
+const mpaasScanModule: any = uni.requireNativePlugin('Mpaas-Scan-Module');
 //import store from '@/store';
 @Component({
   components: {
@@ -268,7 +270,7 @@ export default class ChangePalletNew extends BasePage {
       };
       await this.model.getInspectionOrderInfo(query);
       this.detailsinfolist = this.model.OrderInfList;
-      this.orderNo = this.detailsinfolist.equipmentCode;
+      // this.orderNo = this.detailsinfolist.equipmentCode;
     }
   }
   created() {
@@ -388,15 +390,36 @@ export default class ChangePalletNew extends BasePage {
     this.imgList.splice(index, 1);
   }
   scanCodeOne() {
-    uni.scanCode({
-      scanType: ['barCode'],
-      success: (res) => {
-        this.orderNo = res.result;
+    mpaasScanModule.mpaasScan(
+      {
+        // 扫码识别类型，参数可多选，qrCode、barCode，
+        // 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
+        scanType: ['qrCode', 'barCode'],
+        // 是否隐藏相册，默认false不隐藏
+        hideAlbum: false,
       },
-      fail(result) {
-        this.customToast(result);
+      (ret) => {
+        // uni.showModal({
+        //   title: '扫码结果',
+        //   // 返回值中，有三个参数 resp_code、resp_message、resp_result
+        //   // resp_code 表示返回结果值，10：用户取消，11：其他错误，1000：成功
+        //   // resp_message 表示返回结果信息
+        //   // resp_result 表示扫码结果，只有成功才会有返回
+        //   content: JSON.stringify(ret),
+        //   showCancel: false,
+        //   confirmText: '确定',
+        // });
+        if (ret.resp_message == 'success') {
+          this.orderNo = ret.resp_result;
+          this.search(this.orderNo);
+          // uni.navigateTo({
+          //   url: `/pages/quality/Materialinspection/web?listitem=` + encodeURIComponent(ret.resp_result),
+          // });
+        } else {
+          this.customToast(ret.resp_result);
+        }
       },
-    });
+    );
   }
   async onSubmit() {
     if (this.orderNo == '' || this.orderNo.length == 0) {
@@ -448,16 +471,15 @@ export default class ChangePalletNew extends BasePage {
     }
   }
   search(value) {
-    console.log(value);
-    // if (value == this.detailsinfolist.equipmentCode) {
-    //   this.isaccord = true;
-    // } else {
-    //   (this.$refs.uToast as any).show({
-    //     title: '失败请扫码正确条码',
-    //     type: 'default',
-    //   });
-    //   this.isaccord = false;
-    // }
+    if (value == this.detailsinfolist.equipmentCode) {
+      this.isaccord = true;
+    } else {
+      (this.$refs.uToast as any).show({
+        title: '失败请扫码正确条码',
+        type: 'default',
+      });
+      this.isaccord = false;
+    }
   }
 }
 </script>
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 48fe218..d94f110 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.56';
+  version = '0.0.57';
 
   compareVersion(version1: any, version2: any) {
     //如果version1 大 会返回1  &&&  如果version2 大 会返回 -1
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index b281688..5f75d04 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -104,7 +104,7 @@
           </div> -->
           <view class="item" v-for="(item, index) in detaillistceshi" :key="index">
             <div class="item1">项目名称: {{ item.ruleName }}</div>
-            <div style="font-weight: 600">检查标准: {{ item.checkStandard }}</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">
@@ -115,8 +115,8 @@
                 </u-radio-group>
               </div>
             </div>
-            <div class="item1 item2" v-if="item.propertyCode == '1'">
-              <div class="input-box" id="input-box1">
+            <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">
                 实际值:
                 <input class="input" v-model="item.actualValue" @focus="focus(item, item.actualValue, index)" type="text" name="" id="" />
                 单位:mm
@@ -1341,8 +1341,8 @@ export default class PurchaseWHSRM extends BasePage {
         font-weight: 600;
       }
       .item2 {
-        // display: flex;
-        // align-content: center;
+        display: flex;
+        align-items: center;
         // justify-content: space-between;
         .select {
           font-size: 15px;
@@ -1358,9 +1358,9 @@ export default class PurchaseWHSRM extends BasePage {
           margin-top: 2px;
           .input {
             font-size: 12px;
-            // width: 100%;
+            width: 56%;
             padding: 1px 8px;
-            // height: 20px;
+            height: 27px;
             box-sizing: border-box;
             border: 1px solid #b6b6b6;
             margin-left: 6px;