From f314d9b1b05d96c1a1e443470064eeeed8917f93 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 30 六月 2025 14:07:07 +0800
Subject: [PATCH] Changes
---
pages/order/unFullpltList.vue | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/pages/order/unFullpltList.vue b/pages/order/unFullpltList.vue
index ebb6469..23ebea4 100644
--- a/pages/order/unFullpltList.vue
+++ b/pages/order/unFullpltList.vue
@@ -4,6 +4,7 @@
<view class="list-left">
<view class="detl-threeCode">{{orderDetl.threeCode}}</view>
<view>搴撲綅鍙凤細{{orderDetl.locNo}}</view>
+ <view>鎵樼洏鐮侊細{{orderDetl.barcode}}</view>
<view>搴撲綅鐘舵�侊細{{orderDetl.locSts}}</view>
<view>婊℃澘锛歿{orderDetl.fullPlt}}</view>
</view>
@@ -137,7 +138,7 @@
fullPlt: 'N',
locNo: '',
staNo: '',
- staNos: [100,200,300],
+ staNos: [100,102,104,200,202,204,300,302,304],
detls: '',
anfme: 0,
maxAnfme: 0
@@ -155,7 +156,7 @@
})
eventChannel.on('detls', function(data) {
_this.detls = data.detls
- _this.maxAnfme = data.detls.anfme - data.detls.qty
+ _this.maxAnfme = data.detls.anfme - data.detls.workQty
})
},
methods: {
@@ -178,6 +179,10 @@
switch (locMast.locSts) {
case 'F':
this.locNo = locMast.locNo
+ if (locMast.fullPlt == 'Y') {
+ uni.showToast({ title: '褰撳墠搴撲綅宸叉爣璁颁负婊℃澘', icon: 'error',position: 'top' })
+ return
+ }
this.$refs.stapop.open('center')
break;
case 'P':
@@ -188,6 +193,9 @@
}
+ },
+ mergeOutCancel() {
+ this.$refs.stapop.close()
},
// 骞舵澘鍑哄簱
mergeOut() {
@@ -203,10 +211,16 @@
},
success(result) {
var res = result.data
- console.log(res);
_this.agvStartDis = false
if (res.code === 200) {
-
+ _this.$refs.stapop.close()
+ uni.showToast({ title: '鍑哄簱鎴愬姛', icon: "error", position: 'top' })
+ setTimeout(()=> {
+ _this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: 1});
+ uni.navigateBack({
+ delta:2
+ })
+ },1000)
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
@@ -219,6 +233,9 @@
}
});
},
+ mergeCancel() {
+ this.$refs.merge.close()
+ },
// 骞舵澘缁勬墭
mergeConfirm() {
let _this = this
--
Gitblit v1.9.1