From 1f235029c8f5472e8e9c2a87a277b5e85b24dc37 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 11:27:20 +0800
Subject: [PATCH] #
---
pages/phyz/bcp/bcpDbList.vue | 8 +++
pages/phyz/checkLocDetl/locMove.vue | 56 +++++++++++++++-------------
2 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/pages/phyz/bcp/bcpDbList.vue b/pages/phyz/bcp/bcpDbList.vue
index 5a4c2be..c7a9169 100644
--- a/pages/phyz/bcp/bcpDbList.vue
+++ b/pages/phyz/bcp/bcpDbList.vue
@@ -279,6 +279,7 @@
let param = {floor: this.floor,dbList: this.dbList,moveType: this.moveType}
uni.request({
url: `${_this.baseUrl}/agvMobile/agv/v1/locMove`,
+ header: {'token': uni.getStorageSync('token'),},
data: param,
method: 'POST',
success(res) {
@@ -288,7 +289,12 @@
uni.navigateBack({
delta: 1
});
- }
+ } else if (res.code == 403) {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ }
}
})
this.$refs.filter.close('bottom')
diff --git a/pages/phyz/checkLocDetl/locMove.vue b/pages/phyz/checkLocDetl/locMove.vue
index b817c49..5f97161 100644
--- a/pages/phyz/checkLocDetl/locMove.vue
+++ b/pages/phyz/checkLocDetl/locMove.vue
@@ -32,7 +32,9 @@
<view class="title">鐩爣妤煎眰</view>
<view class="popup-item">
<view class="popup-item-left">妤煎眰:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
+ <view class="popup-item-right">
+ <uni-combox :candidates="floorList" placeholder="璇烽�夋嫨鐩爣妤煎眰" v-model="floor"></uni-combox>
+ </view>
</view>
<view class="btn">
<view class="btn-left" @click="checkClose">鍙栨秷</view>
@@ -58,7 +60,9 @@
bay1: '',
lev1: '',
dataList: [],
- item: ''
+ item: '',
+ floorList: ['1F','2F','3F'],
+ floor: ''
}
},
onShow() {
@@ -169,28 +173,26 @@
},
checkConfirm() {
let _this = this
- let param = {
- barcode : _this.barcode,
- locNo : _this.locNo,
- item: _this.item
- }
- uni.navigateTo({
- url: "./locDetl",
- success: function(res) {
- _this.$refs.check.close()
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('item', {
- item: param
- })
+ uni.request({
+ url: `${_this.baseUrl}/agvMobile/hand/control/locMove`,
+ header: {'token': uni.getStorageSync('token'),
+ 'content-type': 'application/x-www-form-urlencoded'},
+ data: {
+ locNo: _this.dataList[0].locNo,
+ floor: _this.floor
},
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- _this.$refs.check.close()
- _this.getLocMastList()
- }
- },
- });
+ method: 'POST',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ } else if (res.code == 403) {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ }
+ }
+ })
}
}
@@ -258,8 +260,10 @@
}
.popup-item {
position: relative;
- height: 80rpx;
- line-height: 80rpx;
+ /* height: 80rpx; */
+ /* line-height: 80rpx; */
+ margin-top: 30rpx;
+ margin-bottom: 60rpx;
display: flex;
align-items: center;
font-size: 14px;
@@ -276,7 +280,7 @@
width: 50vw;
height: 50rpx;
padding: 2px 5px;
- border: 1px solid #E4E7ED;
+ /* border: 1px solid #E4E7ED; */
border-radius: 5rpx;
}
.popup-item-right input{
--
Gitblit v1.9.1