简易报表

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -85,6 +85,7 @@
         @on-custom-comp="customCompFunc"
         @sort-change="sortChange"
         :row-click="rowClick"
+        :row-dblclick="rowDbClick"
       >
       </v-table>
     </div>
@@ -279,7 +280,6 @@ Vue.component("LiuYueJump", {
   },
  methods: {
     goUrl(path,month,year,BranchId, ids) {
-      console.log(123)
       this.$router.push({
         path: "/" + path,
         query: { 
@@ -552,7 +552,7 @@ export default {
           result: [],
           type: "select",
           isFrozen: false,
-          // componentName: "YiYueJump"
+          componentName: "YiYueJump"
         },
         {
           field: "ErYue",
@@ -853,8 +853,15 @@ export default {
         }
       });
     },
+    rowDbClick(rowIndex,rowData,column){
+    //   console.log("rowIndex",rowIndex)
+      // console.log("rowData",rowData)
+      // console.log("column",column)
+    },
     rowClick(rowIndex,rowData,column){
+      console.log("column",column)
       var that = this;
+      return;
       let startDate=that.year+"-"+column.start;
       let endDate="";
       let BranchId=that.msg.BranchId;
@@ -885,9 +892,10 @@ export default {
         if(rowData.ZhaiYao=="员工提成"){
           if(Number(this.year)==2019){
             
-            if(column.title=="八月" || column.title=="九月" || column.title=="十月" || column.title=="十一月" || column.title=="十二月"){
+            if(column.title=="十月" || column.title=="十一月" || column.title=="十二月"){
               let CostIds="";
               CostIds=rowData.CostIds.replace('112,', '');
+              CostIds=CostIds.replace('16,', '');
               that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,CostIds)
             }
             else{
@@ -899,6 +907,7 @@ export default {
           else if(Number(this.year)>2019){
               let CostIds="";
               CostIds=rowData.CostIds.replace('112,', '');
+              CostIds=CostIds.replace('16,', '');
               that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,CostIds)
 
           }
@@ -952,7 +961,6 @@ export default {
 
     },
     customCompFunc: function(param) {
-      console.log(param);
     },
     columnCellClass: function(rowIndex, columnName, rowData) {
       if(rowData.YiYue < 0 && columnName=="YiYue"){
@@ -1151,7 +1159,19 @@ export default {
           data.sharelist.forEach((x, i) => {
             this.monthList[i].value = x.Money
           })
-          this.DataList = data.list
+          // this.DataList = data.list;
+          let tichengList=[];
+          this.DataList=[];
+          data.list.forEach(item=>{
+            if(item.ZhaiYao!="销售提成" && item.ZhaiYao!="原始提成"){
+              this.DataList.push(item)
+            }else{
+              tichengList.push(item);
+            }
+
+          })
+          console.log("DataList",this.DataList)
+          console.log("tichengList",tichengList)
           this.UpdateStaus=data.Status;
           this.UpdateStartTime=data.UpdateStartTime;
           this.UpdateEndTime=data.UpdateEndTime;