From 26b93e84d4153039ef3600355308d2a743dc3be7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 23 十二月 2024 09:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/operation/device.vue | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/h5/pages/operation/device.vue b/h5/pages/operation/device.vue
index b9a4c5f..9377ebb 100644
--- a/h5/pages/operation/device.vue
+++ b/h5/pages/operation/device.vue
@@ -118,19 +118,7 @@
} = this
if (!param.deviceId) return this.showToast('璇峰厛閫夋嫨瑕佺淮鎶ょ殑璁惧')
- if (param.status != 0) {
- uni.showModal({
- title: '娓╅Θ鎻愮ず',
- content: '璁惧杩愮淮缁撴灉寮傚父锛屾槸鍚﹀墠寰�鎻愪氦宸ュ崟?',
- success: function(res) {
- if (res.confirm) {
- this.handleP()
- } else if (res.cancel) {}
- }
- });
- }else{
- this.handleP()
- }
+ this.handleP()
},
handleP() {
const {
@@ -143,8 +131,24 @@
dealDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
multifileList: fileList
}).then(res => {
- this.showToast('鎻愪氦鎴愬姛')
- uni.navigateBack()
+ if (param.status != 0) {
+ uni.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: '璁惧杩愮淮缁撴灉寮傚父锛屾槸鍚﹀墠寰�鎻愪氦宸ュ崟?',
+ success: function(res) {
+ if (res.confirm) {
+ uni.redirectTo({
+ url: '/pages/workOrder/edit'
+ })
+ } else if (res.cancel) {
+ uni.navigateBack()
+ }
+ }
+ });
+ }else{
+ this.showToast('鎻愪氦鎴愬姛')
+ uni.navigateBack()
+ }
})
},
getDevice() {
--
Gitblit v1.9.3