From f2637cb037aa709c8a42b24a760e3223378bcc1d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 23 四月 2024 00:17:37 +0800
Subject: [PATCH] #

---
 pages/phyz/stationManage/stationDetl.vue |    2 +-
 pages/phyz/stationManage/pickAgain.vue   |   19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pages/phyz/stationManage/pickAgain.vue b/pages/phyz/stationManage/pickAgain.vue
index 0b0b72c..dfd1b5c 100644
--- a/pages/phyz/stationManage/pickAgain.vue
+++ b/pages/phyz/stationManage/pickAgain.vue
@@ -85,10 +85,12 @@
 						res = res.data
 						console.log(res);
 						if (res.code === 200) {
-							let enbleList = []
+							let enbleList = [], isfl;
 							for (let k of res.data.records) {
+								isfl = false;
 								for (let j of _this.pickList) {
 									if (j.matnr == k.matnr && j.threeCode == k.threeCode) {
+										isfl = true;
 										break
 									} else {
 										if (k.stock == -1) {
@@ -99,8 +101,10 @@
 										}
 										k['count'] = 0
 										
-										enbleList.push(k)
 									}
+								}
+								if (!isfl) {
+									enbleList.push(k)
 								}
 								
 							}
@@ -153,6 +157,17 @@
 					success(res) {
 						res = res.data
 						console.log(res);
+						if  (res.code === 200) {
+							_this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: 1});
+							setTimeout(()=>{
+								uni.navigateBack()
+							},700)
+						} 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' })
+						}
 					}
 				})
 			}
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 9418580..e966559 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -568,7 +568,7 @@
 					},
 					events: {
 						acceptDataFromOpenedPage: function(data) {
-							
+							_this.reloadStation()
 						}
 					}
 				})

--
Gitblit v1.9.1