From edf27ac167b2d54dccda9ec1cd5d59da09da572e Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 24 Nov 2023 14:12:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request2.js                               |  4 +--
 common/style/new_style.css                    | 32 +++++++++++++++++--
 mycomponents/item/item.vue                    |  6 ++--
 mycomponents/job/jobStatus.vue                |  2 +-
 mycomponents/job/jobTop.vue                   |  2 +-
 .../coms/comReceiptDetailCard.vue             |  1 -
 .../coms/comReceiptJobCard.vue                |  7 ++--
 static/config.json                            |  2 +-
 8 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/api/request2.js b/api/request2.js
index 8ce18769..3f52d27a 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -1,8 +1,8 @@
 import request from '@/api/httpRequest2.js'
-// const baseApi = "/api/admin-api" 
+const baseApi = "/api/admin-api" 
 //公司地址
  // 本地地址
-const baseApi = "/admin-api"
+// const baseApi = "/admin-api"
 /**
  * 获取验证码
  * @param {*}  
diff --git a/common/style/new_style.css b/common/style/new_style.css
index 4db40b76..20c52a66 100644
--- a/common/style/new_style.css
+++ b/common/style/new_style.css
@@ -2025,6 +2025,29 @@ button::after {
 
 }
 
+.card_itemCode {
+	font-size: 36rpx;
+	font-weight: 500;
+	padding: 10rpx;
+
+}
+
+.card_itemName {
+	color: #909399;
+	font-size: 30rpx;
+ 	padding: 0rpx 10rpx;
+}
+
+/* .std_pack {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	padding: 0px;
+	color: #909399;
+	font-size: 30rpx;
+}
+ */
 .card_icon_normal {
 	width: 45rpx;
 	height: 45rpx;
@@ -2113,8 +2136,13 @@ button::after {
 	overflow: hidden;
 }
 
+.task_top {
+	margin: 0rpx 10rpx;
+	background-color: #fff;
+}
+
 .task_item {
-	margin: 10rpx;
+	margin: 0rpx 10rpx;
 	background-color: #fff;
 }
 
@@ -2123,7 +2151,6 @@ button::after {
 	background-color: #fff;
 	border-radius: 10rpx;
 	margin: 12rpx;
-
 }
 
 .task_number {
@@ -2134,6 +2161,7 @@ button::after {
 
 .task_text {
 	font-size: 30rpx;
+	margin: 5rpx 0rpx;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
diff --git a/mycomponents/item/item.vue b/mycomponents/item/item.vue
index 201020dd..abcceaa4 100644
--- a/mycomponents/item/item.vue
+++ b/mycomponents/item/item.vue
@@ -3,11 +3,11 @@
 		<view class="uni-flex u-col-center space-between" style="
 	background-color:#fff;
 	margin-left: 10rpx;">
-			<view class="card_partCode">
-				<view class="" :class="openPopup(dataContent)">
+			<view >
+				<view class="card_itemCode" :class="openPopup(dataContent)">
 					{{dataContent.itemCode}}
 				</view>
-				<view class="">
+				<view class="card_itemName">
 					{{dataContent.itemName}}
 				</view>
 			</view>
diff --git a/mycomponents/job/jobStatus.vue b/mycomponents/job/jobStatus.vue
index 9a80a5e0..26ea46ae 100644
--- a/mycomponents/job/jobStatus.vue
+++ b/mycomponents/job/jobStatus.vue
@@ -1,5 +1,5 @@
 <template>
-	<view style="margin: 10rpx;">
+	<view >
 		<text :class="statusStyle(jobStatus)">
 			{{ jobStatusInfo.label}}
 		</text>
diff --git a/mycomponents/job/jobTop.vue b/mycomponents/job/jobTop.vue
index f2a9f476..56562d7e 100644
--- a/mycomponents/job/jobTop.vue
+++ b/mycomponents/job/jobTop.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="task_item">
+	<view class="task_top">
 		<view class="uni-flex space-between u-col-center">
 			<job-number :number="dataContent.number"></job-number>
 			<job-status :jobStatus="dataContent.status"></job-status>
diff --git a/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
index e1e51543..b886ba0e 100644
--- a/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
+++ b/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
@@ -11,7 +11,6 @@
 						<uni-swipe-action-item @click="swipeClick($event,item)"
 							:right-options="item.scaned?scanOptions:detailOptions">
 							<recommend :detail="item"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
-						
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 					<u-line color="#D8D8D8"></u-line>
diff --git a/pages/purchaseReceipt/coms/comReceiptJobCard.vue b/pages/purchaseReceipt/coms/comReceiptJobCard.vue
index 65affce4..1465fafb 100644
--- a/pages/purchaseReceipt/coms/comReceiptJobCard.vue
+++ b/pages/purchaseReceipt/coms/comReceiptJobCard.vue
@@ -3,17 +3,18 @@
 		<view class="task_item">
 			<view class="task_text">
 				<view class="">
-					发货单号 : {{dataContent.asnNumber}}
+					申请单号 : {{dataContent.requestNumber}}
 				</view>
 			</view>
 			<view class="task_text">
 				<view class="">
-					要货计划单号 : {{dataContent.ppNumber}}
+					发货单号 : {{dataContent.asnNumber}}
 				</view>
 			</view>
 			<view class="task_text">
 				<view class="">
-					供应商名称 : {{dataContent.supplierName}}
+					供应商代码 : {{dataContent.supplierCode}}
+					<!-- 供应商名称 : {{dataContent.supplierName}} -->
 				</view>
 			</view>
 		</view>
diff --git a/static/config.json b/static/config.json
index 92a4a9f4..d48501b3 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 		
 		"request_url": {
 			"name": "request_url",
-			"value": "http://localhost:12080",
+			"value": "http://dev.ccwin-in.com:25100",
 			"dev":"http://dev.ccwin-in.com:25100/api",
 			"local":"http://localhost:12080",
 			"desc": "api请求地址"

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 2/3] =?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()

From 30582b36b71eabfcbba001fed5e58cebef5deab3 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 24 Nov 2023 14:48:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/location/requiredLocation.vue  | 2 +-
 pages/purchaseReceipt/job/receiptDetail.vue | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mycomponents/location/requiredLocation.vue b/mycomponents/location/requiredLocation.vue
index cd889b7b..a875b339 100644
--- a/mycomponents/location/requiredLocation.vue
+++ b/mycomponents/location/requiredLocation.vue
@@ -3,7 +3,7 @@
 	padding-bottom: 15rpx;
 	 padding-left: 10rpx;
 	 padding-right: 10rpx;
-	 font-size:32rpx;background-color: #fff;">
+	 font-size:32rpx;">
 		<text style="font-size: 35rpx;">{{title}} </text>
 		<view class="uni-flex u-col-center" @click="showLocation">
 			<text style="color:#3FBAFF;font-size: 35rpx;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text>
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
index 5710df75..d7672aea 100644
--- a/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -13,14 +13,15 @@
 			</scroll-view>
 		</view>
 
-		<required-location ref="requiredLocation" title="默认收货库位" :locationCode="toLocationCode"
-			:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
-			:locationTypeList="locationTypeList"></required-location>
-
+	
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<required-location ref="requiredLocation" title="默认收货库位" :locationCode="toLocationCode"
+						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
+						:locationTypeList="locationTypeList"></required-location>
+					
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>