From 16b692b3ea44779cd15f730b5376ef12b39a9e13 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 17 四月 2024 15:06:44 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs
---
pages/phyz/stationManage/stationDetl.vue | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 3321b55..7cf1817 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -87,7 +87,7 @@
</view>
<view class="btn">
<view class="btn-left" @click="containerMoveOutClose">鍙栨秷</view>
- <view class="btn-right" @click="containerMoveOut()">鍏ュ簱</view>
+ <view class="btn-right" @click="containerMoveOut()">纭鍑哄簱</view>
</view>
</view>
</uni-popup>
@@ -105,7 +105,7 @@
</view>
<view class="btn">
<view class="btn-left" @click="containerMoveOutClose">鍙栨秷</view>
- <view class="btn-right" @click="containerMoveOut()">鍏ュ簱</view>
+ <view class="btn-right" @click="containerMoveOut2()">纭绂诲満</view>
</view>
</view>
</uni-popup>
@@ -249,7 +249,7 @@
uni.showToast({ title: '鏇存柊鎴愬姛锛�', icon: "none", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -274,7 +274,7 @@
_this.reloadStation()
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -313,7 +313,7 @@
uni.showToast({ title: '鍚姩鍏ュ簱', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -347,7 +347,7 @@
uni.showToast({ title: '鍛煎彨鎴愬姛', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -367,7 +367,7 @@
_this.selects = res.data
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -429,7 +429,7 @@
}
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -454,7 +454,7 @@
_this.wrkDetls = res.data.records
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -480,7 +480,7 @@
_this.btnType = 'start'
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -512,7 +512,7 @@
uni.showToast({ title: '纭瀹屾垚', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -527,7 +527,7 @@
containerMoveOutClose() {
this.$refs.doContainerMoveOut2.close()
},
- containerMoveOut() {
+ containerMoveOut2() {
let _this = this
let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
uni.request({
@@ -537,7 +537,7 @@
success(res) {
res = res.data
if (res.code === 200) {
- _this.$refs.doContainerMoveOut.close()
+ _this.$refs.doContainerMoveOut2.close()
setTimeout(()=> {
_this.barcode = ''
_this.reloadStation()
@@ -545,7 +545,7 @@
uni.showToast({ title: '绂诲満瀹屾垚', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -573,7 +573,7 @@
_this.reloadStation()
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -601,7 +601,7 @@
uni.showToast({ title: '鍚姩鍏ュ簱', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
--
Gitblit v1.9.1