From 41c1e26fb6708f1c507760cec0cf614495862b5e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 1 Nov 2024 16:40:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA=E5=BA=93bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/comRecommendDetailCard.vue         |   4 +-
 .../detail/comRecommendDetailCardBatch.vue    | 194 ------------------
 src/pages/unPlanned/job/issueJobDetail.vue    |   7 +-
 3 files changed, 3 insertions(+), 202 deletions(-)
 delete mode 100644 src/mycomponents/detail/comRecommendDetailCardBatch.vue

diff --git a/src/mycomponents/detail/comRecommendDetailCard.vue b/src/mycomponents/detail/comRecommendDetailCard.vue
index 49a86e37..5452b913 100644
--- a/src/mycomponents/detail/comRecommendDetailCard.vue
+++ b/src/mycomponents/detail/comRecommendDetailCard.vue
@@ -20,7 +20,7 @@
 									荐
 								</view>
 								
-								<recommend  :detail="item" :isShowStatus="isShowStatus" :isShowToLocation="false">
+								<recommend  :detail="item" :isShowStatus="isShowStatus" :isShowToLocation="false" style="flex:1">
 								</recommend>
 							</view>
 							
@@ -30,7 +30,7 @@
 									际
 								</view>
 								
-								<recommend  :detail="item" :isShowStatus="isShowStatus" :isShowToLocation="false">
+								<recommend  :detail="item" :isShowStatus="isShowStatus" :isShowToLocation="false" style="flex:1">
 								</recommend>
 							</view>
 							
