From 349bcef9a96391d22522a3409adf5a89e7e70a95 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 24 十月 2023 08:46:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev

---
 minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue |   83 +++++++++++++++++++++++++----------------
 1 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue b/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
index 2487457..e072852 100644
--- a/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
+++ b/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
@@ -1,4 +1,5 @@
-<template>
+<template>
+	<page-meta :page-style="ban ?'overflow: hidden;': ''"/>
 	<view>
 		<InOutInfo :info="info" />
 		<uni-collapse @change="change" @close="close" @open="open">
@@ -23,14 +24,11 @@
 								<span>寰呭嚭<span>{{ item.outPlannum }}</span> {{ item.unitName }}</span>
 							</div>
 							<div class="page_content_title_bottom">
-								<span class="green" v-if="item.qualityType === 0">鍚堟牸&nbsp;<span
-										class="black">/</span>&nbsp;</span>
-								<span class="warning" v-else-if="item.qualityType === 1">涓嶈壇&nbsp;<span
-										class="black">/</span>&nbsp;</span>
-								<span class="error" v-else-if="item.qualityType === 2">鎶ュ簾&nbsp;<span
-										class="black">/</span>&nbsp;</span>
-								<span v-else>-&nbsp;/&nbsp;</span>
-								<span>{{item.procedureName ? item.procedureName : '-'}}&nbsp;/&nbsp;</span>
+								<span class="green" v-if="item.qualityType === 0">鍚堟牸<text class="c6" decode>{{ split}}</text></span>
+								<span class="warning" v-else-if="item.qualityType === 1">涓嶈壇<text class="c6" decode>{{ split}}</text></span>
+								<span class="error" v-else-if="item.qualityType === 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
+								<span v-else>-<text class="c6" decode>{{ split}}</text></span>
+								<span>{{item.procedureName || '-'}}<text class="c6" decode>{{ split}}</text></span>
 								<span>{{item.batch ? item.batch : '-'}}</span>
 							</div>
 						</div>
@@ -80,7 +78,7 @@
 						</div>
 						<div class="page_content_list" v-for="(items, ind) in item.wstockExtListVOList" :key="ind">
 							<div class="page_content_list_item">
-								<div class="page_content_list_item_label">鎵规鍙�1锛�</div>
+								<div class="page_content_list_item_label">鎵规鍙凤細</div>
 								<div class="page_content_list_item_nr">{{ items.batch ? items.batch : '-' }}</div>
 							</div>
 							<div class="page_content_list_items">
@@ -118,7 +116,7 @@
 
 					</div>
 					<div class="page_yxwl_list_item_sx">
-						<span class="green" v-if="item.qualityType == 0">鍚堟牸t<text class="c6" decode>{{ split}}</text></span>
+						<span class="green" v-if="item.qualityType == 0">鍚堟牸<text class="c6" decode>{{ split}}</text></span>
 						<span class="yellow" v-else-if="item.qualityType == 1">涓嶈壇<text class="c6" decode>{{ split}}</text></span>
 						<span class="red" v-else-if="item.qualityType == 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
 						<span v-else>-<text class="c6" decode>{{ split}}</text></span>
@@ -156,7 +154,7 @@
 				<span>纭鍑哄簱</span>
 			</div>
 		</div>
-		<SelectTraMultipleMaterial ref="selectTraMultipleMaterial" @selectes="selectMaterail" />
+		<SelectTraMultipleMaterial ref="selectTraMultipleMaterial" @close="ban = false" @selectes="selectMaterail" />
 	</view>
 </template>
 
@@ -182,8 +180,10 @@
 			InOutInfo,
 			SelectTraMultipleMaterial
 		},
-		data() {
-			return {
+		data() {
+			
+			return {
+				ban: false,
 				type: '',
 				id: '',
 				dbid: '',
@@ -261,13 +261,15 @@
 			change() {},
 			close() {},
 			open() {},
-			openxz() {
+			openxz() {
+				this.ban = true
 				this.$refs.selectTraMultipleMaterial.open({
 					transferId: this.id,
 					warehouseId: this.warehouseId
 				})
 			},
-			selectMaterail(v) {
+			selectMaterail(v) {
+				this.ban = false
 				let tempList = this.warehouseList[0].wtransferDetailList
 				let materials = JSON.parse(JSON.stringify(v.materials))
 				tempList.forEach(item => {
@@ -279,29 +281,44 @@
 						}
 					})
 					if (!isOutList) {
-						materials.forEach((materail, index) => {
-							if (item.batch) {
-								// 绮剧‘鍖归厤
-								if (materail.materialId == item.materialId &&
-										materail.procedureId == item.procedureId &&
-										materail.qualityType == item.qualityType &&
-										materail.batch == item.batch
+						item.wstockExtListVOList.forEach(hw => {
+							materials.forEach((materail, index) => {
+								if (hw.materialId == materail.materialId &&
+										hw.procedureId == materail.procedureId &&
+										hw.qualityType == materail.qualityType &&
+										hw.locationId == materail.locationId &&
+										hw.batch == materail.batch
 									) {
 										this.addToOutList(materail, item)
 										materials.splice(index, 1)
 										return
 								}
-							} else {
-								if (materail.materialId == item.materialId &&
-										materail.procedureId == item.procedureId &&
-										materail.qualityType == item.qualityType
-									) {
-									this.addToOutList(materail, item)
-									materials.splice(index, 1)
-									return
-								}
-							}
+							})
 						})
+						
+							
+							// if (item.batch) {
+							// 	// 绮剧‘鍖归厤
+							// 	if (materail.materialId == item.materialId &&
+							// 			materail.procedureId == item.procedureId &&
+							// 			materail.qualityType == item.qualityType &&
+							// 			materail.batch == item.batch
+							// 		) {
+							// 			this.addToOutList(materail, item)
+							// 			materials.splice(index, 1)
+							// 			return
+							// 	}
+							// } else {
+							// 	if (materail.materialId == item.materialId &&
+							// 			materail.procedureId == item.procedureId &&
+							// 			materail.qualityType == item.qualityType
+							// 		) {
+							// 		this.addToOutList(materail, item)
+							// 		materials.splice(index, 1)
+							// 		return
+							// 	}
+							// }
+						
 					} 
 				})
 			},

--
Gitblit v1.9.3