From 7a73da6d05b37a4fa1610dbab402e290b7f243de Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 27 Dec 2023 09:43:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8C=85=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/package/packageDetailPopup.vue | 93 +++++++++++----------
 pages/package/record/splitPackageRecord.vue |  3 +
 2 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/mycomponents/package/packageDetailPopup.vue b/mycomponents/package/packageDetailPopup.vue
index 8d628c99..c9db2247 100644
--- a/mycomponents/package/packageDetailPopup.vue
+++ b/mycomponents/package/packageDetailPopup.vue
@@ -7,7 +7,8 @@
 				<view v-for="(item, index) in dataList" style="width: 100%;">
 					<view class="item">
 						<text class="item_title">{{item.item_title}} </text>
-						<text class="text_wrap">{{item.text_wrap}}</text>
+						<text v-if="(item.type=='')||(item.type==undefined)" class="text_wrap">{{item.content}}</text>
+						<text v-else-if="item.type=='dateTime'" class="text_wrap">{{formatDate(item.content)}} </text>
 					</view>
 				</view>
 			</scroll-view>
@@ -23,6 +24,7 @@
 
 <script>
 	import comItem from '@/mycomponents/item/item.vue'
+	import { dateFormat 	} from '@/common/basic.js';
 	export default {
 		emits: ['onClose'],
 		components: {
@@ -68,123 +70,128 @@
 					text_wrap: this.dataContent.itemName
 				}, {
 					item_title: '物品描述1',
-					text_wrap: this.dataContent.itemDesc1
+					content: this.dataContent.itemDesc1
 				}, {
 					item_title: '物品描述2',
-					text_wrap: this.dataContent.itemDesc2
+					content: this.dataContent.itemDesc2
 				}, {
 					item_title: '批次',
-					text_wrap: this.dataContent.batch
+					content: this.dataContent.batch
 				}, {
 					item_title: '替代批次',
-					text_wrap: this.dataContent.altBatch
+					content: this.dataContent.altBatch
 				}, {
 					item_title: '生产日期',
-					text_wrap: this.dataContent.produceDate
+					content: this.dataContent.produceDate,
+					type:"dateTime"
 				}, {
-					item_title: '有效期(日)',
-					text_wrap: this.dataContent.validityDays
+					item_title: '有效日期',
+					content: this.dataContent.validityDays,
+					type:"dateTime"
 				}, {
 					item_title: '失效日期',
-					text_wrap: this.dataContent.expireDate
+					content: this.dataContent.expireDate,
+					type:"dateTime"
 				}, {
 					item_title: '计量单位',
-					text_wrap: this.dataContent.uom,
+					content: this.dataContent.uom,
 					type:"uom"
 				}, {
 					item_title: '数量',
-					text_wrap: this.dataContent.qty
+					content: this.dataContent.qty
 				}, {
 					item_title: '替代计量单位',
-					text_wrap: this.dataContent.altUom
+					content: this.dataContent.altUom
 				}, {
 					item_title: '替代数量',
-					text_wrap: this.dataContent.altQty
+					content: this.dataContent.altQty
 				}, {
 					item_title: '转换率',
-					text_wrap: this.dataContent.convertRate
+					content: this.dataContent.convertRate
 				}, {
 					item_title: '标包数量',
-					text_wrap: this.dataContent.stdPackQty
+					content: this.dataContent.stdPackQty
 				}, {
 					item_title: '标包单位',
-					text_wrap: this.dataContent.stdPackUnit
+					content: this.dataContent.stdPackUnit
 				}, {
 					item_title: '仓库代码',
-					text_wrap: this.dataContent.toWarehouseCode
+					content: this.dataContent.toWarehouseCode
 				}, {
 					item_title: '月台代码',
-					text_wrap: this.dataContent.toDockCode
+					content: this.dataContent.toDockCode
 				}, {
 					item_title: '库位代码',
-					text_wrap: this.dataContent.toLocationCode
+					content: this.dataContent.toLocationCode
 				}, {
 					item_title: '供应商代码',
-					text_wrap: this.dataContent.supplierCode
+					content: this.dataContent.supplierCode
 				}, {
 					item_title: '供应商物品代码',
-					text_wrap: this.dataContent.supplierItemCode
+					content: this.dataContent.supplierItemCode
 				}, {
 					item_title: '采购订单号',
-					text_wrap: this.dataContent.poNumber
+					content: this.dataContent.poNumber
 				}, {
 					item_title: '采购订单行',
-					text_wrap: this.dataContent.poLine
+					content: this.dataContent.poLine
 				}, {
 					item_title: '采购计划单号',
-					text_wrap: this.dataContent.rpNumber
+					content: this.dataContent.rpNumber
 				}, {
 					item_title: '发货单号',
-					text_wrap: this.dataContent.asnNumber
+					content: this.dataContent.asnNumber
 				}, {
 					item_title: '生产订单号',
-					text_wrap: this.dataContent.woNumber
+					content: this.dataContent.woNumber
 				}, {
 					item_title: '生产订单行',
-					text_wrap: this.dataContent.woLine
+					content: this.dataContent.woLine
 				}, {
 					item_title: '生产线代码',
-					text_wrap: this.dataContent.productionLineCode
+					content: this.dataContent.productionLineCode
 				}, {
 					item_title: '班组代码',
-					text_wrap: this.dataContent.teamCode
+					content: this.dataContent.teamCode
 				}, {
 					item_title: '班次代码',
-					text_wrap: this.dataContent.shiftCode
+					content: this.dataContent.shiftCode
 				}, {
 					item_title: '客户代码',
-					text_wrap: this.dataContent.customerCode
+					content: this.dataContent.customerCode
 				}, {
 					item_title: '客户月台代码',
-					text_wrap: this.dataContent.customerDockCode
+					content: this.dataContent.customerDockCode
 				}, {
 					item_title: '客户物品代码',
-					text_wrap: this.dataContent.customerItemCode
+					content: this.dataContent.customerItemCode
 				}, {
 					item_title: '销售订单号',
-					text_wrap: this.dataContent.soNumber
+					content: this.dataContent.soNumber
 				}, {
 					item_title: '销售订单行',
-					text_wrap: this.dataContent.soLine
+					content: this.dataContent.soLine
 				}, {
 					item_title: '质量等级',
-					text_wrap: this.dataContent.eqLevel
+					content: this.dataContent.eqLevel
 				}, {
 					item_title: '货主代码',
-					text_wrap: this.dataContent.ownerCode
+					content: this.dataContent.ownerCode
 				}, {
 					item_title: '重量',
-					text_wrap: this.dataContent.weight
+					content: this.dataContent.weight
 				}, {
 					item_title: '面积',
-					text_wrap: this.dataContent.area
+					content: this.dataContent.area
 				}, {
 					item_title: '体积',
-					text_wrap: this.dataContent.volume
+					content: this.dataContent.volume
 				}]);
-				// console.log(JSON.stringify(this.dataList));
-
-			}
+			},
+			formatDate(val) {
+				return dateFormat(val)
+			},
+			
 		}
 	}
 </script>
diff --git a/pages/package/record/splitPackageRecord.vue b/pages/package/record/splitPackageRecord.vue
index 3d17eeaf..6d0081c5 100644
--- a/pages/package/record/splitPackageRecord.vue
+++ b/pages/package/record/splitPackageRecord.vue
@@ -295,7 +295,10 @@
 								
 								subItem.fromInventoryStatus = subItem.inventoryStatus;
 								subItem.toInventoryStatus = subItem.inventoryStatus;
+								
 								subItem.fromQty = subItem.qty
+								subItem.toQty = record.qty
+								
 								subItem.fromPackingNumber = subItem.packingNumber;
 								subItem.toPackingNumber = record.packingNumber;