修改样式

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 {

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>

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>
 

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>

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>

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>

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>
 				<view class="card_view " v-if="isShowDeliverType">
 					<text class="card_packing_code card_content ">发货类型</text>
 					<text class="card_content ">{{dataContent.deliverType=='CUST'?'寄售库发货':'三方库发货'}}</text>

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

src/mycomponents/scan/winScanPackJob.vue

@@ -74,7 +74,7 @@
 			},
 			// 关闭
 			closeScanPopup(content) {
-				this.$refs.comscan.losefocus()
+				this.packLoseFocus();
 				this.$refs.popup.close();
 				this.$emit("close", '');
 			},

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">
@@ -361,7 +361,9 @@
 			showMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						if (this.$refs.scanPopup) {
+							this.$refs.scanPopup.packGetFocus()
+						}
 					}
 				});
 			},
@@ -378,8 +380,7 @@
 					return;
 				}
 				try {
-					var filters = [
-						{
+					var filters = [{
 							column: "status",
 							action: "in",
 							value: '1,2'
@@ -419,7 +420,8 @@
 								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)

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 {