From 2150dc4b637e3b6b43f376b842b34d94095d5574 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 20 Sep 2024 10:36:10 +0800
Subject: [PATCH] =?UTF-8?q?9/20=20=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderUpload.vue | 4 ++--
 src/views/collect/DealOrder.vue          | 1 +
 src/views/collect/PanelOrderUpload.vue   | 7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

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"
         ></prescribePanel>
       </el-tab-pane>
       <el-tab-pane label="已上传单" name="second">
@@ -22,7 +22,7 @@
           :RowType="type"
           :workPlaceCode="workPlaceCode"
           :buttonType="2"
-          :uploadStatus="2"
+          :status="2"
         ></prescribePanel>
       </el-tab-pane>
     </el-tabs>
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) {