添加报表跳转

src/components/FinancialModule/ReportForm/MonthReport.vue

@@ -509,6 +509,7 @@ tr._item_list td:last-child {
         :footer="footer"
         :footer-row-height="33"
         :multiple-sort="multipleSort"
+        :row-click="rowClick" 
       >
         <!-- 多个排序 -->
       </v-table>
@@ -646,6 +647,7 @@ export default {
       if (!this.msg.TCID) this.msg.TCID = 0;
       if (this.msg.QStartDate == "") this.msg.QStartDate = "2019";
       this.apipost('financestatistics_get_GetTravelMonthReportList', this.msg, res=>{
+        // console.log(res);
         if (res.data.resultCode == 1) {
           this.DataList = res.data.data;
           this.columns = [
@@ -850,6 +852,27 @@ export default {
       if (field === "FourQuarter") return this.priceFormat(rowData.FourQuarter);
       if (field === "EndHalf") return this.priceFormat(rowData.EndHalf);
       if (field === "Total") return this.priceFormat(rowData.Total );
+    },
+    rowClick(rowIndex,rowData,column){
+      let field=column.field;
+      let StartTime=field+"StartTime";
+      let EndTime=field+`EndTime`;
+      let LineId=Number(rowData.LineId);
+      let OutBranchId=this.msg.OutBranchId;
+      this.$router.push({
+          path: "TeamRevenueReport",
+          query: {
+            LineId:LineId,
+            StartTime:rowData[StartTime],
+            EndTime:rowData[EndTime],
+            OutBranchId:OutBranchId,
+            blank: 'y',
+            tab: '营收报表'
+          }
+        });
+
+
+
     },
     priceFormat(value) {
       if (value == null) {
@@ -973,8 +996,10 @@ export default {
         "admin_get_BranchGetList",
         this.getCompanyMsg,
         res => {
+          console.log("出团公司",res)
           if (res.data.resultCode == 1) {
             this.CompanyList = res.data.data;
+            this.msg.OutBranchId=this.CompanyList[0].Id;
           } else {
           }
         },

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -419,7 +419,7 @@ tr._item_list td:last-child {
                   v-for="item in CompanyList"
                   :label="item.BName"
                   :value="item.Id"
-                  :key="item.Id"
+                  :key="item.BName"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -432,7 +432,7 @@ tr._item_list td:last-child {
                   v-for="item in startCityList1"
                   :label="item.startCityName"
                   :value="item.ID"
-                  :key="item.ID"
+                  :key="item.startCityName"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -445,7 +445,7 @@ tr._item_list td:last-child {
                   v-for="item in LineList"
                   :label="item.LineName"
                   :value="item.LineID"
-                  :key="item.LineID"
+                  :key="item.LineName"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -458,7 +458,7 @@ tr._item_list td:last-child {
                   v-for="item in LineTeamList"
                   :label="item.LtName"
                   :value="item.LtID"
-                  :key="item.LtID"
+                  :key="item.LtName"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -489,21 +489,21 @@ tr._item_list td:last-child {
           <el-col :span="4">
             <el-form-item label="状态：">
               <el-select v-model="msg.QueryCondition" filterable class="w150">
-                <el-option key="-1" value="-1" label="不限"></el-option>
-                <el-option key="0" value="0" label="待收"></el-option>
-                <el-option key="1" value="1" label="退款"></el-option>
-                <el-option key="2" value="2" label="在途"></el-option>
+                <el-option value="-1" label="不限"></el-option>
+                <el-option value="0" label="待收"></el-option>
+                <el-option value="1" label="退款"></el-option>
+                <el-option value="2" label="在途"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="数据类别：">
               <el-select v-model="msg.DataType" filterable class="w150">
-                <el-option key="-1" value="-1" label="不限"></el-option>
-                <el-option key="0" value="1" label="团队营收"></el-option>
-                <el-option key="2" value="3" label="单办签证"></el-option>
-                <el-option key="1" value="2" label="国际机票"></el-option>
-                <el-option key="2" value="5" label="散卖机票"></el-option>
+                <el-option value="-1" label="不限"></el-option>
+                <el-option value="1" label="团队营收"></el-option>
+                <el-option value="3" label="单办签证"></el-option>
+                <el-option value="2" label="国际机票"></el-option>
+                <el-option value="5" label="散卖机票"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -1342,7 +1342,32 @@ export default {
       AALloading: false
     };
   },
-  created() {},
+  created() {
+    this.msg.startDate=this.$route.query.StartTime!=undefined?this.$route.query.StartTime:'';
+    this.msg.endDate=this.$route.query.EndTime!=undefined?this.$route.query.EndTime:'';
+    this.msg.LineId=this.$route.query.LineId!=undefined?Number(this.$route.query.LineId):'';
+    this.productionDate[0]=this.msg.startDate;
+    this.productionDate[1]=this.msg.endDate;
+    if(this.msg.LineId>0){
+      this.msg.DataType="1";
+    }
+    if(this.msg.LineId==-1){
+      this.msg.DataType="-1";
+      this.msg.OutBranchId=45;
+    }
+    if(this.msg.LineId==-2){
+      this.msg.DataType="2";
+    }
+    if(this.msg.LineId==-3){
+      this.msg.DataType="5";
+    }
+    if(this.msg.LineId==-4){
+      this.msg.DataType="3";
+    }
+        // startDate: "",
+        // endDate: "",
+    // this.msg.lineID=this.$route.query.lineID;
+  },
   components: {},
   mounted() {
     let allH, allW, cH, cW;
@@ -1354,10 +1379,10 @@ export default {
     let userInfo = this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
     this.userId = userInfo.EmployeeId;
-    this.getCompanyList();
-    this.getPageList();
+    this.getCompanyList();   
     this.getLineList();
     this.getStartList1();
+    this.getPageList();
   },
   methods: {
     goEasyReport: function() {
@@ -1509,7 +1534,6 @@ export default {
 
       // 组装表格内容
       dataSource.forEach((x, index) => {
-        console.log(index);
         let obj = [];
         obj.push(x.FrID + " ");
         obj.push(x.TCNUM);
@@ -1602,8 +1626,6 @@ export default {
       const wb = XLSX.utils.book_new();
       XLSX.utils.book_append_sheet(wb, ws, xlsxName);
       var dataInfo = wb.Sheets[wb.SheetNames[0]];
-      console.log(data[0].length);
-      console.log(colName.length);
       // return
       data[0].forEach((x, i) => {
         dataInfo[colName[i] + "1"].s = {
@@ -1720,7 +1742,6 @@ export default {
           if (res.data.resultCode == 1) {
             this.startCityList1 = res.data.data;
           } else {
-            console.log(res.data);
           }
         }
       );
@@ -1785,6 +1806,7 @@ export default {
     // 数据筛选
     filterMethod(filters) {
       console.log(filters);
+      
       // let tableData = this.DataList;
       // if (filters.FrID && filters.FrID.length>0){
 
@@ -1823,6 +1845,7 @@ export default {
       if (!this.msg.LineTeamId) this.msg.LineTeamId = 0;
       if (!this.msg.TCID) this.msg.TCID = 0;
       if (this.msg.startDate == "") this.msg.startDate = "2019-01-01";
+      console.log("this.msg",this.msg);
       this.apipost(
         "financestatistics_post_GetPageList",
         this.msg,
@@ -1885,6 +1908,7 @@ export default {
         "admin_get_BranchGetList",
         this.getCompanyMsg,
         res => {
+          console.log("出团gongsi",res)
           if (res.data.resultCode == 1) {
             this.CompanyList = res.data.data;
           } else {