From ea87c908fb6cdfc3e227a584a53e6730efb8262a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:41:12 +0800
Subject: [PATCH] 小程序代码

---
 minipro_standard/pages/InOperation/InOperation.vue |  111 ++++++++++++++++++++-----------------------------------
 1 files changed, 40 insertions(+), 71 deletions(-)

diff --git a/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue b/minipro_standard/pages/InOperation/InOperation.vue
similarity index 85%
rename from minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
rename to minipro_standard/pages/InOperation/InOperation.vue
index 11c4c17..e929545 100644
--- a/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
+++ b/minipro_standard/pages/InOperation/InOperation.vue
@@ -1,12 +1,12 @@
 <template>
 	<view>
-		<InOutInfo :info="info" :isOut="false" />
+		<InOutInfo :info="info" />
 
 		<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,24 +16,26 @@
 							<span>寰呭叆搴撶墿鏂�</span>
 						</div>
 					</div>
-					<div class="page_content" v-for="(item, index) in item1.wtransferDetailList" v-if="item.outActnum" :key="index"
+					<div class="page_content" v-for="(item, index) in item1.wtransferDetailList" :key="index"
 						:name="index">
 						<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>{{item.outActnum}}{{item.unitName}}</span>
 							</div>
 							<div class="page_content_title_bottom">
