diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue index 6d46301b..b1c6bf9a 100644 --- a/src/mycomponents/item/itemCompareQty.vue +++ b/src/mycomponents/item/itemCompareQty.vue @@ -4,7 +4,7 @@ - + @@ -48,6 +48,10 @@ isShowPackUnit:{ type: Boolean, default: true + }, + objTextStyle:{ + type: Object, + default: null } }, watch: { diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue new file mode 100644 index 00000000..464570e5 --- /dev/null +++ b/src/mycomponents/job/jobComMainDetailCard.vue @@ -0,0 +1,79 @@ + + + + + \ No newline at end of file diff --git a/src/mycomponents/qty/recommendQty.vue b/src/mycomponents/qty/recommendQty.vue index ad328385..c96707ac 100644 --- a/src/mycomponents/qty/recommendQty.vue +++ b/src/mycomponents/qty/recommendQty.vue @@ -3,7 +3,7 @@ - + {{Number(dataContent.qty)}} @@ -65,6 +65,10 @@ isShowStdPack: { type: Boolean, default: true + }, + objTextStyle:{ + type: Object, + default: null } }, watch: { diff --git a/src/pages/putaway/coms/comPutawayJobCard.vue b/src/pages/putaway/coms/comPutawayJobCard.vue index 88701f3a..27fcac4d 100644 --- a/src/pages/putaway/coms/comPutawayJobCard.vue +++ b/src/pages/putaway/coms/comPutawayJobCard.vue @@ -1,67 +1,17 @@ \ No newline at end of file diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index 14d8f9e2..1c52bbdc 100644 --- a/src/pages/putaway/job/putawayJob.vue +++ b/src/pages/putaway/job/putawayJob.vue @@ -177,7 +177,7 @@ openJobDetail(item) { uni.navigateTo({ - url: './putawayDetail?id=' + item.id + '&status=' + item.status + url: './putawayDetail?id=' + item.masterId + '&status=' + item.status }); }, @@ -196,7 +196,7 @@ this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?", res => { if (res) { - this.cancleJob(dataContent.id); + this.cancleJob(dataContent.masterId); } }); }