From 041c81a20c93a6b8238e810fe9a1adfee9c9d86f Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 12 九月 2023 19:45:30 +0800
Subject: [PATCH] 小程序

---
 minipro_standard/pages/InOperation/InOperation.vue |   79 ++++++++++++++++++++++++---------------
 1 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/minipro_standard/pages/InOperation/InOperation.vue b/minipro_standard/pages/InOperation/InOperation.vue
index f3fd8fc..1f5d688 100644
--- a/minipro_standard/pages/InOperation/InOperation.vue
+++ b/minipro_standard/pages/InOperation/InOperation.vue
@@ -21,7 +21,8 @@
 						<div class="page_content_title">
 							<div class="page_content_title_top">
 								<span v-if="item.batch">{{ item.materialName + ' | ' + item.materialCode }}</span>
-								<span v-else>{{ item.materialName + ' | ' + item.materialCode }}</span>
+								<span v-else>{{ item.materialName + ' | ' + item.materialCode }}</span>
+								<span>{{item.outActnum}}{{item.unitName}}</span>
 							</div>
 							<div class="page_content_title_bottom">
 								<span class="green" v-if="item.qualityType === 0">鍚堟牸&nbsp;<span
@@ -35,7 +36,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 +45,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>
@@ -205,7 +206,8 @@
 				isZKD: false,
 				show: false,
 				info: {},
-				ids: [],
+				ids: [],
+				mainOrder: '',
 				location: '',
 				locationName: '',
 				wtransferWarehouseList: [],
@@ -252,7 +254,8 @@
 					infoAction = wTransferForInOut
 					data.wTransferType = '1'
 				}
-				infoAction(data).then(res => {
+				infoAction(data).then(res => {
+					this.mainOrder = res.data.id
 					if (this.isZKD) {
 						this.info = res.data.wtransfer
 						this.wareHouseId = res.data.wtransfer.inWarehouseId
@@ -382,32 +385,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 +435,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