111

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -865,7 +865,6 @@ export default {
       }else{
         endDate=that.year+"-"+column.end
       }
-      // console.log("rowData",rowData);
       if(rowIndex<9){
         // 联运收入
         if(rowData.ZhaiYao=="联运收入"){
@@ -883,7 +882,38 @@ export default {
            that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,blank:'y',tab:"营收报表"} })
         }
       }else{
-        if(rowData.CostIds){
+        console.log("rowIndex",rowIndex)
+        console.log("column",column)
+        console.log("year",this.year)
+        console.log("rowData",rowData);
+        if(rowData.ZhaiYao=="员工提成"){
+          if(Number(this.year)==2019){
+            
+            if(column.title=="七月" || column.title=="八月" || column.title=="九月" || column.title=="十月" || column.title=="十一月" || column.title=="十二月"){
+              let CostIds="";
+              CostIds=rowData.CostIds.replace('112,', '');
+              console.log("CostIds",CostIds)
+              that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,CostIds)
+            }
+            else{
+              that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
+
+            }
+
+          }
+          else if(Number(this.year)>2019){
+              let CostIds="";
+              CostIds=rowData.CostIds.replace('112,', '');
+              that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,CostIds)
+
+          }
+          else{
+            that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
+
+          }
+          
+        }
+        else{
           that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
         } 
         

src/components/scenicSpot/ScenTicketOrder.vue

@@ -250,8 +250,8 @@
               <span v-if="item.reFund">{{item.reFund}}</span>
               <span v-else>0</span>
             </td>
-            <td>{{item.discountMoney}}</td>
             <td>{{item.duein}}</td>
+            <td>{{item.discountMoney}}</td>
             <td>
               <span v-if="item.status==1">正常</span>
               <span class="color_red_order" v-if="item.status==2">取消</span>