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 @@
- 批次
+ 批次
{{batch}}
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 @@
- {{title}}
- {{locationCode}}
+ {{title}}
+ {{locationCode}}
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 @@
- {{title}}
+ {{title}}
{{packingCode}}
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 @@
- {{title}}
+ {{title}}
{{locationCode}}
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 @@
- {{dataContent.creator}}
+ {{dataContent.creator}}
- {{formatDate(dataContent.createTime)}}
+ {{formatDate(dataContent.createTime)}}
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 @@
-
-
-
-
-
-
-
+
+
+
+
发货类型
{{dataContent.deliverType=='CUST'?'寄售库发货':'三方库发货'}}
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 @@
-
+
@@ -22,7 +22,7 @@
-
+
@@ -31,7 +31,7 @@