From 3e034aa8dc856000b3409289d133d1be933efa77 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 22 五月 2024 08:02:43 +0800
Subject: [PATCH] #
---
pages/phyz/wrkMast/DBList.vue | 2 +-
manifest.json | 4 ++--
pages/phyz/wrkMast/wrkMast.vue | 45 ++++++++++++++++++++++++++++++++++++++-------
3 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/manifest.json b/manifest.json
index 299dcb2..042475d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "20240515A",
- "versionCode" : 107,
+ "versionName" : "20240521A",
+ "versionCode" : 108,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/phyz/wrkMast/DBList.vue b/pages/phyz/wrkMast/DBList.vue
index 4deb92e..3faf48d 100644
--- a/pages/phyz/wrkMast/DBList.vue
+++ b/pages/phyz/wrkMast/DBList.vue
@@ -148,7 +148,7 @@
_this.data.three_code = threeCode
_this.data.limit = limit
uni.request({
- url: `${_this.baseUrl}/agv/wrkMast/list/auth`,
+ url: `${_this.baseUrl}/agv/wrkMast/list/auth/dbList`,
header: {'token': uni.getStorageSync('token')},
data: _this.data,
method: 'GET',
diff --git a/pages/phyz/wrkMast/wrkMast.vue b/pages/phyz/wrkMast/wrkMast.vue
index 8ab1cba..ae6d860 100644
--- a/pages/phyz/wrkMast/wrkMast.vue
+++ b/pages/phyz/wrkMast/wrkMast.vue
@@ -21,7 +21,7 @@
<view>鐩爣搴撲綅锛歿{orderDetl.locNo}}</view>
<view>璐ф灦鐮侊細{{orderDetl.barcode}}</view>
</view>
- <view class="list-right" @click="opt(index)">
+ <view class="list-right" @click="opt(orderDetl)">
<uni-icons type="bars" size="25" color="#fff"></uni-icons>
</view>
</view>
@@ -108,10 +108,13 @@
<view class="filter-popup" style="height: 50vh;">
<!-- 鏍囬 -->
<view class="title">鎿嶄綔</view>
- <button size="mini">瀹屾垚</button>
- <button size="mini">鍙栨秷(AGV)</button>
- <button size="mini">鍙栨秷</button>
- <button size="mini">鏇存敼璋冩嫧鏂瑰紡</button>
+ <view style="display: flex;flex-wrap: wrap;">
+ <button size="mini" type="primary" @click="handControlWrkMast('1')" >瀹屾垚</button>
+ <button size="mini" type="warn" @click="handControlWrkMast('2')">鍙栨秷(AGV)</button>
+ <button size="mini" @click="handControlWrkMast('5')">鍙栨秷</button>
+ </view>
+
+ <!-- <button size="mini">鏇存敼璋冩嫧鏂瑰紡</button> -->
</view>
</uni-popup>
</view>
@@ -149,7 +152,8 @@
},
index: 0,
count: 0,
- mask: false
+ mask: false,
+ wrkNo: ''
}
},
@@ -230,7 +234,8 @@
},300)
},
// 娣诲姞鍏ュ簱鍟嗗搧鑷� 寰呯粍鎵樺垪琛�
- opt(index) {
+ opt(orderDetl) {
+ this.wrkNo = orderDetl.wrkNo
this.$refs.option.open('bottom')
},
addClose() {
@@ -305,6 +310,31 @@
this.data.io_type = ''
this.getOrderDetlList(this.searchValue,10)
this.$refs.filter.close()
+ },
+ handControlWrkMast(type) {
+ let _this = this
+ let param = {workNo: _this.wrkNo,type: type}
+ uni.request({
+ url: `${_this.baseUrl}/agv/hand/control/wrkMast`,
+ header: {
+ 'token': uni.getStorageSync('token'),
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ data: param,
+ method: 'POST',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ _this.$refs.option.close()
+ _this.getOrderDetlList(this.searchValue,10)
+ } 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' })
+ }
+ }
+ })
}
}
@@ -441,6 +471,7 @@
border-radius: 30rpx 30rpx 0rpx 0rpx;
}
.filter-popup button {
+ flex: 1;
margin: 16rpx;
}
.filter-popup-item {
--
Gitblit v1.9.1