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/InOperation/InOperation.vue |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue b/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
index 9a1d5b8..e6c7247 100644
--- a/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
+++ b/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
@@ -1,12 +1,12 @@
 <template>
 	<view>
-		<InOutInfo :info="info" />
+		<InOutInfo :info="info" :isOut="false" />
 
 		<uni-collapse @change="change" @close="close" @open="open">
 			<uni-collapse-item v-if="type==7" v-for="(item1, index) in wtransferWarehouseList" :key="index"
 				:open="item1.wtransferDetailList.length">
 				<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">
@@ -16,7 +16,7 @@
 							<span>寰呭叆搴撶墿鏂�</span>
 						</div>
 					</div>
-					<div class="page_content" v-for="(item, index) in item1.wtransferDetailList" :key="index"
+					<div class="page_content" v-for="(item, index) in item1.wtransferDetailList" v-if="item.outActnum" :key="index"
 						:name="index">
 						<div class="page_content_title">
 							<div class="page_content_title_top">
@@ -59,7 +59,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>
 					<!-- <img src="@/assets/icon/gongdan_ic_shoudong@2x.png" alt=""> -->
 				</div>
 			</div>
@@ -68,7 +68,6 @@
 				<div class="page_yxwl_list">
 					<div class="page_yxwl_list_item" v-for="(item, index) in woScanMaterialBeanList" :key="index">
 						<div class="page_yxwl_list_item_top">
-							<!--                            <div class="page_yxwl_list_item_top_left" v-if="item.batch">{{item.materialName}} | {{item.materialCode}}锝渰{item.batch}}</div>-->
 							<div class="page_yxwl_list_item_top_left">{{item.materialName}} | {{item.materialCode}}
 							</div>
 						</div>
@@ -99,7 +98,7 @@
 								<div class="label">宸ヨ{{item1.scanCode}}锛�</div>
 								<div class="nr">{{item1.num}}{{item1.unitName}}</div>
 								<div class="dele" @click="dele(item1)">
-									<image src="../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
+									<image src="../../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
 								</div>
 							</div>
 						</div>
@@ -112,7 +111,6 @@
 				<div class="page_yxwl_list">
 					<div class="page_yxwl_list_item" v-for="(item1, idx) in seleMateriaList" :key="idx">
 						<div class="page_yxwl_list_item_top">
-							<!--                                <div class="page_yxwl_list_item_top_left" v-if="item1.batch">{{item1.materialName}} | {{item1.materialCode}}锝渰{item1.batch}}</div>-->
 							<div class="page_yxwl_list_item_top_left">{{item1.materialName}} | {{item1.materialCode}}
 							</div>
 						</div>
@@ -141,7 +139,7 @@
 								</div>
 								<!-- @click="dele()" -->
 								<div class="dele" @click="dele(idx)">
-									<image src="../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
+									<image src="../../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
 								</div>
 							</div>
 						</div>
@@ -385,6 +383,7 @@
 					}).then(res => {
 						if (res.code === 200) {
 							this.$store.dispatch('getUpcomingNum')
+							uni.$emit('success')
 							uni.$u.toast('鎿嶄綔鎴愬姛')
 							if (this.type == '4') { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
 								// uni.navigateTo({
@@ -402,9 +401,9 @@
 								return
 							}
 							uni.redirectTo({
-								url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.id}`
+								url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${this.id}`
+								// pages_adjust/pages/warehousingDetails/warehousingDetails
 							})
-							
 							// setTimeout(() => {
 								// if (route.query.Type == '4') { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
 								// 	router.push({
@@ -436,6 +435,7 @@
 						if (res.code === 200) {
 							this.$store.dispatch('getUpcomingNum')
 							uni.$u.toast('鎿嶄綔鎴愬姛')
+							uni.$emit('success')
 							uni.redirectTo({
 								url: `/pages_adjust/pages/warehousingDetails1/warehousingDetails1?id=${this.id}`
 							})

--
Gitblit v1.9.3