From 55890ccf57bd3d94c8f2b93c24ef2119c449d6dc Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 24 Nov 2023 14:45:18 +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                  |  5 ++--
 mycomponents/recommend/recommend.vue        | 32 ++++++++++-----------
 pages/purchaseReceipt/job/receiptDetail.vue | 26 +++++++++--------
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/common/style/new_style.css b/common/style/new_style.css
index 20c52a66..d7541d69 100644
--- a/common/style/new_style.css
+++ b/common/style/new_style.css
@@ -2027,15 +2027,14 @@ button::after {
 
 .card_itemCode {
 	font-size: 36rpx;
-	font-weight: 500;
+	/* font-weight: 500; */
 	padding: 10rpx;
-
 }
 
 .card_itemName {
 	color: #909399;
 	font-size: 30rpx;
- 	padding: 0rpx 10rpx;
+ 	padding: 0rpx 20rpx;
 }
 
 /* .std_pack {
diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue
index e969ccfe..858dc116 100644
--- a/mycomponents/recommend/recommend.vue
+++ b/mycomponents/recommend/recommend.vue
@@ -4,17 +4,13 @@
 			<view>
 				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
 				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
-				<location
-					 title="来源库位"
-					:locationCode="detail.fromLocationCode">
+				<location title="来源库位" :locationCode="detail.fromLocationCode">
 				</location>
 				<view class="">
-					<location v-if="isShowToLocation"
-						 title="目标库位"
-						:locationCode="detail.toLocationCode">
+					<location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
 					</location>
 				</view>
-				
+
 			</view>
 			<view>
 				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
@@ -23,10 +19,12 @@
 					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
 				</compare-qty>
 				<view class="" style="font-size: 40rpx;">
-					<u-button @click="copy" size="mini" type="primary">复制箱码</u-button>
+					<!-- <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>
+					<!-- <u-button @click="copyPro" size="mini" type="primary" >复制制造标签</u-button> -->
+					<text style="font-size: 10rpx;color: #2979ff;" @click="copyPro">复制制品标签</text>
 				</view>
 			</view>
 		</view>
@@ -75,7 +73,7 @@
 				type: Boolean,
 				default: false
 			},
-			
+
 			locationTitle: {
 				type: String,
 				default: '库位'
@@ -104,13 +102,13 @@
 				var content = "HMQ;V1.0;I" + this.detail.itemCode + ";P" + this.detail.packingNumber + ";B" + this.detail
 					.batch + ";Q" + this.detail.qty
 				this.$copyText(content).then(
-							res => {
-								uni.showToast({
-									title: '复制成功',
-									icon: 'none'
-								})
-							}
-						)
+					res => {
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none'
+						})
+					}
+				)
 			}
 		}
 	}
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
index 6f8efe71..5710df75 100644
--- a/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -5,7 +5,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" :locationTypeList ='locationTypeList'>
+							@remove="updateData" @updateData="updateData" :locationTypeList='locationTypeList'>
 						</com-receipt-detail-card>
 					</view>
 					<u-line />
@@ -35,7 +35,6 @@
 </template>
 
 <script>
-
 	import {
 		purchaseReceiptJobSubmit,
 		getPurchaseReceiptJobDetail,
@@ -47,8 +46,9 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
+		updateTitle
 	} from '@/common/basic.js';
-	
+
 	import {
 		getDirectoryItemArray,
 	} from '@/common/directory.js';
@@ -107,6 +107,7 @@
 				} else {
 					this.getDetail();
 				}
+				
 			}
 		},
 		//返回首页
@@ -180,6 +181,7 @@
 						} else {
 							that.showMessage('列表数据为0');
 						}
+						updateTitle(that.jobContent.number);
 					}
 				}).catch(error => {
 					uni.hideLoading()
@@ -246,7 +248,7 @@
 			},
 
 			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位["+code+"]", res => {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 					this.toLocationCode = code
 					this.detailSource.forEach(item => {
 						item.subList.forEach(detail => {
@@ -256,12 +258,12 @@
 				})
 			},
 
-			 commit() {
-				 this.scanCount = this.getScanCount();
-				 if( this.scanCount==0){
-				 	this.showErrorMessage("扫描数为0,请先扫描")
-				 	return;
-				 }
+			commit() {
+				this.scanCount = this.getScanCount();
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
 				//校验库位、
 				if (!this.checkLocation()) {
 					return
@@ -291,7 +293,7 @@
 
 			},
 
-			 submitJob() {
+			submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -313,7 +315,7 @@
 							if (res.data) {
 								this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, )
 							} else {
-								this.showErrorMessage("提交失败"+res.msg)
+								this.showErrorMessage("提交失败" + res.msg)
 							}
 						}).catch(error => {
 							uni.hideLoading()