From a16bdb3639082235c3d36910b7ed42e9939adc1f Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Wed, 17 Apr 2024 11:23:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E5=8F=8A?=
 =?UTF-8?q?=E7=BF=BB=E5=8C=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/style/new_style.css                | 12 +++-
 src/mycomponents/balance/balance.vue          | 12 ++--
 src/mycomponents/item/item.vue                |  4 +-
 src/mycomponents/item/itemQty.vue             |  2 +-
 src/mycomponents/qty/compareQty.vue           |  6 +-
 src/mycomponents/qty/packUnit.vue             |  3 +-
 src/mycomponents/qty/qty.vue                  |  4 +-
 .../package/record/overPackageRecord.vue      | 56 +++++++++++--------
 src/pages/query/coms/comItemBalance.vue       |  2 +-
 9 files changed, 60 insertions(+), 41 deletions(-)

diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 6dec3563..56c2bf52 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2033,14 +2033,20 @@ button::after {
 .card_itemCode {
 	font-size: 38rpx;
 	font-weight: bold;
-	/* font-weight: 500; */
-	padding: 5rpx 10rpx;
+	font-weight: 500;
+/* 	padding: 5rpx 10rpx; */
+	/* width: 210rpx; */
+	word-wrap: break-word;
+	word-break: break-all;
 }
 
 .card_itemName {
 	color: #909399;
 	font-size: 30rpx;
-	padding: 5rpx 20rpx;
+	/* padding: 5rpx 10rpx; */
+	/* width: 210rpx; */
+	word-wrap: break-word;
+	word-break: break-all;
 }
 
 .card_ProdLine {
diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue
index 1886ea25..86762135 100644
--- a/src/mycomponents/balance/balance.vue
+++ b/src/mycomponents/balance/balance.vue
@@ -8,19 +8,21 @@
 				<to-location title="目标库位" v-if="isShowToLocation" :locationCode="dataContent.toLocationCode">
 				</to-location>
 			</view>
-			<view>
+			<view class="uni-flex uni-row center">
 				<!-- 	<qty v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
 					:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty> -->
 				<qty v-if="dataContent.handleQty==0 || dataContent.handleQty==undefined" :dataContent="dataContent"
 					:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty>
 				<compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)"
-					:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack" :isShowStatus='isShowStatus'>
+					:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack"
+					:isShowStatus='isShowStatus'>
 				</compare-qty>
+
 				<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
-					<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text>
-					<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
+					<text style="font-size: 30rpx;color: #2979ff;  width: 20px;" @click="copy">复制</text>
 				</view>
 			</view>
+
 		</view>
 		<!-- <u-line></u-line> -->
 	</view>
@@ -144,4 +146,4 @@
 </script>
 
 <style>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/item/item.vue b/src/mycomponents/item/item.vue
index abcceaa4..f6cfc843 100644
--- a/src/mycomponents/item/item.vue
+++ b/src/mycomponents/item/item.vue
@@ -1,8 +1,6 @@
 <template>
 	<view>
-		<view class="uni-flex u-col-center space-between" style="
-	background-color:#fff;
-	margin-left: 10rpx;">
+		<view class="uni-flex u-col-center space-between">
 			<view >
 				<view class="card_itemCode" :class="openPopup(dataContent)">
 					{{dataContent.itemCode}}
diff --git a/src/mycomponents/item/itemQty.vue b/src/mycomponents/item/itemQty.vue
index ed980091..fb792eba 100644
--- a/src/mycomponents/item/itemQty.vue
+++ b/src/mycomponents/item/itemQty.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="uni-flex uni-row space-between center" style="background-color:#fff;">
+	<view class="uni-flex uni-row space-between center" style="background-color:#fff; margin-left: 15px;">
 		<view>
 			<item :dataContent="dataContent"></item>
 		</view>
diff --git a/src/mycomponents/qty/compareQty.vue b/src/mycomponents/qty/compareQty.vue
index f4a148eb..d2b3dbdb 100644
--- a/src/mycomponents/qty/compareQty.vue
+++ b/src/mycomponents/qty/compareQty.vue
@@ -1,8 +1,8 @@
 <template>
-	<view>
+	<view >
 		<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
-		<view class="uni-flex uni-row ">
-			<view class="uni-flex uni-row center">
+		<view class="uni-flex uni-row center">
+			<view class="uni-flex uni-row ">
 				<view v-if="Number(handleQty)!=0">
 					<view v-if="isShowRecommendQty">
 						<view v-if="Number(recommendQty)>Number(handleQty)" class="text_greater">
diff --git a/src/mycomponents/qty/packUnit.vue b/src/mycomponents/qty/packUnit.vue
index de9e930a..599d8d59 100644
--- a/src/mycomponents/qty/packUnit.vue
+++ b/src/mycomponents/qty/packUnit.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="std_pack" v-if="dataContent.packQty!=undefined">
 		<text>
-			{{Number(dataContent.packQty)}}{{getUomInfo(dataContent.uom)}}/{{getPackUnitName(dataContent.packUnit)}}
+			<!-- {{Number(dataContent.packQty)}}{{getUomInfo(dataContent.uom)}}/{{getPackUnitName(dataContent.packUnit)}} -->
+			{{getPackUnitName(dataContent.packUnit)}}({{Number(dataContent.packQty)}}{{getUomInfo(dataContent.uom)}})
 		</text>
 	</view>
 </template>
diff --git a/src/mycomponents/qty/qty.vue b/src/mycomponents/qty/qty.vue
index 06a4a5fc..31c148ed 100644
--- a/src/mycomponents/qty/qty.vue
+++ b/src/mycomponents/qty/qty.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="center uni-column">
+		<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
 		<view class="uni-flex uni-row">
-			<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
 			<view class="text_default center">
 				{{Number(dataContent.qty)}}
 			</view>
-			<uom  :uom="dataContent.uom"></uom>
+			<uom :uom="dataContent.uom"></uom>
 		</view>
 		
 		<view>
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index e2273eb4..1aacd9e3 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -3,21 +3,28 @@
 		<view class="">
 			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
-
 		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="cen_card" style="background-color: #fff; margin:10px 0px 0px 10px;">
+				<view class="cell_box uni-flex uni-row">
+					<view class="cell_info">
+						<view class="text_lightblue">库位</view>
+						<view>{{fromLocationCode}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">包装规格</view>
+						<view>{{getPackUnitName(fromPack.packUnit)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">包装数量</view>
+						<view>{{fromPack.packQty}}{{getUomInfo(fromPack.uom)}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="split_line"></view>
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
-							<view class="" style="padding: 20rpx; font-size: 32rpx;">
-								<view> 来源库位 : {{item.subList[0].locationCode}}
-								</view>
-								<view> 来源包装规格 :
-									{{fromPackUnit}}/{{item.subList[0].packQty}}{{getUomInfo(item.subList[0].uom)}}
-								</view>
-
-							</view>
-
 							<record-com-detail-card :dataContent="item" :index="index"
 								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"
 								:isShowFromLocation="false" :isShowToLocation="false">
@@ -32,15 +39,14 @@
 				<view class="uni-flex u-col-center space-between padding_10"
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
-						<view class="uni-flex uni-row  title u-col-center" style="font-size: 28rpx;">
-							<text>目标包装规格 :</text>
+						<view class="uni-flex uni-row">
+							<text>目标包装规格:</text>
 							<view class="uni-flex u-col-center uni-row" @click="showPackage">
 								<view class="" style="margin-left: 5rpx;width: 100%;">
 									{{toPackUnitShow}}
 								</view>
 								<u-select v-model="show" mode="single-column" :list="packageList"
 									@confirm="confirmSelect">
-
 								</u-select>
 							</view>
 						</view>
@@ -122,9 +128,10 @@
 				businessType: {},
 				dataContent: {},
 				fromPackUnit: "",
+				fromPack: {},
 				packageList: [],
 				show: false,
-				toPackUnitShow: "包装规格",
+				toPackUnitShow: "请选择",
 				toPackQty: "",
 				itemCode: ""
 			};
@@ -170,9 +177,11 @@
 				getPackUnitByItemCode(this.itemCode).then(res => {
 					if (res.data != null && res.data.list.length > 0) {
 						res.data.list.forEach(item => {
-							item.value = item.packQty;
-							item.label = item.packUnit + "/" + item.packQty + this
-								.getUomInfo(item.uom);
+							// item.value = item.packQty;
+							item.value = item.packUnit;
+							item.label = this.getPackUnitName(item.packUnit) + "(" + item.packQty + this
+								.getUomInfo(item.uom) + ")";
+							item.data = 'a';
 						})
 						this.packageList = res.data.list
 						this.show = true;
@@ -183,17 +192,19 @@
 				}).catch(error => {
 					this.showErrorMessage("未查找到包装规格" + error);
 				})
-
 			},
 			confirmSelect(e) {
 				if (this.fromPackUnit == e[0].label) {
 					this.showErrorMessage("来源包装规格【" + this.fromPackUnit + "】与目标包装规格【" + e[0].label + "】不能相等")
 					return
 				}
+				// var toPackUnit = e[0].label.split("(")[0]
+				// this.toPackUnit = toPackUnit
+				// this.toPackQty = e[0].value
+				this.toPackUnit = e[0].value
+				let pack = this.packageList.filter(r => r.packUnit == this.toPackUnit)[0];
+				this.toPackQty = pack.packQty;
 				this.toPackUnitShow = e[0].label
-				var toPackUnit = e[0].label.split("/")[0]
-				this.toPackUnit =toPackUnit
-				this.toPackQty = e[0].value
 			},
 
 			getScanResult(result) {
@@ -201,6 +212,7 @@
 				let label = result.label;
 				let pack = result.package;
 				this.fromPackUnit = pack.packUnit;
+				this.fromPack = pack;
 				var item = this.detailSource.find(res => {
 					if (res.itemCode == balance.itemCode) {
 						return res
@@ -308,7 +320,7 @@
 				//包装提示
 				if (tempHandleQty % toPackQty > 0) {
 					// var count = Math.ceil(tempHandleQty / toPackQty);
-					this.$refs.comMessage.showQuestionMessage( "扫描数量【" + tempHandleQty +
+					this.$refs.comMessage.showQuestionMessage("扫描数量【" + tempHandleQty +
 						"】,将有1个非整包,是否提交?", res => {
 							if (res) {
 								this.submitJob()
diff --git a/src/pages/query/coms/comItemBalance.vue b/src/pages/query/coms/comItemBalance.vue
index 3205e090..0a16c2f5 100644
--- a/src/pages/query/coms/comItemBalance.vue
+++ b/src/pages/query/coms/comItemBalance.vue
@@ -1,6 +1,6 @@
 <template>
 	<view :class="dataContent.scaned?'scan_view':''" style="width: 100%;">
-		<view class="uni-flex uni-row space-between">
+		<view class="uni-flex uni-row space-between center">
 			<view>
 				<pack v-if="isShowPack" :packingCode="dataContent.packingNumber"></pack>
 				<batch v-if="isShowBatch" :batch="dataContent.batch"></batch>