-								<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 ? item.procedureName : '-'}}<text class="c6" decode>{{ split}}</text></span>
+								<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>{{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>
@@ -42,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>
@@ -56,7 +58,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>
@@ -65,14 +67,15 @@
 				<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>
 						<div class="page_yxwl_list_item_sx">
-							<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="red" v-else-if="item.qualityType === 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
-							<span>{{item.procedureName ? item.procedureName : '-'}}<text class="c6" decode>{{ split}}</text></span>
+							<span class="green" v-if="item.qualityType === 0">鍚堟牸&nbsp;<span>/</span>&nbsp;</span>
+							<span class="warning" v-else-if="item.qualityType === 1">涓嶈壇&nbsp;<span>/</span>&nbsp;</span>
+							<span class="red" v-else-if="item.qualityType === 2">鎶ュ簾&nbsp;<span>/</span>&nbsp;</span>
+							<span>{{item.procedureName ? item.procedureName : '-'}}&nbsp;<span>/</span>&nbsp;</span>
 							<span>{{item.batch ? item.batch : '-'}}</span>
 						</div>
 						<div class="page_yxwl_list_item_num">
@@ -83,7 +86,7 @@
 										<span>{{item.locationName ? item.locationName : '-'}}</span>
 									</div>
 								</div>
-								<div class="items f24">
+								<div class="items">
 									<div class="label">鏁伴噺锛�</div>
 									<div class="nr">
 										<input type="text" v-model="item.scanNum" placeholder="璇疯緭鍏�" />
@@ -94,8 +97,8 @@
 							<div class="itemy" v-for="(item1, idx) in item.woutboundRedisCodeBeanList" :key="idx">
 								<div class="label">宸ヨ{{item1.scanCode}}锛�</div>
 								<div class="nr">{{item1.num}}{{item1.unitName}}</div>
-								<div class="dele" @click="woScanMaterialBeanList.splice(index, 1)">
-									<image src="../../../static/chuku_ic_delete@2x.png" class="img48" mode=""></image>
+								<div class="dele" @click="dele(item1)">
+									<image src="../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
 								</div>
 							</div>
 						</div>
@@ -108,14 +111,15 @@
 				<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>
 						<div class="page_yxwl_list_item_sx">
-							<span class="green" v-if="item1.qualityType === 0">鍚堟牸<text class="c6" decode>{{ split}}</text></span>
-							<span class="yellow" v-else-if="item1.qualityType === 1">涓嶈壇<text class="c6" decode>{{ split}}</text></span>
-							<span class="red" v-else-if="item1.qualityType === 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
-							<span>{{item1.procedureName ? item1.procedureName : '-'}}<text class="c6" decode>{{ split}}</text></span>
+							<span class="green" v-if="item1.qualityType === 0">鍚堟牸&nbsp;<span>/</span>&nbsp;</span>
+							<span class="yellow" v-else-if="item1.qualityType === 1">涓嶈壇&nbsp;<span>/</span>&nbsp;</span>
+							<span class="red" v-else-if="item1.qualityType === 2">鎶ュ簾&nbsp;<span>/</span>&nbsp;</span>
+							<span>{{item1.procedureName ? item1.procedureName : '-'}}&nbsp;<span>/</span>&nbsp;</span>
 							<span>{{item1.batch ? item1.batch : '-'}}</span>
 						</div>
 						<div class="page_yxwl_list_item_num">
@@ -126,7 +130,7 @@
 										<span>{{item1.locationName}}</span>
 									</div>
 								</div>
-								<div class="itemy_item f24">
+								<div class="itemy_item">
 									<div class="label">鏁伴噺锛�</div>
 									<div class="nr">
 										<!-- @input="inputNum(item1)"  -->
@@ -134,11 +138,9 @@
 										<span>{{item1.unitName}}</span>
 									</div>
 								</div>
-								<!-- @click="dele()" dele(index) {
-				 this.outboundList.splice(index, 1)
-			}, -->
-								<div class="dele" @click="seleMateriaList.splice(index, 1)">
-									<image src="../../../static/chuku_ic_delete@2x.png" class="img48" mode=""></image>
+								<!-- @click="dele()" -->
+								<div class="dele" @click="dele(idx)">
+									<image src="../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
 								</div>
 							</div>
 						</div>
@@ -197,7 +199,6 @@
 		},
 		data() {
 			return {
-				split: '&nbsp;/&nbsp;',
 				type: '',
 				id: '',
 				wareHouseId: '',
@@ -205,7 +206,6 @@
 				show: false,
 				info: {},
 				ids: [],
-				mainOrder: '',
 				location: '',
 				locationName: '',
 				wtransferWarehouseList: [],
@@ -253,7 +253,6 @@
 					data.wTransferType = '1'
 				}
 				infoAction(data).then(res => {
-					this.mainOrder = res.data.id
 					if (this.isZKD) {
 						this.info = res.data.wtransfer
 						this.wareHouseId = res.data.wtransfer.inWarehouseId
@@ -299,42 +298,17 @@
 			},
 			selectMaterial(val) {
 				let material = JSON.parse(JSON.stringify(val))
-				let repetition = false
-				this.seleMateriaList.forEach(item => {
-					if (item.locationId == this.location) {
-						if (item.id == material.id) {
-							repetition = true
-							return
-						}
+				let tempMaterial = this.seleMateriaList.find(item => item.locationId == this.location)
+				if (tempMaterial) {
+					if (tempMaterial.qualityType == material.qualityType && tempMaterial.procedureId == material
+						.procedureId &&
+						tempMaterial.batch == material.batch && tempMaterial.materialId == material.materialId) {
+						uni.$u.toast('鐩稿悓璐т綅锛屽悓涓�涓墿鏂欏彧鑳芥湁涓�涓�')
+						return
 					}
-				})
-				if (repetition) {
-					uni.$u.toast('鐩稿悓璐т綅锛屽悓涓�涓墿鏂欏彧鑳芥湁涓�涓�')
-					return
 				}
-				// let tempMaterial = this.seleMateriaList.find(item => item.locationId == this.location)
-				// debugger
-				// if (tempMaterial) {
-				// 	/*
-				// 	tempMaterial.qualityType == material.qualityType
-				// 		&& tempMaterial.procedureId == material.procedureId
-				// 		&&tempMaterial.batch == material.batch
-				// 		&&tempMaterial.oldLocationId == material.locationId
-				// 		&& tempMaterial.materialId == material.materialId
-				// 	*/ 
-				// 	if (tempMaterial.id == material.id) {
-				// 		uni.$u.toast('鐩稿悓璐т綅锛屽悓涓�涓墿鏂欏彧鑳芥湁涓�涓�')
-				// 		return
-				// 	}
-				// }
-				// if (tempMaterial && tempMaterial.id == material.id) {
-				// 	uni.$u.toast('鐩稿悓璐т綅锛屽悓涓�涓墿鏂欏彧鑳芥湁涓�涓�')
-				// 	return
-				// }
 				let materialNum = 0
 				let num = 0
-				// let selectedM = this.seleMateriaList.find(item => item.id == material.id)
-				// let waitMaterial = this.MateriaList.find(item => item.id === material.id)
 				this.seleMateriaList.forEach(item => {
 					if (item.id === material.id) {
 						materialNum += Number(item.outActnum)
@@ -345,11 +319,9 @@
 						num = item.outActnum - materialNum
 					}
 				})
-				
 				material.outActnum = num
 				this.seleMateriaList.push({
 					...material,
-					oldLocationId: material.locationId,
 					locationId: this.location,
 					locationName: this.locationName
 				})
@@ -410,7 +382,6 @@
 					}).then(res => {
 						if (res.code === 200) {
 							this.$store.dispatch('getUpcomingNum')
-							uni.$emit('success')
 							uni.$u.toast('鎿嶄綔鎴愬姛')
 							if (this.type == '4') { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
 								// uni.navigateTo({
@@ -428,9 +399,9 @@
 								return
 							}
 							uni.redirectTo({
-								url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${this.id}`
-								// pages_adjust/pages/warehousingDetails/warehousingDetails
+								url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.id}`
 							})
+							
 							// setTimeout(() => {
 								// if (route.query.Type == '4') { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
 								// 	router.push({
@@ -462,7 +433,6 @@
 						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}`
 							})
@@ -764,7 +734,6 @@
 					display: flex;
 					align-items: center;
 					margin-top: 15rpx;
-					font-size: 24rpx;
 				}
 
 				.page_yxwl_list_item_num {

--
Gitblit v1.9.3