From d9e0d551d871d61a94a11c02d6d0fd585edf4bf0 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Tue, 7 May 2024 10:56:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B70.0.51=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/equipment/Inspection/details.vue | 51 +++++++++++-----------
 src/pages/shouye/me.vue                    |  2 +-
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/pages/equipment/Inspection/details.vue b/src/pages/equipment/Inspection/details.vue
index 509d82d..ce6814f 100644
--- a/src/pages/equipment/Inspection/details.vue
+++ b/src/pages/equipment/Inspection/details.vue
@@ -24,13 +24,13 @@
       </div>
       <view class="single-left">
         <!-- <view>扫描设备码:</view> -->
-        <u-search style="border: 1px solid #a19d9d" placeholder="请扫描" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
-        <view class="single-right">
+        <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>
+        <!-- <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-show="isaccord" v-for="(item, index) in detailsinfolist.detailList" :key="index">
+      <view class="item" 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">
@@ -172,18 +172,18 @@ export default class ChangePalletNew extends BasePage {
     if (this.model1.rowdata.length == 0) {
       this.model1.rowdatanull();
     } else {
-      this.orderNo = '';
-      console.log(this.model1.rowdata, '7272727');
-      if (this.model1.rowdata[0].equipmentCode == this.detailsinfolist.equipmentCode) {
-        this.orderNo = this.model1.rowdata[0].equipmentCode;
-        this.isaccord = true;
-      } else {
-        (this.$refs.uToast as any).show({
-          title: '失败请选择正确设备',
-          type: 'default',
-        });
-        this.isaccord = false;
-      }
+      // this.orderNo = this.detailsinfolist.equipmentCode;
+      // console.log(this.model1.rowdata, '7272727');
+      // if (this.model1.rowdata[0].equipmentCode == this.detailsinfolist.equipmentCode) {
+      //   this.orderNo = this.model1.rowdata[0].equipmentCode;
+      //   this.isaccord = true;
+      // } else {
+      //   (this.$refs.uToast as any).show({
+      //     title: '失败请选择正确设备',
+      //     type: 'default',
+      //   });
+      //   this.isaccord = false;
+      // }
     }
   }
   // 输入框焦点
@@ -268,6 +268,7 @@ export default class ChangePalletNew extends BasePage {
       };
       await this.model.getInspectionOrderInfo(query);
       this.detailsinfolist = this.model.OrderInfList;
+      this.orderNo = this.detailsinfolist.equipmentCode;
     }
   }
   created() {
@@ -448,15 +449,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/shouye/me.vue b/src/pages/shouye/me.vue
index 8dc03ad..38062c6 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.50';
+  version = '0.0.51';
   checkversion: any = {};
   sessiondata: any = '';
   onLoad() {