diff --git a/src/mycomponents/detail/comRecommendDetailCardBatch.vue b/src/mycomponents/detail/comRecommendDetailCardBatch.vue
deleted file mode 100644
index 5452b913..00000000
--- a/src/mycomponents/detail/comRecommendDetailCardBatch.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-	<view class="" style="background-color: #fff;">
-		<uni-collapse ref="collapse1" >
-			<uni-collapse-item :open="true">
-				<template v-slot:title>
-					<item-compare-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
-						:isShowStdPack="false">
-					</item-compare-qty>
-				</template>
-
-				<view class="" v-for="(item,index) in dataContent.subList" :key="index">
-					<uni-swipe-action ref="swipeAction">
-						<uni-swipe-action-item @click="swipeClick($event,item)"
-							:right-options="item.scaned?scanOptions:detailOptions"
-							style='padding:0px 0px  5px 0px;align-items: center;'>
-							
-							<view  v-if="item.isRecommend" class="uni-flex" style="flex-direction: row; align-items: center;background-color: antiquewhite;">
-								<view class="" style="font-size: 32rpx; color: black; font-weight: bold; text-align: center;">
-									推
-									荐
-								</view>
-								
-								<recommend  :detail="item" :isShowStatus="isShowStatus" :isShowToLocation="false" style="flex:1">
-								</recommend>
-							</view>
-							
-							<view v-else class="uni-flex" style="flex-direction: row; align-items: center;background-color: antiquewhite; margin-top: 5rpx;">
-								<view class="" style="font-size: 32rpx; color: red; font-weight: bold; text-align: center;">
-									实
-									际
-								</view>
-								
-								<recommend  :detail="item" :isShowStatus="isShowStatus" :isShowToLocation="false" style="flex:1">
-								</recommend>
-							</view>
-							
-							
-						</uni-swipe-action-item>
-					</uni-swipe-action>
-				</view>
-			</uni-collapse-item>
-		</uni-collapse>
-		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" :queryBalance="queryBalance" @confirm="confirm"></balance-qty-edit>
-		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
-			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
-		<comMessage ref="message"></comMessage>
-	</view>
-</template>
-
-<script>
-	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
-	import recommend from '@/mycomponents/recommend/recommend.vue'
-	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
-	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
-	import {
-		getDetailOption,
-		getPurchaseReceiptOption
-	} from '@/common/array.js';
-
-	export default {
-		emits: ['openDetail', "updateData"],
-		components: {
-			itemCompareQty,
-			recommend,
-			balanceQtyEdit,
-			winScanLocation
-		},
-		props: {
-			dataContent: {
-				type: Object,
-				default: null
-			},
-			settingParam: {
-				type: Object,
-				default: null
-			},
-			isShowPack: {
-				type: Boolean,
-				default: true
-			},
-			isShowBatch: {
-				type: Boolean,
-				default: true
-			},
-			isShowLocation: {
-				type: Boolean,
-				default: true
-			},
-			locationAreaTypeList: {
-				type: Array,
-				default: null
-			},
-			queryBalance: {
-				type: Boolean,
-				default: true
-			},
-			isShowStatus: {
-				type: Boolean,
-				default: true
-			},
-		},
-		watch: {
-			dataContent: {
-				handler(newName, oldName) {
-					if (this.dataContent.subList.length > 0) {
-						this.$nextTick(res => {
-							setTimeout(() => {
-								if (this.$refs.collapse1) {
-									this.$refs.collapse1.resize();
-								}
-							}, 500)
-						})
-					}
-				},
-				immediate: true,
-				deep: true
-			}
-		},
-
-		data() {
-			return {
-				option: [],
-				showItem: {},
-				locatonItem: {},
-				editItem: {},
-				detailOptions: [],
-				scanOptions: []
-			}
-		},
-
-		mounted() {
-			if (this.detailOptions.length == 0) {
-				this.detailOptions = getDetailOption();
-			}
-			if (this.scanOptions.length == 0) {
-				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
-			}
-			
-			// this.showLocation();
-		},
-
-		methods: {
-			swipeClick(e, item) {
-				if (e.content.text == "详情") {
-					this.detail(item)
-				} else if (e.content.text == "编辑") {
-					this.edit(item)
-				} else if (e.content.text == "库位") {
-					this.showLocation(item)
-				} else if (e.content.text == "移除") {
-					this.remove(item)
-				}
-			},
-			edit(item) {
-				this.editItem = item;
-				this.$refs.qtyEdit.openEditPopup(item.balance, item.handleQty);
-			},
-
-			detail(item) {
-				this.$emit('openDetail', item);
-				// this.showItem = item;
-				// this.$refs.jobDetailPopup.openPopup(item)
-			},
-			remove(item) {
-				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
-					res => {
-						if (res) {
-							item.scaned = false
-							item.balance = {}
-							item.handleQty = null;
-							this.$forceUpdate()
-							this.$emit('remove', item)
-						}
-					});
-			},
-			confirm(qty) {
-				this.editItem.handleQty = qty;
-				this.$emit('updateData')
-			},
-			showLocation(item) {
-				this.locatonItem = item;
-				this.$refs.scanLocationCode.openScanPopup();
-			},
-			//扫描源库位
-			getLocation(location, code) {
-				this.locatonItem.toLocationCode = code;
-				this.$emit('updateData')
-			},
-		}
-	}
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/pages/unPlanned/job/issueJobDetail.vue b/src/pages/unPlanned/job/issueJobDetail.vue
index 78408dbb..62290121 100644
--- a/src/pages/unPlanned/job/issueJobDetail.vue
+++ b/src/pages/unPlanned/job/issueJobDetail.vue
@@ -18,11 +18,8 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<comRecommendDetailCardBatch :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" @openDetail="openDetail" v-if="managementType=='BY_BATCH' || managementType=='BY_QUANTITY' ">
-						</comRecommendDetailCardBatch>
 						<comRecommendDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" @openDetail="openDetail" v-else>
+							@remove="updateData" @updateData="updateData" @openDetail="openDetail">
 						</comRecommendDetailCard>
 					</view>
 				</view>
@@ -84,7 +81,6 @@
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import comRecommendDetailCard from "@/mycomponents/detail/comRecommendDetailCard.vue"
-	import comRecommendDetailCardBatch from "@/mycomponents/detail/comRecommendDetailCardBatch.vue"
 	import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
 
@@ -94,7 +90,6 @@
 			winScanButton,
 			winScanPackAndLocation,
 			comRecommendDetailCard,
-			comRecommendDetailCardBatch,
 			detailInfoPopup,
 			jobTop
 		},