From 55d1702f1207e32be196ecc94e702bdd9890a0d2 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 24 九月 2024 16:44:27 +0800
Subject: [PATCH] #
---
pages/order/unFullpltList.vue | 22 +++++++++++++++++++---
pages/order/orderIn.vue | 4 ++--
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/pages/order/orderIn.vue b/pages/order/orderIn.vue
index 50aa7a2..601089f 100644
--- a/pages/order/orderIn.vue
+++ b/pages/order/orderIn.vue
@@ -25,7 +25,7 @@
<view>鎵瑰彿锛歿{orderDetl.batch}}</view>
<view>缁勪欢鍙凤細{{orderDetl.bomCode}}</view>
<view>璁㈠崟鏁伴噺锛歿{orderDetl.anfme}}</view>
- <view>宸蹭綔涓氭暟閲忥細{{orderDetl.qty}}</view>
+ <view>浣滀笟鏁伴噺锛歿{orderDetl.workQty}}</view>
</view>
<view class="list-right" @click="checkIsFull(index)">
<uni-icons type="folder-add" size="25" color="#fff"></uni-icons>
@@ -254,7 +254,7 @@
acceptDataFromOpenedPage: function(data) {
if (data.data == 1) {
_this.orderCarList = []
- _this.getOrderDetlList(uni.getStorageSync('threeCode'),10)
+ _this.getDataList(_this.searchVal,10)
}
}
}
diff --git a/pages/order/unFullpltList.vue b/pages/order/unFullpltList.vue
index ebb6469..17d2904 100644
--- a/pages/order/unFullpltList.vue
+++ b/pages/order/unFullpltList.vue
@@ -155,7 +155,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 +178,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 +192,9 @@
}
+ },
+ mergeOutCancel() {
+ this.$refs.stapop.close()
},
// 骞舵澘鍑哄簱
mergeOut() {
@@ -203,10 +210,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 +232,9 @@
}
});
},
+ mergeCancel() {
+ this.$refs.merge.close()
+ },
// 骞舵澘缁勬墭
mergeConfirm() {
let _this = this
--
Gitblit v1.9.1