From a57e217762f2f0214c47eff9993c7899bc4363f0 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 10 Jul 2024 15:14:58 +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

---
 src/common/style/new_style.css                | 13 ++-
 src/mycomponents/balance/batch.vue            |  2 +-
 src/mycomponents/balance/location.vue         |  4 +-
 src/mycomponents/balance/pack.vue             |  2 +-
 src/mycomponents/balance/toLocation.vue       |  2 +-
 src/mycomponents/job/jobBottom.vue            |  4 +-
 src/mycomponents/job/jobComMainDetailCard.vue | 11 +--
 src/mycomponents/scan/winComScanBalance.vue   |  1 +
 src/mycomponents/scan/winScanPackJob.vue      |  2 +-
 src/pages/issue/job/issueJob.vue              | 92 ++++++++++---------
 .../uni-data-select/uni-data-select.vue       |  4 +-
 11 files changed, 72 insertions(+), 65 deletions(-)

diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index f73a7d64..86421cce 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2031,9 +2031,8 @@ button::after {
 }
 
 .card_itemCode {
-	font-size: 38rpx;
+	font-size: 40rpx;
 	font-weight: bold;
-	font-weight: 500;
 	/* 	padding: 5rpx 10rpx; */
 	/* width: 210rpx; */
 	word-wrap: break-word;
@@ -2069,7 +2068,8 @@ button::after {
 
 
 .card_content {
-	font-size: 32rpx;
+	font-size: 35rpx;
+	font-weight: bold;
 	padding: 5px;
 }
 
@@ -2082,27 +2082,32 @@ button::after {
 .card_packing_code {
 	color: #3315EB;
 	padding: 5px;
+	font-size: 35rpx;
 }
 
 .card_batch {
 	color: #9747FF;
 	padding: 5px;
+	font-size: 35rpx;
 }
 
 .card_container {
 	color: #0076F6;
 	padding: 5px;
+	font-size: 35rpx;
 }
 
 
 .card_container_content {
 	font-size: 32rpx;
 	padding: 5px;
+	font-size: 35rpx;
 }
 
 .card_business {
 	color: #F1A532;
 	padding: 5px;
+	font-size: 35rpx;
 }
 
 .card_business_content {
@@ -2113,11 +2118,13 @@ button::after {
 .card_location {
 	color: #DA8910;
 	padding: 5px;
+	font-size: 35rpx;
 }
 
 .card_to_location {
 	color: #329362;
 	padding: 5px;
+	font-size: 35rpx;
 }
 
 .card_location_content {
diff --git a/src/mycomponents/balance/batch.vue b/src/mycomponents/balance/batch.vue
index 1fda0710..f719d2da 100644
--- a/src/mycomponents/balance/batch.vue
+++ b/src/mycomponents/balance/batch.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="card_view ">
-		<text class="card_batch card_content ">批次</text>
+		<text class="card_batch ">批次</text>
 		<text class="card_content ">{{batch}}</text>
 	</view>
 </template>
diff --git a/src/mycomponents/balance/location.vue b/src/mycomponents/balance/location.vue
index 9a730b5c..e8237f79 100644
--- a/src/mycomponents/balance/location.vue
+++ b/src/mycomponents/balance/location.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="card_view ">
-		<text class="card_location card_content ">{{title}}</text>
-		<text class="card_content " style="font-size: 37rpx;">{{locationCode}}</text>
+		<text class="card_location">{{title}}</text>
+		<text class="card_content" >{{locationCode}}</text>
 	</view>
 </template>
 
diff --git a/src/mycomponents/balance/pack.vue b/src/mycomponents/balance/pack.vue
index adf92084..05d4be77 100644
--- a/src/mycomponents/balance/pack.vue
+++ b/src/mycomponents/balance/pack.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="card_view">
-		<text class="card_packing_code card_content ">{{title}}</text>
+		<text class="card_packing_code ">{{title}}</text>
 		<text class="card_content ">{{packingCode}}</text>
 	</view>
 </template>
diff --git a/src/mycomponents/balance/toLocation.vue b/src/mycomponents/balance/toLocation.vue
index d44ba995..fb0986e6 100644
--- a/src/mycomponents/balance/toLocation.vue
+++ b/src/mycomponents/balance/toLocation.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="card_view ">
-		<text class="card_to_location card_content ">{{title}}</text>
+		<text class="card_to_location ">{{title}}</text>
 		<text class="card_content ">{{locationCode}}</text>
 	</view>
 </template>
diff --git a/src/mycomponents/job/jobBottom.vue b/src/mycomponents/job/jobBottom.vue
index 46e9ad60..5559629b 100644
--- a/src/mycomponents/job/jobBottom.vue
+++ b/src/mycomponents/job/jobBottom.vue
@@ -4,11 +4,11 @@
 		<view class="uni-flex space-between u-col-center">
 			<view class="uni-flex uni-row  u-col-center">
 				<image class="card_icon_normal" src="/static/icons/icon_customer.svg" alt="" />
-				<text>{{dataContent.creator}}</text>
+				<text style="font-size: 32rpx;" >{{dataContent.creator}}</text>
 			</view>
 			<view class="uni-flex uni-row  u-col-center">
 				<image class="card_icon_normal" src="/static/icons/icon_date.svg" alt="" />
-				<text class="center">{{formatDate(dataContent.createTime)}}</text>
+				<text style="font-size: 32rpx;"  class="center">{{formatDate(dataContent.createTime)}}</text>
 			</view>
 		</view>
 	</view>
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index 11c11b55..20776860 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -9,13 +9,10 @@
 				<pack v-if="isShowPack && dataContent.packingNumber!=null" :packingCode="dataContent.packingNumber">
 				</pack>
 				<batch v-if="isShowBatch && dataContent.batch!=null" :batch="dataContent.batch"></batch>
-				<div class="u-flex justify-between">
-					<location v-if="isShowFromLocation&&dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode">
-					</location>
-					<!-- 	<to-location></to-location> -->
-					<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode||dataContent.locationCode">
-					</to-location>
-				</div>
+				<location v-if="isShowFromLocation&&dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode">
+				</location>
+				<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode||dataContent.locationCode">
+				</to-location>
 				<view class="card_view " v-if="isShowDeliverType">
 					<text class="card_packing_code card_content ">发货类型</text>
 					<text class="card_content ">{{dataContent.deliverType=='CUST'?'寄售库发货':'三方库发货'}}</text>
diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index 099cbd38..612dd048 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -130,6 +130,7 @@
 					itemCode: result.package.itemCode,
 					batch: result.label.batch,
 					packingNumber: result.label.packingNumber,
+					parentPackingNumber:result.package.parentNumber,
 					inventoryStatus: this.fromInventoryStatuses,
 					areaType: this.fromLocationAreaTypeList,
 					bussinessCode:this.bussinessCode
diff --git a/src/mycomponents/scan/winScanPackJob.vue b/src/mycomponents/scan/winScanPackJob.vue
index 47cba583..eb53f519 100644
--- a/src/mycomponents/scan/winScanPackJob.vue
+++ b/src/mycomponents/scan/winScanPackJob.vue
@@ -74,7 +74,7 @@
 			},
 			// 关闭
 			closeScanPopup(content) {
-				this.$refs.comscan.losefocus()
+				this.packLoseFocus();
 				this.$refs.popup.close();
 				this.$emit("close", '');
 			},
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index f022ab69..f6012426 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="">
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
-		<job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true" :productionline="productionline" ref="filter" otherTitle=""
-			@switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber"
-			:checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask" @productionLineCode="productionLineCode"
-			@fromLocationCode="fromLocationCode">
+		<job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true" :productionline="productionline"
+			ref="filter" otherTitle="" @switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait"
+			@onScanNumber="getScanNumber" :checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask"
+			@productionLineCode="productionLineCode" @fromLocationCode="fromLocationCode">
 		</job-filter>
 		<view v-if="jobList.length>0">
 			<uni-swipe-action ref="swipeAction">
@@ -22,7 +22,7 @@
 			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
 		</view>
 		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
-		<winScanPackJob ref="scanPopup" @getResult='getScanResult' ></winScanPackJob>
+		<winScanPackJob ref="scanPopup" @getResult='getScanResult'></winScanPackJob>
 		<jobList ref="jobList" @selectItem="selectItem"></jobList>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
@@ -31,7 +31,7 @@
 <script>
 	import {
 		cancleTakeIssueJob,
-		getIssueJobList,
+		getIssueJobList,
 		getIssueJobByProductionline
 	} from '@/api/request2.js';
 	import {
@@ -77,12 +77,12 @@
 				todayTime: "",
 				status: '1,2', //待处理 、进行中
 				detailOptions: [],
-				detailGiveupOptions: [],
-				productionline:[]
+				detailGiveupOptions: [],
+				productionline: []
 			};
-		},
-		onLoad(){
-			this.getIssueJobByProductionline()
+		},
+		onLoad() {
+			this.getIssueJobByProductionline()
 		},
 		onShow() {
 			this.getList('refresh');
@@ -123,19 +123,19 @@
 			}
 		},
 
-		methods: {
-			getIssueJobByProductionline(){
-				getIssueJobByProductionline().then(res=>{
-					console.log('生产线',res)
-					if(res.code==0){
-						this.productionline = res.data.map(item=>({
-							value: item.value, 
-							text: item.name
-						}))
-					}else{
-						this.productionline = []
-					}
-				})
+		methods: {
+			getIssueJobByProductionline() {
+				getIssueJobByProductionline().then(res => {
+					console.log('生产线', res)
+					if (res.code == 0) {
+						this.productionline = res.data.map(item => ({
+							value: item.value,
+							text: item.name
+						}))
+					} else {
+						this.productionline = []
+					}
+				})
 			},
 			getList(type, fromLocationCode = '', productionLineCode = '') {
 				let that = this;
@@ -162,12 +162,12 @@
 					column: "status",
 					action: "in",
 					value: this.status
-				})
-				
-				filters.push({
-					column: "accept_user_id",
-					action: "==",
-					value: this.$store.state.user.id
+				})
+
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
 				})
 
 				if (fromLocationCode != '') {
@@ -257,8 +257,8 @@
 
 			openJobDetail(item, scanMessage = '') {
 				uni.navigateTo({
-					url: './issueDetail?id=' + item.masterId + '&status=' + item.status+'&scanMessage=' +
-							scanMessage
+					url: './issueDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' +
+						scanMessage
 				});
 			},
 
@@ -269,10 +269,10 @@
 			selectedItem(item) {
 				this.openJobDetail(item);
 			},
-			
+
 			selectItem(item) {
 				this.$refs.scanPopup.closeScanPopup();
-				this.openJobDetail(item,this.scanMessage);
+				this.openJobDetail(item, this.scanMessage);
 			},
 
 			swipeClick(e, dataContent) {
@@ -361,7 +361,9 @@
 			showMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						if (this.$refs.scanPopup) {
+							this.$refs.scanPopup.packGetFocus()
+						}
 					}
 				});
 			},
@@ -369,17 +371,16 @@
 				this.$refs.scanPopup.openScanPopup();
 			},
 			getScanResult(result) {
-				if(!result.label.batch){
+				if (!result.label.batch) {
 					this.showMessage("批次为空")
 					return;
 				}
-				if(!result.label.itemCode){
+				if (!result.label.itemCode) {
 					this.showMessage("物料号为空")
 					return;
 				}
 				try {
-					var filters = [
-						{
+					var filters = [{
 							column: "status",
 							action: "in",
 							value: '1,2'
@@ -402,7 +403,7 @@
 						sort: 'createTime',
 						by: 'asc'
 					}).then(res => {
-						this.scanMessage =result.scanMessage
+						this.scanMessage = result.scanMessage
 						let resultList = res.data.list;
 						if (resultList.length > 0) {
 							resultList.forEach(item => {
@@ -410,21 +411,22 @@
 								item.selected = false
 							})
 							let list = []
-							resultList.forEach(item=>{
-								if(!list.find(subItem=>subItem.title==item.title)){
+							resultList.forEach(item => {
+								if (!list.find(subItem => subItem.title == item.title)) {
 									list.push(item)
 								}
 							})
-							if(list.length >0){
+							if (list.length > 0) {
 								this.selectItem(list[0])
 							}
 						} else {
-							this.showMessage("物料号["+result.label.itemCode+"]批次["+result.label.batch+']未查找到任务')
+							this.showMessage("物料号[" + result.label.itemCode + "]批次[" + result.label.batch +
+								']未查找到任务')
 						}
 					}).catch(error => {
 						this.showMessage(error)
 					})
-			
+
 				} catch (e) {
 					this.showMessage(e.message)
 				}
diff --git a/src/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/src/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
index 16995bd6..9fbd408f 100644
--- a/src/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/src/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -350,7 +350,7 @@
 		cursor: pointer;
 		/* #endif */
 		line-height: 35px;
-		font-size: 14px;
+		font-size: 28rpx;
 		text-align: center;
 		/* border-bottom: solid 1px $uni-border-3; */
 		padding: 0px 10px;
@@ -413,7 +413,7 @@
 
 	.uni-select__input-placeholder {
 		color: $uni-base-color;
-		font-size: 12px;
+		font-size: 28rpx;
 	}
 
 	.uni-select--mask {