From 3f647c4cd51affa7fcee8c1b867ead94be9a1cdb Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Thu, 25 May 2023 17:02:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/ReportDetail.vue             |  2 +-
 .../reportProcess/components/reportForm.vue   | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/views/Report/ReportDetail.vue b/src/views/Report/ReportDetail.vue
index 1815a61..1b9c589 100644
--- a/src/views/Report/ReportDetail.vue
+++ b/src/views/Report/ReportDetail.vue
@@ -283,7 +283,7 @@ export default {
       //     cancelButtonText: '取消',
       //     type: 'warning'
       // }).then(() => {
-      this.$api.report.reportDownload({fileId:  this.file.fileId, reportId: this.row.id}).then(res => {
+      this.$api.report.reportDownload({ reportId: this.row.id}).then(res => {
         downloadFile(res)
       })
       // })
diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue
index 2826129..64df28a 100644
--- a/src/views/reportProcess/components/reportForm.vue
+++ b/src/views/reportProcess/components/reportForm.vue
@@ -152,7 +152,7 @@
           :current-page="q.pageNo"
           :page-sizes="[5, 10, 20]"
           :page-size="q.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
+          layout="total, sizes, prev, pager, next"
           :total="total"/>
       </div>
     </el-dialog>
@@ -541,7 +541,7 @@ export default {
     onSuccess(res, file,fileList){
         if(res.ok){
           // this.fileList.push({url:res.data.fullurl})//以前的错误代码
-          debugger
+
           this.fileList=fileList
           this.form.fileList = this.fileList.map(item=>{
             return {
@@ -549,14 +549,12 @@ export default {
               fileName:item.response?item.response.data.name:item.name
             }
           })
-          this.fileList= this.form.fileList.map(item=>{
-            return {
-              id:item.fileId,
-              name:item.fileName
-            }
-          })
+
           this.$refs.processFormRef.clearValidate(['fileList'])
-          this.handleCurrentChange(1)
+          if( this.form.fileList[fileList.length-1].fileId  ){
+            this.handleCurrentChange(1)
+            console.log( this.form.fileList,"444")
+          }
         }
       console.log( res," this.fileList3")
     },
@@ -717,8 +715,7 @@ export default {
   text-align: left;
 }
 .table {
-  width: 500px;
-  margin: 0 14px 0 13px;
+
   min-height: 200px;
   ::v-deep .vxe-table--body-wrapper{
     height: 200px;