From 0aba07ca3e601cbad6946f9b9eea14ee5fbe6e90 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Mon, 8 Jan 2024 14:22:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E6=96=B0=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/equipment/Inspection/details.vue | 12 +++++------
 src/pages/equipment/Inspection/index.vue   | 16 +++++++--------
 src/pages/equipment/Repair/index.vue       |  5 ++++-
 src/pages/equipment/Repair/repairing.vue   | 12 +++++------
 src/pages/equipment/Spotcheck/details.vue  | 19 +++++++++++------
 src/pages/equipment/Spotcheck/index.vue    | 24 ++++++++++++++--------
 src/pages/equipment/Upkeep/index.vue       |  5 ++++-
 src/pages/equipment/Upkeep/repairing.vue   | 13 ++++++------
 8 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/src/pages/equipment/Inspection/details.vue b/src/pages/equipment/Inspection/details.vue
index 92a203a..20f0506 100644
--- a/src/pages/equipment/Inspection/details.vue
+++ b/src/pages/equipment/Inspection/details.vue
@@ -390,12 +390,12 @@ export default class ChangePalletNew extends BasePage {
         title: '成功',
         type: 'default',
       });
-      uni.navigateBack({});
-      // setTimeout(() => {
-      //   uni.redirectTo({
-      //     url: `/pages/equipment/Inspection/index?listitem=`,
-      //   });
-      // }, 1000);
+      setTimeout(() => {
+        uni.navigateBack({});
+        // uni.redirectTo({
+        //   url: `/pages/equipment/Inspection/index?listitem=`,
+        // });
+      }, 1000);
     } else {
       (this.$refs.uToast as any).show({
         title: '失败',
diff --git a/src/pages/equipment/Inspection/index.vue b/src/pages/equipment/Inspection/index.vue
index f53d5e1..f9b66e4 100644
--- a/src/pages/equipment/Inspection/index.vue
+++ b/src/pages/equipment/Inspection/index.vue
@@ -102,14 +102,7 @@ export default class ChangePalletNew extends BasePage {
   ];
   userinfo: any = null;
   // remove: any = {};
-  onShow() {
-    this.onLoad;
-  }
-  async onReady() {
-    //await this.model.getpalletLocation();
-    //this.remove = this.model.WlList[0];
-  }
-  async onLoad() {
+  async onShow() {
     console.log(uni.getStorageSync('userinfo'));
     this.userinfo = uni.getStorageSync('userinfo');
     if (this.userinfo) {
@@ -118,6 +111,13 @@ export default class ChangePalletNew extends BasePage {
       this.listdata = model.orderNoItemList;
     }
   }
+  async onReady() {
+    //await this.model.getpalletLocation();
+    //this.remove = this.model.WlList[0];
+  }
+  async onLoad() {
+    // console.log(uni.getStorageSync('userinfo'));
+  }
   // selectItem(e: any) {
   //   this.remove = e.pickerName;
   // }
diff --git a/src/pages/equipment/Repair/index.vue b/src/pages/equipment/Repair/index.vue
index af883aa..45f04a4 100644
--- a/src/pages/equipment/Repair/index.vue
+++ b/src/pages/equipment/Repair/index.vue
@@ -109,7 +109,7 @@ export default class ChangePalletNew extends BasePage {
     //await this.model.getpalletLocation();
     //this.remove = this.model.WlList[0];
   }
-  async onLoad() {
+  async onShow() {
     console.log(uni.getStorageSync('userinfo'));
     this.userinfo = uni.getStorageSync('userinfo');
     if (this.userinfo) {
@@ -123,6 +123,9 @@ export default class ChangePalletNew extends BasePage {
       this.listdata = model.orderNoItemList;
     }
   }
+  async onLoad() {
+    // console.log(uni.getStorageSync('userinfo'));
+  }
   // selectItem(e: any) {
   //   this.remove = e.pickerName;
   // }
diff --git a/src/pages/equipment/Repair/repairing.vue b/src/pages/equipment/Repair/repairing.vue
index 48f6592..bbaa1ea 100644
--- a/src/pages/equipment/Repair/repairing.vue
+++ b/src/pages/equipment/Repair/repairing.vue
@@ -680,12 +680,12 @@ export default class ChangePalletNew extends BasePage {
         type: 'default',
       });
       this.Clear(); //清除数据
-      uni.navigateBack({});
-      // setTimeout(() => {
-      //   uni.redirectTo({
-      //     url: `/pages/equipment/Repair/index?listitem=`,
-      //   });
-      // }, 1000);
+      setTimeout(() => {
+        uni.navigateBack({});
+        // uni.redirectTo({
+        //   url: `/pages/equipment/Repair/index?listitem=`,
+        // });
+      }, 1000);
     } else {
       (this.$refs.uToast as any).show({
         title: '失败',
diff --git a/src/pages/equipment/Spotcheck/details.vue b/src/pages/equipment/Spotcheck/details.vue
index 0587d87..1761d98 100644
--- a/src/pages/equipment/Spotcheck/details.vue
+++ b/src/pages/equipment/Spotcheck/details.vue
@@ -362,6 +362,12 @@ export default class ChangePalletNew extends BasePage {
     });
   }
   async onSubmit() {
+    // setTimeout(() => {
+    //     uni.navigateBack({});
+    //     // uni.redirectTo({
+    //     //   url: `/pages/equipment/Spotcheck/index?listitem=`,
+    //     // });
+    //   }, 1000);
     if (this.orderNo == '' || this.orderNo.length == 0) {
       // this.customToast('请扫码设备编码');
       (this.$refs.uToast as any).show({
@@ -396,12 +402,13 @@ export default class ChangePalletNew extends BasePage {
         title: '成功',
         type: 'default',
       });
-      uni.navigateBack({});
-      // setTimeout(() => {
-      //   uni.redirectTo({
-      //     url: `/pages/equipment/Spotcheck/index?listitem=`,
-      //   });
-      // }, 1000);
+
+      setTimeout(() => {
+        uni.navigateBack({});
+        // uni.redirectTo({
+        //   url: `/pages/equipment/Spotcheck/index?listitem=`,
+        // });
+      }, 1000);
     } else {
       (this.$refs.uToast as any).show({
         title: '失败',
diff --git a/src/pages/equipment/Spotcheck/index.vue b/src/pages/equipment/Spotcheck/index.vue
index d247a15..2ea8ded 100644
--- a/src/pages/equipment/Spotcheck/index.vue
+++ b/src/pages/equipment/Spotcheck/index.vue
@@ -106,15 +106,9 @@ export default class ChangePalletNew extends BasePage {
   ];
   userinfo: any = null;
   // remove: any = {};
-  onShow() {
+  async onShow() {
     this.onLoad;
-  }
-  async onReady() {
-    //await this.model.getpalletLocation();
-    //this.remove = this.model.WlList[0];
-  }
-  async onLoad() {
-    console.log(uni.getStorageSync('userinfo'));
+    console.log('1111');
     this.userinfo = uni.getStorageSync('userinfo');
     if (this.userinfo) {
       await this.model.getTodayTask(this.userinfo.userName);
@@ -122,6 +116,20 @@ export default class ChangePalletNew extends BasePage {
       this.listdata = model.orderNoItemList;
     }
   }
+  async onReady() {
+    //await this.model.getpalletLocation();
+    //this.remove = this.model.WlList[0];
+  }
+  async onLoad() {
+    // console.log('1222')
+    // console.log(uni.getStorageSync('userinfo'));
+    // this.userinfo = uni.getStorageSync('userinfo');
+    // if (this.userinfo) {
+    //   await this.model.getTodayTask(this.userinfo.userName);
+    //   console.log(model.orderNoItemList);
+    //   this.listdata = model.orderNoItemList;
+    // }
+  }
   // selectItem(e: any) {
   //   this.remove = e.pickerName;
   // }
diff --git a/src/pages/equipment/Upkeep/index.vue b/src/pages/equipment/Upkeep/index.vue
index 1bffc8d..4ed2c32 100644
--- a/src/pages/equipment/Upkeep/index.vue
+++ b/src/pages/equipment/Upkeep/index.vue
@@ -127,7 +127,7 @@ export default class ChangePalletNew extends BasePage {
     //await this.model.getpalletLocation();
     //this.remove = this.model.WlList[0];
   }
-  async onLoad() {
+  async onShow() {
     console.log(uni.getStorageSync('userinfo'));
     this.userinfo = uni.getStorageSync('userinfo');
     if (this.userinfo) {
@@ -141,6 +141,9 @@ export default class ChangePalletNew extends BasePage {
       this.listdata = model.orderNoItemList;
     }
   }
+  async onLoad() {
+    // console.log(uni.getStorageSync('userinfo'));
+  }
   // selectItem(e: any) {
   //   this.remove = e.pickerName;
   // }
diff --git a/src/pages/equipment/Upkeep/repairing.vue b/src/pages/equipment/Upkeep/repairing.vue
index 4af9ba9..6f4945f 100644
--- a/src/pages/equipment/Upkeep/repairing.vue
+++ b/src/pages/equipment/Upkeep/repairing.vue
@@ -633,12 +633,13 @@ export default class ChangePalletNew extends BasePage {
         title: '成功',
         type: 'default',
       });
-      uni.navigateBack({});
-      // setTimeout(() => {
-      //   uni.redirectTo({
-      //     url: `/pages/equipment/Upkeep/index?listitem=`,
-      //   });
-      // }, 1000);
+
+      setTimeout(() => {
+        // uni.redirectTo({
+        //   url: `/pages/equipment/Upkeep/index?listitem=`,
+        // });
+        uni.navigateBack({});
+      }, 1000);
     } else {
       (this.$refs.uToast as any).show({
         title: '失败',