From bdc99fa3dab2f5a3f9731775cf346ac2b443dbc5 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 18 Dec 2024 15:59:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=83=8C=E7=95=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/record.js                           | 4 +++-
 src/mycomponents/item/item.vue                 | 4 ++--
 src/pages/inventoryMove/coms/comMoveRecord.vue | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/common/record.js b/src/common/record.js
index c6b44261..c8d98642 100644
--- a/src/common/record.js
+++ b/src/common/record.js
@@ -19,6 +19,7 @@ export function createItemInfo(balance, pack) {
 	let item = {
 		itemCode: pack.itemCode,
 		itemName: pack.itemName,
+		itemDesc1:balance && balance.itemDesc1 ? balance.itemDesc1 : pack && pack.itemDesc1 ? pack.itemDesc1:'',
 		packQty: pack.packQty,
 		packUnit: pack.packUnit,
 		qty: new Decimal(balance.qty).toNumber(),
@@ -34,7 +35,8 @@ export function createItemInfo(balance, pack) {
 export function createItemInfoForLabel(balance, label) {
 	let item = {
 		itemCode: label.itemCode,
-		itemName: label.itemName,
+		itemName: balance.itemName,
+		itemDesc1: balance.itemDesc1,
 		packQty: '',
 		packUnit: '',
 		qty: new Decimal(balance.qty).toNumber(),
diff --git a/src/mycomponents/item/item.vue b/src/mycomponents/item/item.vue
index 3cc76361..a19b1279 100644
--- a/src/mycomponents/item/item.vue
+++ b/src/mycomponents/item/item.vue
@@ -1,11 +1,11 @@
 <template>
 	<view>
-		<view class="uni-flex u-col-center space-between">
+		<view class="uni-flex u-col-center space-between ">
 			<view >
 				<view class="card_itemCode" :class="openPopup(dataContent)">
 					{{dataContent.itemCode}}
 				</view>
-				<view class="card_itemName" style="word-break:break-all;overflow:hidden;white-space:normal;display: flex;">
+				<view class="card_itemName" style="word-break:break-all;overflow:hidden;white-space:normal;display: flex;align-items: center;">
 					<view>{{dataContent.itemName}}</view>
 					<view style="padding-left: 8rpx;padding-right: 8rpx;" v-if="dataContent.itemCode && dataContent.itemDesc1">|</view>
 					<view style="flex:1;width: 50%;" v-if="dataContent.itemCode && dataContent.itemDesc1">{{dataContent.itemDesc1}}</view>
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 1227f3c7..b100f886 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -413,6 +413,7 @@
 				})
 				if (item == undefined) {
 					var itemp = createItemInfo(balance, pack);
+					console.log(777,itemp)
 					let newDetail = createDetailInfo(balance, pack);
 
 					if (newDetail.packingNumber == '') {