From c875b568549887c9da144eed21d6b970c23b1ffd Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 24 Nov 2023 16:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/new_style.css                    | 23 +++++++++++-----
 common/style/uni.css                          |  9 +++----
 mycomponents/balance/batch.vue                |  6 ++---
 mycomponents/balance/location.vue             |  6 ++---
 mycomponents/balance/pack.vue                 |  6 ++---
 mycomponents/qty/stdPackQty.vue               |  1 -
 mycomponents/recommend/recommend.vue          | 27 ++++++++-----------
 .../coms/comReceiptDetailCard.vue             |  2 +-
 pages/purchaseReceipt/job/receiptDetail.vue   |  1 -
 9 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/common/style/new_style.css b/common/style/new_style.css
index d7541d69..172adb4f 100644
--- a/common/style/new_style.css
+++ b/common/style/new_style.css
@@ -2047,6 +2047,12 @@ button::after {
 	font-size: 30rpx;
 }
  */
+
+
+.card_content {
+	font-size: 32rpx;
+}
+
 .card_icon_normal {
 	width: 45rpx;
 	height: 45rpx;
@@ -2054,7 +2060,6 @@ button::after {
 }
 
 .card_packing_code {
-	font-size: 32rpx;
 	color: #3315EB;
 }
 
@@ -2062,10 +2067,8 @@ button::after {
 	font-size: 32rpx;
 }
 
-
 .card_batch {
 	color: #00B574;
-	font-size: 32rpx;
 }
 
 
@@ -2075,7 +2078,6 @@ button::after {
 
 .card_business {
 	color: #F1A532;
-	font-size: 32rpx;
 }
 
 .card_business_content {
@@ -2086,9 +2088,12 @@ button::after {
 	color: #00A3FF;
 }
 
+.card_location_content {
+	font-size: 32rpx;
+}
+
 .card_supportCode {
 	color: #DA8910;
-	font-size: 32rpx;
 }
 
 .card_supportCode_content {
@@ -2099,6 +2104,12 @@ button::after {
 	background: linear-gradient(to right, #7ED7BD, #DCEFEE);
 }
 
+.card_view
+{
+	font-size: 32rpx;
+	padding: 5rpx;
+}
+/* 
 .pack_view {
 	font-size: 32rpx;
 	padding: 5rpx;
@@ -2113,7 +2124,7 @@ button::after {
 	font-size: 32rpx;
 	padding: 5rpx;
 }
-
+ */
 .business_view {
 	font-size: 32rpx;
 	padding: 5rpx;
diff --git a/common/style/uni.css b/common/style/uni.css
index da90d1ad..a165edbd 100644
--- a/common/style/uni.css
+++ b/common/style/uni.css
@@ -61,17 +61,16 @@ form {
 	display: flex;
 	flex-direction: row;
 	align-items: center;
-	
 }
 
-.uni-inline-item text {
+/* .uni-inline-item text {
 	margin-right: 20rpx;
 }
-
-.uni-inline-item text:last-child {
+ */
+/* .uni-inline-item text:last-child {
 	margin-right: 0rpx;
 	margin-left: 20rpx;
-}
+} */
 
 /* page */
 .common-page-head {
diff --git a/mycomponents/balance/batch.vue b/mycomponents/balance/batch.vue
index a16f2853..d69bc659 100644
--- a/mycomponents/balance/batch.vue
+++ b/mycomponents/balance/batch.vue
@@ -1,7 +1,7 @@
 <template>
-	<view class="batch_view uni-inline-item">
-		<text class="card_batch">批次</text>
-		<text class="card_batch_content">{{batch}}</text>
+	<view class="card_view uni-inline-item">
+		<text class="card_batch card_content ">批次</text>
+		<text class="card_content ">{{batch}}</text>
 	</view>
 </template>
 
diff --git a/mycomponents/balance/location.vue b/mycomponents/balance/location.vue
index 486979d1..144b690a 100644
--- a/mycomponents/balance/location.vue
+++ b/mycomponents/balance/location.vue
@@ -1,7 +1,7 @@
 <template>
-	<view class="location_view uni-inline-item">
-		<text class="card_location">{{title}}</text>
-		<text>{{locationCode}}</text>
+	<view class="card_view uni-inline-item">
+		<text class="card_location card_content ">{{title}}</text>
+		<text class="card_content ">{{locationCode}}</text>
 	</view>
 </template>
 
diff --git a/mycomponents/balance/pack.vue b/mycomponents/balance/pack.vue
index 819170e5..9e7d3120 100644
--- a/mycomponents/balance/pack.vue
+++ b/mycomponents/balance/pack.vue
@@ -1,7 +1,7 @@
 <template>
-	<view class="pack_view uni-inline-item">
-		<text class="card_packing_code">箱码</text>
-		<text class="card_packing_code_content">{{packingCode}}</text>
+	<view class="card_view uni-inline-item">
+		<text class="card_packing_code card_content ">箱码</text>
+		<text class="card_content ">{{packingCode}}</text>
 	</view>
 </template>
 
diff --git a/mycomponents/qty/stdPackQty.vue b/mycomponents/qty/stdPackQty.vue
index 6c14c24e..05534b92 100644
--- a/mycomponents/qty/stdPackQty.vue
+++ b/mycomponents/qty/stdPackQty.vue
@@ -3,7 +3,6 @@
 		<text>
 			{{Number(dataContent.stdPackQty)}}•{{getStdPackUnit(dataContent.uom)}}
 		</text>
-		<!-- dataContent.StdPackUom -->
 	</view>
 </template>
 <script>
diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue
index 858dc116..0362abc4 100644
--- a/mycomponents/recommend/recommend.vue
+++ b/mycomponents/recommend/recommend.vue
@@ -1,16 +1,14 @@
 <template>
 	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
-		<view class="uni-flex uni-row space-between uni-inline-item">
+		<view class="uni-flex uni-row space-between ">
+			<!-- uni-inline-item 暂时拿掉-->
 			<view>
 				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
 				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
-				<location title="来源库位" :locationCode="detail.fromLocationCode">
+				<location v-if="isShowLocation" title="来源库位" :locationCode="detail.fromLocationCode">
+				</location>
+				<location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
 				</location>
-				<view class="">
-					<location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
-					</location>
-				</view>
-
 			</view>
 			<view>
 				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
@@ -18,13 +16,10 @@
 				<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
 					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
 				</compare-qty>
-				<view class="" style="font-size: 40rpx;">
-					<!-- <u-button @click="copy" size="mini" >复制采购标签</u-button> -->
-					<text style="font-size: 10rpx;color: #2979ff;" @click="copy">复制采购标签</text>
-				</view>
-				<view class="" style="font-size: 40rpx;">
-					<!-- <u-button @click="copyPro" size="mini" type="primary" >复制制造标签</u-button> -->
-					<text style="font-size: 10rpx;color: #2979ff;" @click="copyPro">复制制品标签</text>
+				<view class="uni-flex uni-row" style="vertical-align:center">
+					<text style="font-size: 10rpx;color: #2979ff; " 
+						@click="copy">复制采购</text>
+					<text style="font-size: 10rpx;color: #2979ff;" @click="copyPro">|制品</text>
 				</view>
 			</view>
 		</view>
@@ -91,7 +86,7 @@
 				this.$copyText(content).then(
 					res => {
 						uni.showToast({
-							title: '复制成功',
+							title: '复制采购标签成功',
 							icon: 'none'
 						})
 					}
@@ -104,7 +99,7 @@
 				this.$copyText(content).then(
 					res => {
 						uni.showToast({
-							title: '复制成功',
+							title: '复制制品标签成功',
 							icon: 'none'
 						})
 					}
diff --git a/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
index b886ba0e..4234a518 100644
--- a/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
+++ b/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
@@ -10,7 +10,7 @@
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item)"
 							:right-options="item.scaned?scanOptions:detailOptions">
-							<recommend :detail="item"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
+							<recommend :detail="item" :isShowLocation="false"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 					<u-line color="#D8D8D8"></u-line>
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
index d7672aea..cc6a7c00 100644
--- a/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -13,7 +13,6 @@
 			</scroll-view>
 		</view>
 
-	
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">