同海报表 + 客户资料报表修改

src/components/report-dialog/main.vue

@@ -84,6 +84,9 @@ export default {
     },
     reportId: {
       type: String
+    },
+    searchValue:{
+      type:Object
     }
   },
   filters: {
@@ -117,9 +120,29 @@ export default {
       });
     },
     goReport(name) {
-      this.$router.push({
-        path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}&id=${this.reportId}`
-      });
+      let tenantId = this.$store.getters.userInfo.tenant_id
+      if(this.reportName == "同海-统计列表"){
+        this.$router.push({
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}
+          &tenantId=${this.searchValue.tenantId}
+          &status=${this.searchValue.status}
+           &cornId=${this.searchValue.cornId}
+      &deptid=${this.searchValue.deptid}
+      &pname=${this.searchValue.pname}
+      &projectType=${this.searchValue.projectType}
+      &payStartTime=${this.searchValue.payStartTime}
+      &payEndTime=${this.searchValue.payEndTime}
+      &userName=${this.searchValue.userName}`
+        });
+      }else if(name == "客户资料-客户资料.ureport.xml"){
+        this.$router.push({
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}&id=${this.reportId}&tenantId=${tenantId}`
+        });
+      }else{
+        this.$router.push({
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}&id=${this.reportId}`
+        });
+      }
       this.$emit("onClose", false);
     }
   },

src/views/workManagement/receipt/statisticalList.vue

@@ -26,6 +26,14 @@
           @click.stop="downFile"
         >导 出
         </el-button>
+        <el-button
+          icon="el-icon-printer"
+          size="small"
+          type="primary"
+          :loading="exportLoading"
+          @click.stop="statement"
+        >报表
+        </el-button>
       </template>
       <template slot="cornIdSearch">
         <select-component
@@ -65,8 +73,8 @@
     </avue-crud>
     <report-dialog
       :switchDialog="switchDialog"
-      :reportId="form.id"
-      reportName="统计列表"
+      :searchValue="statementData"
+      :reportName="'同海-统计列表'"
       @onClose="onClose()"
     ></report-dialog>
   </basic-container>
@@ -87,6 +95,7 @@
         loading:false,
         form: {},
         search:{},
+        statementData:{},
         exportLoading:false,
         option: option,
         parentId:0,
@@ -162,6 +171,18 @@
             this.exportLoading = false
         })
       },
+      statement(){
+        this.statementData = this.paramsAdjustment(this.search)
+        if(this.statementData.status === "0,1,2,3,4,5,6,7,8"){
+          this.statementData.status = ""
+        }
+        if(this.statementData.payTime && this.statementData.payTime.length === 0){
+          this.statementData.payStartTime = ""
+          this.statementData.payEndTime = ""
+        }
+        this.statementData.tenantId = this.$store.getters.userInfo.tenant_id
+        this.switchDialog =! this.switchDialog;
+      },
       rowDel() {
 
       },