From 7747fd7dc7fee91e076d088b2046cb6f0b6e145d Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 2 Jan 2024 16:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B3=E8=AF=B7=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E7=9A=84=E5=BC=B9=E5=87=BA=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/detail/detailBalanceInfo.vue     | 67 ++++++++++++++
 mycomponents/detail/detailCommonInfo.vue      |  6 +-
 ...detailBasicInfo.vue => detailItemInfo.vue} |  0
 mycomponents/detail/detailPackageInfo.vue     | 67 ++++++++++++++
 .../detail/requestDetailBasicInfo.vue         |  6 +-
 .../detail/requestDetailCommonInfo.vue        | 10 ++-
 .../coms/requestDetailInfoPopup.vue           | 89 ++++++++++---------
 7 files changed, 195 insertions(+), 50 deletions(-)
 create mode 100644 mycomponents/detail/detailBalanceInfo.vue
 rename mycomponents/detail/{detailBasicInfo.vue => detailItemInfo.vue} (100%)
 create mode 100644 mycomponents/detail/detailPackageInfo.vue

diff --git a/mycomponents/detail/detailBalanceInfo.vue b/mycomponents/detail/detailBalanceInfo.vue
new file mode 100644
index 00000000..ea844ea5
--- /dev/null
+++ b/mycomponents/detail/detailBalanceInfo.vue
@@ -0,0 +1,67 @@
+<template>
+	<view>
+		<!-- <view class="item_big_title">
+			[明细]
+		</view> -->
+		<view class="item">
+			<text class="item_title">箱码 : </text>
+			<text class="text_wrap">{{dataContent.packingNumber}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">批次 : </text>
+			<text class="text_wrap">{{dataContent.batch}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">数量 : </text>
+			<view class="text_wrap">
+				<text class="text_wrap">{{Number(dataContent.qty)}}</text>
+				<text class="text_wrap">{{getUnitInfo(dataContent.uom)}}</text>
+			</view>
+		</view>
+		<view class="item">
+			<text class="item_title">库存状态 : </text>
+			<text class="text_wrap">{{getInventoryStatusInfo(dataContent.inventoryStatus)}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">来源库位 : </text>
+			<text class="text_wrap">{{dataContent.fromLocationCode}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryStatusName,
+		getStdPackUnitInfo,
+		getUnitInfo
+	} from '@/common/directory.js';
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			getInventoryStatusInfo(value) {
+				return getInventoryStatusName(value)
+			},
+			getUnitInfo(value){
+				return getUnitInfo(value).label
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/mycomponents/detail/detailCommonInfo.vue b/mycomponents/detail/detailCommonInfo.vue
index 2211b1ed..9705aa5e 100644
--- a/mycomponents/detail/detailCommonInfo.vue
+++ b/mycomponents/detail/detailCommonInfo.vue
@@ -3,7 +3,7 @@
 		<com-item :dataContent="dataContent"></com-item>
 		<u-line></u-line>
 		<scroll-view style="height:320px ">
-			<detail-basic-info :dataContent="dataContent"></detail-basic-info>
+			<detail-item-info :dataContent="dataContent"></detail-item-info>
 			<u-line></u-line>
 			<detail-recommend-info :dataContent="dataContent"></detail-recommend-info>
 			<u-line></u-line>
@@ -27,7 +27,7 @@
 
 <script>
 	import comItem from '@/mycomponents/item/item.vue'
-	import detailBasicInfo from '@/mycomponents/detail/detailBasicInfo.vue'
+	import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
 	import detailRecommendInfo from '@/mycomponents/detail/detailRecommendInfo.vue'
 	import detailHandleInfo from '@/mycomponents/detail/detailHandleInfo.vue'
 
@@ -35,7 +35,7 @@
 		emits: ['onClose'],
 		components: {
 			comItem,
-			detailBasicInfo,
+			detailItemInfo,
 			detailRecommendInfo,
 			detailHandleInfo
 		},
diff --git a/mycomponents/detail/detailBasicInfo.vue b/mycomponents/detail/detailItemInfo.vue
similarity index 100%
rename from mycomponents/detail/detailBasicInfo.vue
rename to mycomponents/detail/detailItemInfo.vue
diff --git a/mycomponents/detail/detailPackageInfo.vue b/mycomponents/detail/detailPackageInfo.vue
new file mode 100644
index 00000000..ea844ea5
--- /dev/null
+++ b/mycomponents/detail/detailPackageInfo.vue
@@ -0,0 +1,67 @@
+<template>
+	<view>
+		<!-- <view class="item_big_title">
+			[明细]
+		</view> -->
+		<view class="item">
+			<text class="item_title">箱码 : </text>
+			<text class="text_wrap">{{dataContent.packingNumber}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">批次 : </text>
+			<text class="text_wrap">{{dataContent.batch}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">数量 : </text>
+			<view class="text_wrap">
+				<text class="text_wrap">{{Number(dataContent.qty)}}</text>
+				<text class="text_wrap">{{getUnitInfo(dataContent.uom)}}</text>
+			</view>
+		</view>
+		<view class="item">
+			<text class="item_title">库存状态 : </text>
+			<text class="text_wrap">{{getInventoryStatusInfo(dataContent.inventoryStatus)}}</text>
+		</view>
+		<view class="item">
+			<text class="item_title">来源库位 : </text>
+			<text class="text_wrap">{{dataContent.fromLocationCode}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryStatusName,
+		getStdPackUnitInfo,
+		getUnitInfo
+	} from '@/common/directory.js';
+	export default {
+		components: {},
+		data() {
+			return {
+
+			}
+		},
+
+		mounted() {},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			}
+		},
+
+		methods: {
+			getInventoryStatusInfo(value) {
+				return getInventoryStatusName(value)
+			},
+			getUnitInfo(value){
+				return getUnitInfo(value).label
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/mycomponents/detail/requestDetailBasicInfo.vue b/mycomponents/detail/requestDetailBasicInfo.vue
index 50cd5f75..97451a1b 100644
--- a/mycomponents/detail/requestDetailBasicInfo.vue
+++ b/mycomponents/detail/requestDetailBasicInfo.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<detail-basic-info :dataContent="dataContent"></detail-basic-info>
+		<detail-item-info :dataContent="dataContent"></detail-item-info>
 		<!-- <comListItem :dataList="dataList"></comListItem> -->
 		 
 	</view>
@@ -8,10 +8,10 @@
 
 <script>
 	 
-	import detailBasicInfo from '@/mycomponents/detail/detailBasicInfo.vue'
+	import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
 	export default {
 		components: {
-			 detailBasicInfo
+			 detailItemInfo
 		},
 		data() {
 			return {
diff --git a/mycomponents/detail/requestDetailCommonInfo.vue b/mycomponents/detail/requestDetailCommonInfo.vue
index 0ee0c863..3fa9226c 100644
--- a/mycomponents/detail/requestDetailCommonInfo.vue
+++ b/mycomponents/detail/requestDetailCommonInfo.vue
@@ -4,12 +4,13 @@
 		<u-line></u-line>
 		<scroll-view style="height:320px ">
 			<!-- 物品 -->
-			<detail-basic-info :dataContent="dataContent"></detail-basic-info>
+			<detail-item-info :dataContent="dataContent"></detail-item-info>
 			<!-- <request-detail-basic-info :dataContent="dataContent"></request-detail-basic-info> -->
 			<u-line></u-line>
 			<!-- 包装 -->
 
 			<!-- 库存余额 -->
+			<detail-balance-info :dataContent="dataContent"></detail-balance-info>
 			<slot>
 				<!-- 每个任务的详情 -->
 			</slot>
@@ -27,15 +28,16 @@
 	import comItem from '@/mycomponents/item/item.vue'
 	import requestDetailBasicInfo from '@/mycomponents/detail/requestDetailBasicInfo.vue'
 	import detailRecommendInfo from '@/mycomponents/detail/detailRecommendInfo.vue'
-	import detailBasicInfo from '@/mycomponents/detail/detailBasicInfo.vue'
-
+	import detailItemInfo from '@/mycomponents/detail/detailItemInfo.vue'
+	import detailBalanceInfo from '@/mycomponents/detail/detailBalanceInfo.vue'
 	export default {
 		emits: ['onClose'],
 		components: {
 			comItem,
 			requestDetailBasicInfo,
 			detailRecommendInfo,
-			detailBasicInfo
+			detailItemInfo,
+			detailBalanceInfo
 		},
 		data() {
 			return {}
diff --git a/pages/purchaseReturn/coms/requestDetailInfoPopup.vue b/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
index 422777b6..a22e2d66 100644
--- a/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
+++ b/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
@@ -3,7 +3,17 @@
 		<uni-popup ref="popup">
 			<request-detail-common-info :dataContent="dataContent" @onClose="closePopup">
 				<view class="">
-					<!-- <comListItem :dataList="dataList"></comListItem> -->
+					<u-line></u-line>
+					<view class="uni-flex uni-column">
+						<view class="item">
+							<text class="item_title">订单号 : </text>
+							<text class="text_wrap">{{dataContent.poNumber}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">订单行 : </text>
+							<text class="text_wrap">{{dataContent.poLine}} </text>
+						</view>
+					</view>
 				</view>
 			</request-detail-common-info>
 		</uni-popup>
@@ -14,7 +24,7 @@
 	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
 	import comListItem from '@/mycomponents/common/comListItem.vue';
 	export default {
-		
+
 		components: {
 			requestDetailCommonInfo,
 			comListItem
@@ -25,48 +35,47 @@
 					type: Object,
 					default: {}
 				},
-				dataList:[]
+				dataList: []
 			}
 		},
-		watch:{
+		watch: {
 			dataContent: {
 				handler(newName, oldName) {
-					this.dataList=[{
-							title: '包装号',
-							content: this.dataContent.packingNumber
-						}, {
-							title: '器具号',
-							content: this.dataContent.containerNumber
-						},{
-							title: '批次',
-							content: this.dataContent.batch
-						},{
-							title: '替代批次',
-							content: this.dataContent.altBatch,
-						},{
-							title: '到库位代码',
-							content: this.dataContent.toLocationCode
-						},{
-							title: '库存状态',
-							content: this.dataContent.inventoryStatus,
-							type:"inventoryStatus"
-						},{
-							title: '订单号',
-							content: this.dataContent.poNumber
-						},{
-							title: '订单行',
-							content: this.dataContent.poLine
-						},{
-							title: '原因',
-							content: this.dataContent.reason
-						},{
-							title: '从货主代码',
-							content: this.dataContent.fromOwnerCode,
-						},{
-							title: '到货主代码',
-							content: this.dataContent.toOwnerCode,
-						}
-						];
+					this.dataList = [{
+						title: '包装号',
+						content: this.dataContent.packingNumber
+					}, {
+						title: '器具号',
+						content: this.dataContent.containerNumber
+					}, {
+						title: '批次',
+						content: this.dataContent.batch
+					}, {
+						title: '替代批次',
+						content: this.dataContent.altBatch,
+					}, {
+						title: '到库位代码',
+						content: this.dataContent.toLocationCode
+					}, {
+						title: '库存状态',
+						content: this.dataContent.inventoryStatus,
+						type: "inventoryStatus"
+					}, {
+						title: '订单号',
+						content: this.dataContent.poNumber
+					}, {
+						title: '订单行',
+						content: this.dataContent.poLine
+					}, {
+						title: '原因',
+						content: this.dataContent.reason
+					}, {
+						title: '从货主代码',
+						content: this.dataContent.fromOwnerCode,
+					}, {
+						title: '到货主代码',
+						content: this.dataContent.toOwnerCode,
+					}];
 				},
 				immediate: true,
 				deep: true