From d24b6fe16b7fa9aa608be207f6c9ab158d4e1196 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 12 九月 2023 16:32:22 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev
---
minipro_standard/pages/InOperation/InOperation.vue | 70 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/minipro_standard/pages/InOperation/InOperation.vue b/minipro_standard/pages/InOperation/InOperation.vue
index f3fd8fc..6190865 100644
--- a/minipro_standard/pages/InOperation/InOperation.vue
+++ b/minipro_standard/pages/InOperation/InOperation.vue
@@ -35,7 +35,7 @@
<span>{{item.batch ? item.batch : '-'}}</span>
</div>
</div>
- <div class="page_content_list" v-for="(childer, idxs) in item.wstockExtListVOList" :key="idxs">
+ <!-- <div class="page_content_list" v-for="(childer, idxs) in item.wstockExtListVOList" :key="idxs">
<div class="page_content_list_item">
<div class="page_content_list_item_label">鍏ュ簱璐т綅锛�</div>
<div class="page_content_list_item_nr">{{ childer.locationName }}</div>
@@ -44,7 +44,7 @@
<div class="page_content_list_item_label">鏁伴噺锛�</div>
<div class="page_content_list_item_nr">{{ childer.num }}{{ childer.unitName }}</div>
</div>
- </div>
+ </div> -->
</div>
</view>
</uni-collapse-item>
@@ -382,32 +382,45 @@
}).then(res => {
if (res.code === 200) {
this.$store.dispatch('getUpcomingNum')
- uni.$u.toast('鎿嶄綔鎴愬姛')
- // Toast.success({
- // message: '鎿嶄綔鎴愬姛',
- // forbidClick: true,
- // duration: 2000
- // })
+ uni.$u.toast('鎿嶄綔鎴愬姛')
+ if (this.type == '4') { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
+ // uni.navigateTo({
+ // url:
+ // })
+ // router.push({
+ // name: 'completionDetails',
+ // query: {
+ // id: route.query.id,
+ // dbid: route.query.dbid,
+ // type: 7,
+ // isShow: 2
+ // }
+ // })
+ return
+ }
+ uni.redirectTo({
+ url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.id}`
+ })
// setTimeout(() => {
- // if (route.query.Type == '4') { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
- // router.push({
- // name: 'completionDetails',
- // query: {
- // id: route.query.id,
- // dbid: route.query.dbid,
- // type: 7,
- // isShow: 2
- // }
- // })
- // return
- // }
- // router.replace({
- // name: 'wTransferDetail',
- // query: {
- // id: route.query.id
- // }
- // })
+ // if (route.query.Type == '4') { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
+ // router.push({
+ // name: 'completionDetails',
+ // query: {
+ // id: route.query.id,
+ // dbid: route.query.dbid,
+ // type: 7,
+ // isShow: 2
+ // }
+ // })
+ // return
+ // }
+ // router.replace({
+ // name: 'wTransferDetail',
+ // query: {
+ // id: route.query.id
+ // }
+ // })
// }, 2000)
}
})
@@ -419,7 +432,10 @@
}).then(res => {
if (res.code === 200) {
this.$store.dispatch('getUpcomingNum')
- uni.$u.toast('鎿嶄綔鎴愬姛')
+ uni.$u.toast('鎿嶄綔鎴愬姛')
+ uni.redirectTo({
+ url: `/pages_adjust/pages/warehousingDetails1/warehousingDetails1?id=${this.id}`
+ })
// Toast.success({
// message: '鎿嶄綔鎴愬姛',
// forbidClick: true,
--
Gitblit v1.9.3