diff --git a/src/views/collect/CollectOrderUpload.vue b/src/views/collect/CollectOrderUpload.vue index 00574431..ec0d094b 100644 --- a/src/views/collect/CollectOrderUpload.vue +++ b/src/views/collect/CollectOrderUpload.vue @@ -11,7 +11,7 @@ :RowType="type" :workPlaceCode="workPlaceCode" :buttonType="1" - :uploadStatus="1" + :status="1" > @@ -22,7 +22,7 @@ :RowType="type" :workPlaceCode="workPlaceCode" :buttonType="2" - :uploadStatus="2" + :status="2" > diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index 29276801..d115d0ac 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -941,6 +941,7 @@ export default { this.loading = false if (res.code == 20000) { this.resetWork() + this.nextCollectOrder() } else if (res.code == 502) { this.$confirm(res.message, '提示', { confirmButtonText: '确定', diff --git a/src/views/collect/PanelOrderUpload.vue b/src/views/collect/PanelOrderUpload.vue index 8daec9e9..0156110e 100644 --- a/src/views/collect/PanelOrderUpload.vue +++ b/src/views/collect/PanelOrderUpload.vue @@ -313,7 +313,7 @@ export default { default: null, required: true }, - uploadStatus: { + status: { type: Object, default: null, required: true @@ -346,6 +346,7 @@ export default { filterQuery: { busType: null, tagStatus: null, + uploadStatus: null, billNo: null, workPlaceCode: null, page: 1, @@ -544,8 +545,8 @@ export default { }, created() { this.filterQuery.tagStatus = this.tagStatus - this.filterQuery.uploadStatus = this.uploadStatus.toString() - if (this.uploadStatus == 2) { + this.filterQuery.uploadStatus = String(this.status) + if (this.status == 2) { this.filterQuery.uploadStatusName = '已上传' } if (this.$route.query.workplaceId != null) {