9/20 优化1.0

yanshishuju
wangwei 7 months ago
parent 60d4d1b6ae
commit 2150dc4b63

@ -11,7 +11,7 @@
:RowType="type" :RowType="type"
:workPlaceCode="workPlaceCode" :workPlaceCode="workPlaceCode"
:buttonType="1" :buttonType="1"
:uploadStatus="1" :status="1"
></prescribePanel> ></prescribePanel>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="已上传单" name="second"> <el-tab-pane label="已上传单" name="second">
@ -22,7 +22,7 @@
:RowType="type" :RowType="type"
:workPlaceCode="workPlaceCode" :workPlaceCode="workPlaceCode"
:buttonType="2" :buttonType="2"
:uploadStatus="2" :status="2"
></prescribePanel> ></prescribePanel>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>

@ -941,6 +941,7 @@ export default {
this.loading = false this.loading = false
if (res.code == 20000) { if (res.code == 20000) {
this.resetWork() this.resetWork()
this.nextCollectOrder()
} else if (res.code == 502) { } else if (res.code == 502) {
this.$confirm(res.message, '提示', { this.$confirm(res.message, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',

@ -313,7 +313,7 @@ export default {
default: null, default: null,
required: true required: true
}, },
uploadStatus: { status: {
type: Object, type: Object,
default: null, default: null,
required: true required: true
@ -346,6 +346,7 @@ export default {
filterQuery: { filterQuery: {
busType: null, busType: null,
tagStatus: null, tagStatus: null,
uploadStatus: null,
billNo: null, billNo: null,
workPlaceCode: null, workPlaceCode: null,
page: 1, page: 1,
@ -544,8 +545,8 @@ export default {
}, },
created() { created() {
this.filterQuery.tagStatus = this.tagStatus this.filterQuery.tagStatus = this.tagStatus
this.filterQuery.uploadStatus = this.uploadStatus.toString() this.filterQuery.uploadStatus = String(this.status)
if (this.uploadStatus == 2) { if (this.status == 2) {
this.filterQuery.uploadStatusName = '已上传' this.filterQuery.uploadStatusName = '已上传'
} }
if (this.$route.query.workplaceId != null) { if (this.$route.query.workplaceId != null) {

Loading…
Cancel
Save