From 57f0e1be38503e373f52bee5f046b517405d2014 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 16 四月 2024 13:41:48 +0800
Subject: [PATCH] #
---
pages/phyz/stationManage/stationDetl.vue | 3 -
pages/phyz/checkLocDetl/locDetl.vue | 45 +++++++++++++++++++++-
pages/home/menuHome.vue | 6 +-
pages/phyz/checkLocDetl/checkLocDetl.vue | 10 ++++-
4 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/pages/home/menuHome.vue b/pages/home/menuHome.vue
index 358ff57..8c5cc1a 100644
--- a/pages/home/menuHome.vue
+++ b/pages/home/menuHome.vue
@@ -28,21 +28,21 @@
{
title: '绔欑偣鏌ヨ缁存姢',
name: 'stationManage',
- color: 'blue',
+ color: 'cyan',
// cuIcon: 'pullup',
url: `/phyz/stationManage/stationManage`
},
{
title: '鍏ュ嚭搴撶鐞�',
name: 'inOutManage',
- color: 'blue',
+ color: 'purple',
// cuIcon: 'pullup',
url: `/home/inOutManage`
},
{
title: '鍗曟嵁绠＄悊',
name: 'ordeManage',
- color: 'blue',
+ color: 'mauve',
// cuIcon: 'pullup',
url: `/home/orderManage`
},
diff --git a/pages/phyz/checkLocDetl/checkLocDetl.vue b/pages/phyz/checkLocDetl/checkLocDetl.vue
index e4390fb..0a5bd4b 100644
--- a/pages/phyz/checkLocDetl/checkLocDetl.vue
+++ b/pages/phyz/checkLocDetl/checkLocDetl.vue
@@ -68,7 +68,7 @@
item: ''
}
},
- onLoad() {
+ onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
this.getLocMastList()
@@ -141,6 +141,10 @@
goToLocDetl(e) {
this.locNo = e.locNo
this.item = e
+ if (e.locSts == 'S' || e.locSts == 'R') {
+ uni.showToast({ title: '褰撳墠搴撲綅鍦ㄤ綔涓�', icon: "error", position: 'top' })
+ return
+ }
this.$refs.check.open()
},
checkClose() {
@@ -156,6 +160,7 @@
uni.navigateTo({
url: "./locDetl",
success: function(res) {
+ _this.$refs.check.close()
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
res.eventChannel.emit('item', {
item: param
@@ -164,7 +169,8 @@
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
acceptDataFromOpenedPage: function(data) {
- _this.searchValueFocus = true
+ _this.$refs.check.close()
+ _this.getLocMastList()
}
},
});
diff --git a/pages/phyz/checkLocDetl/locDetl.vue b/pages/phyz/checkLocDetl/locDetl.vue
index d5d2dd6..403450c 100644
--- a/pages/phyz/checkLocDetl/locDetl.vue
+++ b/pages/phyz/checkLocDetl/locDetl.vue
@@ -53,7 +53,7 @@
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
<button size="mini" type="primary" @click="changeSts('warn')">鏇存敼搴撲綅鐘舵��</button>
- <button size="mini" type="primary" @click="agvStart('warn')">绾犳搴撲綅</button>
+ <button size="mini" type="primary" @click="changeStart('warn')">绾犳搴撲綅</button>
</view>
</view>
</template>
@@ -178,6 +178,19 @@
changeCount() {
let _this = this
_this.sourceLoc.locSts = this.locSts2
+ let barcode = _this.barcode
+ if (this.locSts2 == 'O') {
+ barcode = ''
+ }
+ let param = {
+ locNo: _this.sourceLoc.locNo,
+ locSts: _this.sourceLoc.locSts,
+ barcode: _this.barcode,
+ row1: _this.sourceLoc.row1,
+ bay1: _this.sourceLoc.bay1,
+ lev1: _this.sourceLoc.lev1,
+ floor: _this.sourceLoc.floor
+ }
Object.keys(_this.sourceLoc).forEach(function(key){
if (_this.sourceLoc[key] == null) {
_this.sourceLoc[key] = ''
@@ -189,10 +202,38 @@
'token': uni.getStorageSync('token'),
'content-type': 'application/x-www-form-urlencoded'
},
- data: _this.sourceLoc,
+ data: param,
method: 'POST',
success(res) {
res = res.data
+ if (res.code === 200) {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ _this.$refs.chageDetl.close()
+ setTimeout(()=> {
+ uni.navigateBack()
+ },1000)
+ } 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' })
+ }
+ }
+ })
+ },
+ changeStart() {
+ let _this = this
+ let param = {locNo:_this.locNo,containerCode: _this.barcode}
+ uni.request({
+ url: `${_this.baseUrl}/agvMobile/update/detl/v1`,
+ data: param,
+ method: 'POST',
+ success(res) {
+ res = res.data
+ console.log(res);
+ if (res.code === 200) {
+
+ }
}
})
}
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 9b93080..82c3684 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -141,8 +141,7 @@
<view class="buttom">
<button size="mini" type="primary" @click="emptyPakin()" v-if="btnType == 'emptyPakin'">绌烘澘鍏ュ簱</button>
<button size="mini" type="primary" @click="emptyOut()" v-if="btnType == 'emptyPakin'">鍛煎彨绌烘澘</button>
- <!-- <button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'out'">纭鍑哄簱</button> -->
- <button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out'">纭鍑哄簱</button><button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out'">纭鍑哄簱</button>
+ <button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out'">纭鍑哄簱</button>
<button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick'">宸叉嫞鏂欏洖搴�</button>
<button size="mini" type="primary" @click="startPakin()" v-if="btnType == 'start'">鍚姩鍏ュ簱</button>
</view>
--
Gitblit v1.9.1