From 21889b32ae2f342cf1cb78c37734370d0466e978 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 17:48:52 +0800
Subject: [PATCH] 组织bug

---
 minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue b/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
index d18c961..cbe0238 100644
--- a/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
+++ b/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
@@ -4,7 +4,7 @@
 		<uni-collapse @change="change" @close="close" @open="open">
 			<uni-collapse-item :open="item1.wtransferDetailList.length" v-if="type==7" v-for="(item1, index) in warehouseList" :key="index">
 				<view class="p30 cY" style="border-bottom: 4rpx solid #f7f7f7;" slot="title">
-					<image src="../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
+					<image src="../../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
 					<view>{{ item1.warehouseName }}</view>
 				</view>
 				<view class="p30">
@@ -33,7 +33,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"  v-if="childer.batch == item.batch"  :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>
@@ -52,7 +52,7 @@
 			</uni-collapse-item>
 			<uni-collapse-item v-if="type==8">
 				<view class="p30 cY" style="border-bottom: 4rpx solid #f7f7f7;" slot="title">
-					<image src="../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
+					<image src="../../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
 					<view>{{ info.warehouseName }}</view>
 				</view>
 				<view class="p30">
@@ -80,9 +80,9 @@
 								<span>{{item.batch ? item.batch : '-'}}</span>
 							</div>
 						</div>
-						<div class="page_content_list" v-for="(items, ind) in item.wstockExtListVOList" :key="ind">
+						<div class="page_content_list" v-for="(items, ind) in item.wstockExtListVOList" v-if="items.batch == item.batch" :key="ind">
 							<div class="page_content_list_item">
-								<div class="page_content_list_item_label">鎵规鍙凤細</div>
+								<div class="page_content_list_item_label">鎵规鍙�1锛�</div>
 								<div class="page_content_list_item_nr">{{ items.batch ? items.batch : '-' }}</div>
 							</div>
 							<div class="page_content_list_items">
@@ -108,7 +108,7 @@
 				</div>
 
 				<div class="right" v-if="isZKD" @click="openxz">
-					<image src="../../static/gongdan_ic_shoudong@2x.png" class="img36" mode=""></image><span>鎵嬪姩鍑哄簱</span>
+					<image src="../../../static/gongdan_ic_shoudong@2x.png" class="img36" mode=""></image><span>鎵嬪姩鍑哄簱</span>
 				</div>
 			</div>
 			<div class="page_yxwl_list" v-if="outboundList.length > 0">
@@ -143,7 +143,7 @@
 						</div>
 						<div class="dele" @click="dele(index)">
 							<!-- <img src="@/assets/icon/chuku_ic_delete@2x.png" alt="" /> -->
-							<image src="../../static/chuku_ic_delete@2x.png" class="img24" mode=""></image>
+							<image src="../../../static/chuku_ic_delete@2x.png" class="img24" mode=""></image>
 						</div>
 					</div>
 				</div>
@@ -280,13 +280,13 @@
 								hw.batch) {
 								let isExist = false
 								this.outboundList.forEach(selected => {
-									if (selected.newId == materail.id) {
+									if (selected.newId == item.id) {
 										isExist = true
 										return
 									}
 								})
 								if (isExist) {
-									uni.$u.toast('璇ョ墿鏂欐壒娆″凡瀛樺湪')
+									uni.$u.toast('璇ョ墿鏂欏凡瀛樺湪')
 									return
 								}
 								let obj = JSON.parse(JSON.stringify(materail))
@@ -313,7 +313,6 @@
 							return a;
 						}, {});
 						let tempList = this.warehouseList[0].wtransferDetailList
-
 						for (let i = 0; i < tempList.length; i++) {
 							let item = tempList[i]
 							for (let a in result) {
@@ -353,12 +352,10 @@
 							if (res.code === 200) {
 								this.$store.dispatch('getUpcomingNum')
 								uni.$u.toast('鎿嶄綔鎴愬姛')
+								uni.$emit('success')
 								uni.redirectTo({
-									url: `/pages/warehousingDetails/warehousingDetails?id=${this.id}&dbid=${this.dbid}`
+									url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${this.id}&dbid=${this.dbid}`
 								})
-								// uni.redirectTo({
-								// 	url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}&dbid=${this.dbid}`
-								// })
 								// setTimeout(() => {
 								//   router.replace({ name: 'wTransferDetail', query: { id: info.value.wtransfer.id, dbid: route.query.dbid } })
 								// }, 2000)
@@ -375,6 +372,7 @@
 						if (res.code === 200) {
 							this.$store.dispatch('getUpcomingNum')
 							uni.$u.toast('鎿嶄綔鎴愬姛')
+							uni.$emit('success')
 							uni.redirectTo({
 								url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.id}`
 							})

--
Gitblit v1.9.3