From be06960065e4fabacaf6ee09f555f65775cdb6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=96?= <10034423+lihaoyuelijing@user.noreply.gitee.com> Date: Thu, 27 Jun 2024 16:16:19 +0800 Subject: [PATCH] =?UTF-8?q?0.0.73=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E9=94=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/equipment/Inspection/details.vue | 8 +++--- src/pages/equipment/Spotcheck/details.vue | 11 +------- src/pages/equipment/Spotcheck/index.vue | 1 - src/pages/equipment/Upkeep/repairing.vue | 3 --- src/pages/login/login/index.vue | 2 +- .../quality/Materialinspection/index.vue | 26 +++++++++++++------ 6 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/pages/equipment/Inspection/details.vue b/src/pages/equipment/Inspection/details.vue index 00fd44f..76c6669 100644 --- a/src/pages/equipment/Inspection/details.vue +++ b/src/pages/equipment/Inspection/details.vue @@ -462,10 +462,10 @@ export default class ChangePalletNew extends BasePage { type: 'default', }); setTimeout(() => { - // uni.navigateBack({}); - uni.redirectTo({ - url: `/pages/equipment/Inspection/index`, - }); + uni.navigateBack({}); + // uni.redirectTo({ + // url: `/pages/equipment/Inspection/index`, + // }); }, 1000); } else { (this.$refs.uToast as any).show({ diff --git a/src/pages/equipment/Spotcheck/details.vue b/src/pages/equipment/Spotcheck/details.vue index a43cf0f..ce6f948 100644 --- a/src/pages/equipment/Spotcheck/details.vue +++ b/src/pages/equipment/Spotcheck/details.vue @@ -362,12 +362,6 @@ 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({ @@ -404,10 +398,7 @@ export default class ChangePalletNew extends BasePage { }); setTimeout(() => { - // uni.navigateBack({}); - uni.redirectTo({ - url: `/pages/equipment/Spotcheck/index?listitem=`, - }); + uni.navigateBack({}); }, 1000); } else { (this.$refs.uToast as any).show({ diff --git a/src/pages/equipment/Spotcheck/index.vue b/src/pages/equipment/Spotcheck/index.vue index f8c75ad..b49e1ff 100644 --- a/src/pages/equipment/Spotcheck/index.vue +++ b/src/pages/equipment/Spotcheck/index.vue @@ -27,7 +27,6 @@
创建时间: {{ item.createTime }}
循环执行时间开始: {{ item.planLoopStart }}
-
工单号: {{ item.orderCode }}
diff --git a/src/pages/equipment/Upkeep/repairing.vue b/src/pages/equipment/Upkeep/repairing.vue index 6f4945f..8cabc8e 100644 --- a/src/pages/equipment/Upkeep/repairing.vue +++ b/src/pages/equipment/Upkeep/repairing.vue @@ -635,9 +635,6 @@ export default class ChangePalletNew extends BasePage { }); setTimeout(() => { - // uni.redirectTo({ - // url: `/pages/equipment/Upkeep/index?listitem=`, - // }); uni.navigateBack({}); }, 1000); } else { diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index beefeaf..cec1b76 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.72'; //正式版本号 + version = '0.0.73'; //正式版本号 //version = '0.0.3'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true; diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue index 9cbd520..84906e6 100644 --- a/src/pages/quality/Materialinspection/index.vue +++ b/src/pages/quality/Materialinspection/index.vue @@ -66,6 +66,12 @@ {{ item.checkLocName }} + + + 供应商单位: + {{ item.supplierName }} + + 处理 @@ -98,6 +104,9 @@
检验位置 : {{ clickitem.checkLocName }}
+
+
供应商单位 : {{ clickitem.supplierName }}
+