1

src/pages/financial/EasyReport.vue

@@ -37,6 +37,10 @@
   .column-cell-class-name-test-lan-s .v-table-body-cell {
     background-color: #9cf;
   }
+ .page_EasyReport .column-cell-class-name-test-red-new{
+    background: #e95252;
+    color:#FFF;
+  }
 
 </style>
 <template>
@@ -96,7 +100,7 @@
     //  团队跳转
     template: `
   <div class="gourl_span">
-  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',1,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.YiYue}}</span>
+  <span style="cursor: pointer" v-if="rowData.CostTypeIds && rowData.CostTypeIds!=''" @click="goUrl('JumpReport',1,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.YiYue}}</span>
   <span style="cursor: pointer" v-else>{{rowData.YiYue}}</span>
   </div>`,
     props: {
@@ -130,7 +134,7 @@
     //  团队跳转
     template: `
    <div class="gourl_span">
-  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',2,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ErYue}}</span>
+  <span style="cursor: pointer" v-if="rowData.CostTypeIds && rowData.CostTypeIds!=''" @click="goUrl('JumpReport',2,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.ErYue}}</span>
   <span style="cursor: pointer" v-else>{{rowData.ErYue}}</span>
   </div>`,
     props: {
@@ -163,7 +167,7 @@
   Vue.component("SanYueJump", {
     //  团队跳转
     template: ` <div class="gourl_span">
-  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',3,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SanYue}}</span>
+  <span style="cursor: pointer" v-if="rowData.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',3,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.SanYue}}</span>
   <span style="cursor: pointer" v-else>{{rowData.SanYue}}</span>
   </div>`,
     props: {
@@ -196,7 +200,7 @@
   Vue.component("SiYueJump", {
     //  团队跳转
     template: ` <div class="gourl_span">
-  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',4,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SiYue}}</span>
+  <span style="cursor: pointer" v-if="rowData.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',4,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.SiYue}}</span>
   <span style="cursor: pointer" v-else>{{rowData.SiYue}}</span>
   </div>`,
     props: {
@@ -229,7 +233,7 @@
   Vue.component("WuYueJump", {
     //  团队跳转
     template: ` <div class="gourl_span">
-  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',5,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.WuYue}}</span>
+  <span style="cursor: pointer" v-if="rowData.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',5,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.WuYue}}</span>
   <span style="cursor: pointer" v-else>{{rowData.WuYue}}</span>
   </div>`,
     props: {
@@ -262,7 +266,7 @@
   Vue.component("LiuYueJump", {
     //  团队跳转
     template: ` <div class="gourl_span">
-  <span style="cursor: pointer;" v-if="rowData.CostIds" @click="goUrl('JumpReport',6,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.LiuYue}}</span>
+  <span style="cursor: pointer;" v-if="rowData.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',6,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.LiuYue}}</span>
   <span style="cursor: pointer" v-else>{{rowData.LiuYue}}</span>
   </div>`,
     props: {
@@ -295,7 +299,7 @@
   Vue.component("QiYueJump", {
     //  团队跳转
     template: ` <div class="gourl_span">
-  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',7,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.QiYue}}</span>
+  <span style="cursor: pointer" v-if="rowData.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',7,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.QiYue}}</span>
   <span style="cursor: pointer" v-else>{{rowData.QiYue}}</span>
   </div>`,
     props: {
@@ -328,7 +332,7 @@
   Vue.component("BaYueJump", {
     //  团队跳转
     template: ` <div class="gourl_span">
-  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',8,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.BaYue}}</span>
+  <span style="cursor: pointer" v-if="rowData.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',8,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.BaYue}}</span>
   <span style="cursor: pointer" v-else>{{rowData.BaYue}}</span>
   </div>`,
     props: {
@@ -361,7 +365,7 @@
   Vue.component("JiuYueJump", {
     //  团队跳转
     template: ` <div class="gourl_span">
-  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',9,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.JiuYue}}</span>
+  <span style="cursor: pointer" v-if="rowData.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',9,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.JiuYue}}</span>
   <span style="cursor: pointer" v-else>{{rowData.JiuYue}}</span>
   </div>`,
     props: {
@@ -394,7 +398,7 @@
   Vue.component("ShiYueJump", {
     //  团队跳转
     template: ` <div class="gourl_span">
-  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',10,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYue}}</span>
+  <span style="cursor: pointer" v-if="rowData.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',10,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.ShiYue}}</span>
   <span style="cursor: pointer" v-else>{{rowData.ShiYue}}</span>
   </div>`,
     props: {
@@ -427,7 +431,7 @@
   Vue.component("ShiYiYueJump", {
     //  团队跳转
     template: ` <div class="gourl_span">
-  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',11,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYiYue}}</span>
+  <span style="cursor: pointer" v-if="rowData.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',11,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.ShiYiYue}}</span>
   <span style="cursor: pointer" v-else>{{rowData.ShiYiYue}}</span>
   </div>`,
     props: {
@@ -460,7 +464,7 @@
   Vue.component("ShiErYueJump", {
     //  团队跳转
     template: ` <div class="gourl_span">
-  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',12,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiEr}}</span>
+  <span style="cursor: pointer" v-if="rowData.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',12,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.ShiEr}}</span>
   <span style="cursor: pointer" v-else>{{rowData.ShiEr}}</span>
   </div>`,
     props: {
@@ -853,15 +857,21 @@
         })
       },
       GoUrlFan(path, month, year, BranchId, ids) {
-        this.$router.push({
-          path: "/financial/" + path,
-          query: {
+        // this.$router.push({
+        //   path: "/financial/" + path,
+        //   query: {
+        //     year: year,
+        //     month: month,
+        //     BranchId: BranchId,
+        //     CostIds: ids,
+        //     blank: "y"
+        //   }
+        // });
+        this.OpenNewUrl('/financial/'+ path, {
             year: year,
             month: month,
             BranchId: BranchId,
             CostIds: ids,
-            blank: "y"
-          }
         });
       },
       rowDbClick(rowIndex, rowData, column) {
@@ -879,7 +889,7 @@
         } else {
           endDate = that.year + "-" + column.end
         }
-        if (rowIndex < 8) {
+        if (rowIndex < 6 ) {
           // 联运收入
           // if(rowData.ZhaiYao=="联运收入"){
           //   that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入")
@@ -891,34 +901,34 @@
           // else if(rowData.ZhaiYao=="营业总成本"){
           //   that.goUrl("RecPayQueryTeamV2",startDate,endDate,BranchId,"应付团款查询")
           // }
-          that.$router.push({
-            path: "/financial/TeamRevenueReport",
-            query: {
+          if(column.title!='合计' && column.title!="摘要"){
+            this.OpenNewUrl('/financial/reportform/RecPayQueryTeam', {
               StartTime: startDate,
-              EndTime: endDate,
-              BranchId: BranchId,
-              blank: "y"
-            }
-          });
+                EndTime: endDate,
+            });
+          }
+            
+       
+          
         } else {
           if (rowData.ZhaiYao == "员工提成") {
             if (Number(this.year) == 2019) {
 
               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)
+                let CostTypeIds = "";
+                CostTypeIds = rowData.CostTypeIds.replace('112,', '');
+                CostTypeIds = CostTypeIds.replace('16,', '');
+                that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, CostTypeIds)
               } else {
-                that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostIds)
+                that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
               }
             } 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)
+              let CostTypeIds = "";
+              CostTypeIds = rowData.CostTypeIds.replace('112,', '');
+              CostTypeIds = CostTypeIds.replace('16,', '');
+              that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, CostTypeIds)
             } else {
-              that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostIds)
+              that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
             }
           } else if (rowData.ZhaiYao == "歐洲與南亞損失分攤") {
             that.goUrl("AirTicketLoss", startDate, endDate, BranchId, "机票分摊")
@@ -930,7 +940,7 @@
                   year: rowData.Year,
                   month: month,
                   BranchId: rowData.BranchId,
-                  CostIds: rowData.CostIds,
+                  CostIds: rowData.CostTypeIds,
                   "IsJapanNonbusinessIncome": 1,
                   blank: "y"
                 }
@@ -944,17 +954,21 @@
                   year: rowData.Year,
                   month: month,
                   BranchId: rowData.BranchId,
-                  CostIds: rowData.CostIds,
+                  CostIds: rowData.CostTypeIds,
                   "IsJapanNonbusinessIncome": 1,
                   blank: "y"
                 }
               });
             } else {
-              that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostIds)
+              if(rowData.CostTypeIds && rowData.CostTypeIds !=''){
+                that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
+              }
             }
 
           } else {
-            that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostIds)
+            if(rowData.CostTypeIds && rowData.CostTypeIds !=''){
+              that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
+            }
           }
         }
       },
@@ -998,58 +1012,61 @@
       },
       columnCellClass: function (rowIndex, columnName, rowData) {
         if (rowData.YiYue < 0 && columnName == "YiYue") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.ErYue < 0 && columnName == "ErYue") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.SanYue < 0 && columnName == "SanYue") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.DiYiJiDu < 0 && columnName == "DiYiJiDu") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.SiYue < 0 && columnName == "SiYue") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.WuYue < 0 && columnName == "WuYue") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.LiuYue < 0 && columnName == "LiuYue") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.DiErJiDu < 0 && columnName == "DiErJiDu") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.ShangBanNianBao < 0 && columnName == "ShangBanNianBao") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.QiYue < 0 && columnName == "QiYue") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.BaYue < 0 && columnName == "BaYue") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.JiuYue < 0 && columnName == "JiuYue") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
+        }
+        if (rowData.DiSanJiDu < 0 && columnName == "DiSanJiDu") {
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.ShiYue < 0 && columnName == "ShiYue") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.ShiYiYue < 0 && columnName == "ShiYiYue") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.ShiErYue < 0 && columnName == "ShiErYue") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.DiSiJiDu < 0 && columnName == "DiSiJiDu") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.XiaBanNianBao < 0 && columnName == "XiaBanNianBao") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
         if (rowData.ZongJi < 0 && columnName == "ZongJi") {
-          return "column-cell-class-name-test-red"
+          return "column-cell-class-name-test-red-new"
         }
 
         if (rowData.ZhaiYao == '以下项均不计入计算') {
@@ -1127,7 +1144,7 @@
         }
         if (rowData.ZhaiYao === '营业总毛利' || rowData.ZhaiYao === '歐洲與南亞損失分攤' || rowData.ZhaiYao === '营业税金及附加' || rowData
           .ZhaiYao === '管销费用' || rowData.ZhaiYao === '财务费用' || rowData.ZhaiYao === '营业外收入' || rowData.ZhaiYao ===
-          '其他营业支出') {
+          '其他营业支出'  || rowData.ZhaiYao.indexOf('小计')!=-1) {
           return "column-cell-class-name-test-greed";
         }
         if (rowData.ZhaiYao === '社保') {