From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新
---
h5/pages/operation/device.vue | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/h5/pages/operation/device.vue b/h5/pages/operation/device.vue
index b9a4c5f..9ec4389 100644
--- a/h5/pages/operation/device.vue
+++ b/h5/pages/operation/device.vue
@@ -83,7 +83,8 @@
import {
uploadUrl,
ywDevicePost,
- ywDeviceCreate
+ ywDeviceCreate,
+ getFindByCode
} from '@/api'
import dayjs from 'dayjs';
import {
@@ -118,19 +119,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 +132,27 @@
dealDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
multifileList: fileList
}).then(res => {
- this.showToast('鎻愪氦鎴愬姛')
- uni.navigateBack()
+ if (res && res.code == 200) {
+ 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() {
@@ -281,8 +289,18 @@
},
(decodeText, decodeResult) => {
if (decodeText) { //杩欓噷decodeText灏辨槸閫氳繃鎵弿浜岀淮鐮佸緱鍒扮殑鍐呭
- this.$set(this.param, 'deviceCode', decodeText)
this.stopScan(); //鍏抽棴鎵爜鍔熻兘
+ getFindByCode(decodeText).then(ress => {
+ if (ress.data) {
+ console.log('ress', ress.data);
+ this.$set(this.param, 'deviceCode', ress.data.code)
+ this.$set(this.param, 'deviceId', ress.data.id)
+ this.$set(this.param, 'deviceName', ress.data.name)
+ } else {
+ this.showToast('鏈尮閰嶅埌宸℃鐐�,璇烽噸鏂版壂鎻�')
+ }
+ })
+
}
},
(err) => {
--
Gitblit v1.9.3