From 9e3e4b8fe4807faac78d63129d8c2d429302ff5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Tue, 29 Oct 2024 13:37:56 +0800
Subject: [PATCH] =?UTF-8?q?mycomponents/balance=E4=B8=8B=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=BF=81=E7=A7=BB=208/8-10/25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/balance/balance.vue          |  9 +-
 .../balance/handleBalanceBatch.vue            | 85 +++++++++++++++++++
 src/mycomponents/balance/pack.vue             |  8 +-
 .../balance/recommendBalanceBatch.vue         | 77 +++++++++++++++++
 4 files changed, 176 insertions(+), 3 deletions(-)
 create mode 100644 src/mycomponents/balance/handleBalanceBatch.vue
 create mode 100644 src/mycomponents/balance/recommendBalanceBatch.vue

diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue
index 75fdf2a3..4ac5a6e4 100644
--- a/src/mycomponents/balance/balance.vue
+++ b/src/mycomponents/balance/balance.vue
@@ -2,7 +2,8 @@
   <view :class="dataContent.scaned ? 'scan_view' : ''">
     <view class="uni-flex uni-row space-between" style="align-items: center; padding: 20rpx">
       <view>
-        <pack v-if="dataContent.parentNumber" title="父包装" :packingCode="dataContent.parentNumber"></pack>
+        <pack v-if="isShowParentPack && dataContent.parentNumber" title="父包装"
+              :packingCode="dataContent.parentNumber"></pack>
         <pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack>
         <batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
         <location title="来源库位" v-if="isShowFromLocation" :locationCode="dataContent.locationCode"></location>
@@ -66,7 +67,11 @@ const props = defineProps({
   isShowToLocation: {
     type: Boolean,
     default: false
-  }
+  },
+  isShowParentPack: {
+    type: Boolean,
+    default: true
+  },
 })
 const copy = () => {
   // HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
diff --git a/src/mycomponents/balance/handleBalanceBatch.vue b/src/mycomponents/balance/handleBalanceBatch.vue
new file mode 100644
index 00000000..4ab44d8e
--- /dev/null
+++ b/src/mycomponents/balance/handleBalanceBatch.vue
@@ -0,0 +1,85 @@
+<template>
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
+		<view class="space_between center">
+			<view style="word-break: break-all;width: 60%;">
+				<pack title='外包装' v-if="detail.parentPackingNumber"
+					:packingCode="detail.parentPackingNumber"></pack>
+				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
+				<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
+			</view>
+			<view style="word-break: break-all;">
+				<recommend-qty v-if="detail.record==null || detail.record==undefined" :dataContent="detail"
+					:isShowStatus='isShowStatus' :isShowStdPack="true" :isShowCount='false'></recommend-qty>
+
+				<compare-qty v-else :dataContent="detail" :recommendQty="detail.qty" :handleQty="detail.record.qty"
+					:isShowStatus='isShowStatus' :isShowStdPack="true">
+				</compare-qty>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.recommend {
+		position: absolute;
+		left: 25px;
+		top: 70px;
+		width: 10px;
+		height: 30px;
+		opacity: 1;
+
+	}
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/balance/pack.vue b/src/mycomponents/balance/pack.vue
index a205761e..d6e30c11 100644
--- a/src/mycomponents/balance/pack.vue
+++ b/src/mycomponents/balance/pack.vue
@@ -1,11 +1,13 @@
 <template>
-  <view class="card_view">
+  <view class="card_view" v-if="ShowPackingNumber">
     <text class="card_packing_code">{{ title }}</text>
     <text class="card_content">{{ packingCode }}</text>
   </view>
 </template>
 
 <script setup lang="ts">
+import {getSwitchInfoByCode} from '@/common/basic.js';
+import {onMounted} from "vue";
 const props = defineProps({
   packingCode: {
     type: String,
@@ -16,6 +18,10 @@ const props = defineProps({
     default: '包装'
   }
 })
+const ShowPackingNumber = ref(true)
+onMounted(()=>{
+  ShowPackingNumber.value = getSwitchInfoByCode('ShowPackingNumber')
+})
 </script>
 
 <style></style>
diff --git a/src/mycomponents/balance/recommendBalanceBatch.vue b/src/mycomponents/balance/recommendBalanceBatch.vue
new file mode 100644
index 00000000..b682d4d2
--- /dev/null
+++ b/src/mycomponents/balance/recommendBalanceBatch.vue
@@ -0,0 +1,77 @@
+<template>
+	<view>
+		<view class="uni-flex uni-row space-between center ">
+			<view class="uni-flex uni-row " style="width: 60%;" >
+				<view style=" width: 25rpx;color: #32C1E8;">
+					推荐
+				</view>
+				<view style="word-break: break-all">
+					<pack v-if="isShowPack&&detail.packingNumber" :packingCode="detail.packingNumber"></pack>
+					<batch v-if="isShowBatch&&detail.batch" :batch="detail.batch"></batch>
+					<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.recommend {
+		position: absolute;
+		left: 25px;
+		top: 70px;
+		width: 10px;
+		height: 30px;
+		opacity: 1;
+
+	}
+</style>