diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 0391c5ca..251857ce 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2097,6 +2097,12 @@ button::after {
font-size: 30rpx;
}
+.card_packing_code1 {
+ color: rgb(24,173,240);
+ padding: 5px;
+ font-size: 30rpx;
+}
+
.card_batch {
color: #9747FF;
padding: 5px;
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index f30c8508..be5e64e9 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -9,6 +9,7 @@
>
+
@@ -33,6 +34,7 @@
import toLocation from '@/mycomponents/balance/toLocation.vue'
import batch from '@/mycomponents/balance/batch.vue'
import intoDeliNo from '@/mycomponents/balance/intoDeliNo.vue'
+ import goodsShelves from '@/mycomponents/balance/goodsShelves.vue'
import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
import level from '@/mycomponents/balance/level.vue'
@@ -44,7 +46,8 @@
batch,
intoDeliNo,
itemCompareQty,
- level
+ level,
+ goodsShelves
},
data() {
return {};
@@ -91,6 +94,10 @@
type: Boolean,
default: false
},
+ isShowGoodsShelves:{
+ type:Boolean,
+ default:false
+ }
},
diff --git a/src/mycomponents/workStation/workStation.vue b/src/mycomponents/workStation/workStation.vue
index 799d3ffb..5988b949 100644
--- a/src/mycomponents/workStation/workStation.vue
+++ b/src/mycomponents/workStation/workStation.vue
@@ -22,10 +22,10 @@
原料库位
{{ rawLocationCode }}
-
+
+ 货架号
+ {{ itemGroup }}
+
@@ -65,6 +65,14 @@
type: String,
default: ""
},
+ itemGroup: {
+ type: String,
+ default: ""
+ },
+ isShowItemGroup: {
+ type: Boolean,
+ default: false
+ },
},
methods: {}
diff --git a/src/pages/issue/coms/comIssueJobCard.vue b/src/pages/issue/coms/comIssueJobCard.vue
index bded9d84..8b518919 100644
--- a/src/pages/issue/coms/comIssueJobCard.vue
+++ b/src/pages/issue/coms/comIssueJobCard.vue
@@ -1,7 +1,7 @@
-
+
@@ -36,10 +36,14 @@
type: Object,
default: {}
},
+ isShowGoodsShelves:{
+ type:Boolean,
+ default:false
+ }
},
methods: {
-
+
}
}
diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue
index 40fa52f0..e4c1e0cb 100644
--- a/src/pages/issue/job/issueDetailBatch.vue
+++ b/src/pages/issue/job/issueDetailBatch.vue
@@ -8,7 +8,8 @@
+ :rawLocationCode="jobContent.detailToLocationCode"
+ :itemGroup="jobContent.itemGroup" :isShowItemGroup='true'>
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index 9f98eadc..02f9b69f 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -14,7 +14,7 @@
:right-options="item.status=='2'?detailGiveupOptions:item.status=='1'?detailCloseOptions:detailOptions"
@click="swipeClick($event,item)">
-
+