From 91837086d3d51ed906fa2a26c1a90b69b659a094 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Mon, 29 Apr 2024 16:18:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A1=E6=A3=80=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/equipment/Inspection/details.vue | 48 +++++++++++++++++++---
 src/pages/equipment/Inspection/index.vue   | 15 ++++++-
 src/pages/equipment/Spotcheck/details.vue  |  8 ++--
 3 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/src/pages/equipment/Inspection/details.vue b/src/pages/equipment/Inspection/details.vue
index 20f0506..949608d 100644
--- a/src/pages/equipment/Inspection/details.vue
+++ b/src/pages/equipment/Inspection/details.vue
@@ -3,7 +3,7 @@
   <view class="page-product-receipt">
     <view class="header" :style="{ backgroundColor: `rgba(250, 53, 52, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
+        <u-icon class="icon" name="arrow-left" @click="Back()" />
       </view>
       <view class="title">巡检详情</view>
       <view class="right"></view>
@@ -25,6 +25,9 @@
       <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-button type="primary" @click="selscteq()">选择</u-button>
+        </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">
@@ -60,7 +63,7 @@
         </u-col>
         <!-- 返回 -->
         <u-col :span="6">
-          <u-button type="error" @click="uni.navigateBack({})">返回</u-button>
+          <u-button type="error" @click="Back()">返回</u-button>
         </u-col>
       </u-row>
     </view>
@@ -96,6 +99,7 @@ import model from './model';
 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';
 //import store from '@/store';
 @Component({
   components: {
@@ -105,6 +109,7 @@ import { session } from '@/store/modules/session';
 })
 export default class ChangePalletNew extends BasePage {
   model = model;
+  model1 = model1;
   list: any = [
     {
       cate_name: '今日任务',
@@ -160,6 +165,26 @@ export default class ChangePalletNew extends BasePage {
   async onReady() {
     //await this.model.getpalletLocation();
     //this.remove = this.model.WlList[0];
+    console.log(this.model1.rowdata, '727sssss2727');
+  }
+  // 选择设备
+  onShow() {
+    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;
+      }
+    }
   }
   // 输入框焦点
   blur(item, value, index, index1) {
@@ -189,6 +214,11 @@ export default class ChangePalletNew extends BasePage {
   changeinput(e) {
     console.log(e);
   }
+  Back() {
+    uni.redirectTo({
+      url: `/pages/equipment/Inspection/index`,
+    });
+  }
   input(e) {
     console.log(e);
   }
@@ -196,6 +226,12 @@ export default class ChangePalletNew extends BasePage {
   radioChange(e) {
     console.log(e, '11111');
   }
+  //选择
+  selscteq() {
+    uni.navigateTo({
+      url: `/pages/equipment/equipmentlist?listitem=`,
+    });
+  }
   // 选中任一radio时，由radio-group触发
   radioGroupChange(item, value, index, index1) {
     console.log(item, value, index, index1);
@@ -391,10 +427,10 @@ export default class ChangePalletNew extends BasePage {
         type: 'default',
       });
       setTimeout(() => {
-        uni.navigateBack({});
-        // uni.redirectTo({
-        //   url: `/pages/equipment/Inspection/index?listitem=`,
-        // });
+        // uni.navigateBack({});
+        uni.redirectTo({
+          url: `/pages/equipment/Inspection/index`,
+        });
       }, 1000);
     } else {
       (this.$refs.uToast as any).show({
diff --git a/src/pages/equipment/Inspection/index.vue b/src/pages/equipment/Inspection/index.vue
index fb28122..88b794e 100644
--- a/src/pages/equipment/Inspection/index.vue
+++ b/src/pages/equipment/Inspection/index.vue
@@ -3,7 +3,7 @@
   <view class="page-product-receipt">
     <view class="header" :style="{ backgroundColor: `rgba(250, 53, 52, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
+        <u-icon class="icon" name="arrow-left" @click="goback()" />
       </view>
       <view class="title">巡检</view>
       <view class="right"></view>
@@ -44,6 +44,7 @@ import { BasePage } from '@/components/base/page';
 import model from './model';
 import chooseOne from '@/components/choose-one/choose-one.vue';
 import jPicker from '@/components/J-Picker/jPicker.vue';
+import model1 from '../../equipment/Repairbx/model';
 // import { session } from '@/store/modules/session';
 //import store from '@/store';
 @Component({
@@ -54,6 +55,7 @@ import jPicker from '@/components/J-Picker/jPicker.vue';
 })
 export default class ChangePalletNew extends BasePage {
   model = model;
+  model1 = model1;
   list: any = [
     {
       cate_name: '今日任务',
@@ -139,12 +141,23 @@ export default class ChangePalletNew extends BasePage {
       }
     }
   }
+  goback() {
+    uni.navigateTo({
+      url: `/pages/equipment/index`,
+    });
+  }
   linkdetails(item) {
+    if (this.model1.rowdata) {
+      this.model1.rowdatanull();
+    }
     uni.navigateTo({
       url: `/pages/equipment/Inspection/details?listitem=` + encodeURIComponent(JSON.stringify(item)),
     });
   }
   linkdetailscheck(item) {
+    if (this.model1.rowdata) {
+      this.model1.rowdatanull();
+    }
     this.ischecked = true;
     item.ischecked = true;
     uni.navigateTo({
diff --git a/src/pages/equipment/Spotcheck/details.vue b/src/pages/equipment/Spotcheck/details.vue
index 1761d98..c040bf8 100644
--- a/src/pages/equipment/Spotcheck/details.vue
+++ b/src/pages/equipment/Spotcheck/details.vue
@@ -404,10 +404,10 @@ export default class ChangePalletNew extends BasePage {
       });
 
       setTimeout(() => {
-        uni.navigateBack({});
-        // uni.redirectTo({
-        //   url: `/pages/equipment/Spotcheck/index?listitem=`,
-        // });
+        // uni.navigateBack({});
+        uni.redirectTo({
+          url: `/pages/equipment/Spotcheck/index?listitem=`,
+        });
       }, 1000);
     } else {
       (this.$refs.uToast as any).show({