From f47b9f188806cd5f75a85373c5b0252e93a6e010 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Fri, 31 May 2024 17:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9C=AC=E5=8F=B70.?=
 =?UTF-8?q?0.65=E5=8F=91=E7=89=88=E5=B7=A1=E6=A3=80=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=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    |  6 ++-
 src/pages/equipment/Inspection/index.vue      | 38 +++++++++++++++++--
 src/pages/equipment/Spotcheck/details.vue     |  1 -
 src/pages/login/login/index.vue               |  2 +-
 .../quality/Materialinspection/index.vue      |  6 +--
 5 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/pages/equipment/Inspection/details.vue b/src/pages/equipment/Inspection/details.vue
index 9702f1c..00fd44f 100644
--- a/src/pages/equipment/Inspection/details.vue
+++ b/src/pages/equipment/Inspection/details.vue
@@ -263,6 +263,7 @@ export default class ChangePalletNew extends BasePage {
   }
   async onLoad(options) {
     let str = decodeURIComponent(options.listitem);
+    let orderNo = decodeURIComponent(options.equipmentCode);
     if (str) {
       this.detailsinfo = JSON.parse(str);
       let query = {
@@ -270,7 +271,10 @@ export default class ChangePalletNew extends BasePage {
       };
       await this.model.getInspectionOrderInfo(query);
       this.detailsinfolist = this.model.OrderInfList;
-      // this.orderNo = this.detailsinfolist.equipmentCode;
+      if (orderNo != 'null') {
+        this.orderNo = orderNo;
+        this.search(this.orderNo);
+      }
     }
   }
   created() {
diff --git a/src/pages/equipment/Inspection/index.vue b/src/pages/equipment/Inspection/index.vue
index 88b794e..11c1364 100644
--- a/src/pages/equipment/Inspection/index.vue
+++ b/src/pages/equipment/Inspection/index.vue
@@ -9,6 +9,11 @@
       <view class="right"></view>
     </view>
     <u-tabs name="cate_name" count="cate_count" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+    <view class="single-left" style="background-color: #ffffff; margin-top: 10px">
+      <!-- <view>扫描设备码:</view> -->
+      <u-search style="border: 1px solid #a19d9d" placeholder="请扫描" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
+      <!-- <uni-icons type="scan" size="35" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons> -->
+    </view>
     <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index" @click="linkdetails(item)">
       <div class="list-top">
         <div class="name">工单号: {{ item.orderCode }}</div>
@@ -36,6 +41,7 @@
       <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
       <div class="item1">循环执行时间结束: {{ item.planLoopEnd }}</div>
     </view>
+    <u-toast ref="uToast" />
   </view>
 </template>
 <script lang="ts">
@@ -120,6 +126,30 @@ export default class ChangePalletNew extends BasePage {
   async onLoad() {
     // console.log(uni.getStorageSync('userinfo'));
   }
+  search(value) {
+    console.log(value);
+    let data = [];
+    if (this.current == 0) {
+      data = this.listdata.filter((v) => v.equipmentCode == value);
+    } else {
+      data = this.detailsdata.filter((v) => v.equipmentCode == value);
+    }
+    console.log(data);
+    if (data.length == 0) {
+      (this.$refs.uToast as any).show({
+        title: '当前设备无点检任务',
+        type: 'default',
+      });
+      return;
+    } else {
+      data[0].orderNoinput = value;
+      if (this.current == 0) {
+        this.linkdetails(data[0], value);
+      } else {
+        this.linkdetailscheck(data[0], value);
+      }
+    }
+  }
   // selectItem(e: any) {
   //   this.remove = e.pickerName;
   // }
@@ -146,22 +176,22 @@ export default class ChangePalletNew extends BasePage {
       url: `/pages/equipment/index`,
     });
   }
-  linkdetails(item) {
+  linkdetails(item, value) {
     if (this.model1.rowdata) {
       this.model1.rowdatanull();
     }
     uni.navigateTo({
-      url: `/pages/equipment/Inspection/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      url: `/pages/equipment/Inspection/details?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value,
     });
   }
-  linkdetailscheck(item) {
+  linkdetailscheck(item, value) {
     if (this.model1.rowdata) {
       this.model1.rowdatanull();
     }
     this.ischecked = true;
     item.ischecked = true;
     uni.navigateTo({
-      url: `/pages/equipment/Inspection/detailsview?listitem=` + encodeURIComponent(JSON.stringify(item)),
+      url: `/pages/equipment/Inspection/detailsview?listitem=` + encodeURIComponent(JSON.stringify(item)) + '&equipmentCode=' + value,
     });
   }
 }
diff --git a/src/pages/equipment/Spotcheck/details.vue b/src/pages/equipment/Spotcheck/details.vue
index c040bf8..a43cf0f 100644
--- a/src/pages/equipment/Spotcheck/details.vue
+++ b/src/pages/equipment/Spotcheck/details.vue
@@ -417,7 +417,6 @@ export default class ChangePalletNew extends BasePage {
     }
   }
   search(value) {
-    console.log(value);
     if (value == this.detailsinfolist.equipmentCode) {
       this.isaccord = true;
     } else {
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index b8369fa..a647442 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.64'; //正式版本号
+  version = '0.0.65'; //正式版本号
   //version = '0.0.2';//测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index afc93f3..9c990a4 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -31,7 +31,7 @@
               <view class="boder-icon-top zhuangtai" data-state="0">{{ item.checkStatus == 0 ? '待检验' : '检验完成' }}</view>
             </view>
             <view class="row-list">
-              <view class="list-item"> 来料批次号: </view>
+              <view class="list-item">批次号: </view>
               <view> {{ item.incomeBatchNo }} </view>
             </view>
             <view class="row-list">
@@ -56,7 +56,7 @@
             </view>
             <view class="row-list">
               <view class="row-list-item">
-                <view class="list-item"> 收货数量: </view>
+                <view class="list-item"> 数量: </view>
                 <view> {{ item.quality }} </view>
               </view>
             </view>
@@ -92,7 +92,7 @@
               <div>物料名称 : {{ clickitem.materialName }}</div>
             </div>
             <div class="details">
-              <div>收货数量 : {{ clickitem.quality }}</div>
+              <div>数量 : {{ clickitem.quality }}</div>
               <div style="margin-left: 30px">检验状态 : {{ clickitem.checkStatus == 0 ? '待检验' : '检验完成' }}</div>
             </div>
             <div class="details">