1

src/components/FinancialModule/ReportForm/dianshangannualRatio.vue

@@ -49,9 +49,9 @@
             </div>
             <div style="width:1px;  overflow-x:scroll;flex:1" >
             <table class="singeRowTable TcNewTable" border="1" cellspacing="0" cellpadding="0" :style="{width: YearSListwidth+'px'}">
-                <tr > <td  style="font-size: 12px;" v-for='(x,y) in YearSList' :key = 'y'>{{x.Date}}</td></tr>
+                <tr > <td  style="font-size: 12px;" v-for='(x,y) in YearSList' :key = 'y' @click='goyearurl(x)'>{{x.Date}}</td></tr>
                 <tr v-for='(item,index) in leftData' :key = 'index'> 
-                    <td :class="x.Date.indexOf('成長率')!=-1?'growthrate':'yearstyle'" style="font-size: 12px;" v-for='(x,y) in YearSList' :key = 'y' @click='goyearurl(x)'>
+                    <td :class="x.Date.indexOf('成長率')!=-1?'growthrate':'yearstyle'" style="font-size: 12px;" v-for='(x,y) in YearSList' :key = 'y' >
                         <span :style="{color: getisred(x[item.DataObj]) == true?'#FD0F05':'#111111'}">{{x[item.DataObj]}}</span>
                     </td>
                 </tr>            
@@ -68,9 +68,9 @@
             </div>
             <div style="width:1px;  overflow-x:scroll;flex:1" >
             <table class="singeRowTable TcNewTable" border="1" cellspacing="0" cellpadding="0" :style="{width: YearSListwidth+'px'}">
-                <tr > <td  style="font-size: 12px;" v-for='(x,y) in YearAvgSList' :key = 'y'>{{x.Date}}</td></tr>
+                <tr > <td  style="font-size: 12px;" v-for='(x,y) in YearAvgSList' :key = 'y' @click='goyearurl(x)'>{{x.Date}}</td></tr>
                 <tr v-for='(item,index) in leftData_t' :key = 'index'> 
-                    <td :class="x.Date.indexOf('成長率')!=-1?'growthrate':'yearstyle'" style="font-size: 12px;" v-for='(x,y) in YearAvgSList' :key = 'y' @click='goyearurl(x)'>
+                    <td :class="x.Date.indexOf('成長率')!=-1?'growthrate':'yearstyle'" style="font-size: 12px;" v-for='(x,y) in YearAvgSList' :key = 'y' >
                         <span :style="{color: getisred(x[item.DataObj]) == true?'#FD0F05':'#111111'}">{{x[item.DataObj]}}</span>
                     </td>
                 </tr>            
@@ -87,9 +87,9 @@
             </div>
             <div style="width:1px;  overflow-x:scroll;flex:1" >
             <table class="singeRowTable TcNewTable" border="1" cellspacing="0" cellpadding="0" :style="{width: YearSListwidth+'px'}">
-                <tr > <td  style="font-size: 12px;" v-for='(x,y) in YearRateSList' :key = 'y'>{{x.Date}}</td></tr>
+                <tr > <td  style="font-size: 12px;" v-for='(x,y) in YearRateSList' :key = 'y' @click='goyearurl(x)'>{{x.Date}}</td></tr>
                 <tr v-for='(item,index) in leftData_tr' :key = 'index'> 
-                    <td :class="x.Date.indexOf('成長率')!=-1?'growthrate':'yearstyle'" style="font-size: 12px;" v-for='(x,y) in YearRateSList' :key = 'y' @click='goyearurl(x)'>
+                    <td :class="x.Date.indexOf('成長率')!=-1?'growthrate':'yearstyle'" style="font-size: 12px;" v-for='(x,y) in YearRateSList' :key = 'y'>
                         <span :style="{color: getisred(x[item.DataObj]) == true?'#FD0F05':'#111111'}">{{x[item.DataObj]}}%</span>
                     </td>
                 </tr>            
@@ -108,9 +108,9 @@
             </div>
             <div style="width:1px;  overflow-x:scroll;flex:1" >
             <table class="singeRowTable TcNewTable" border="1" cellspacing="0" cellpadding="0" :style="{width: YearSListwidth+'px'}">
-                <tr > <td  style="font-size: 12px;" v-for='(x,y) in YearAvgSList' :key = 'y'>{{x.Date}}</td></tr>
+                <tr > <td  style="font-size: 12px;" v-for='(x,y) in YearAvgSList' :key = 'y' @click='goyearurl(x)'>{{x.Date}}</td></tr>
                 <tr v-for='(item,index) in leftData_t' :key = 'index'> 
-                    <td :class="x.Date.indexOf('成長率')!=-1?'growthrate':'yearstyle'" style="font-size: 12px;" v-for='(x,y) in YearAvgSList' :key = 'y' @click='goyearurl(x)'>
+                    <td :class="x.Date.indexOf('成長率')!=-1?'growthrate':'yearstyle'" style="font-size: 12px;" v-for='(x,y) in YearAvgSList' :key = 'y' >
                         <span :style="{color: getisred(x[item.DataObj]) == true?'#FD0F05':'#111111'}">{{x[item.DataObj]}}</span>
                     </td>
                 </tr>            
@@ -127,9 +127,9 @@
             </div>
             <div style="width:1px;  overflow-x:scroll;flex:1" >
             <table class="singeRowTable TcNewTable" border="1" cellspacing="0" cellpadding="0" :style="{width: YearSListwidth+'px'}">
-                <tr > <td  style="font-size: 12px;" v-for='(x,y) in YearRateSList' :key = 'y'>{{x.Date}}</td></tr>
+                <tr > <td  style="font-size: 12px;" v-for='(x,y) in YearRateSList' :key = 'y' @click='goyearurl(x)'>{{x.Date}}</td></tr>
                 <tr v-for='(item,index) in leftData_tr' :key = 'index'> 
-                    <td :class="x.Date.indexOf('成長率')!=-1?'growthrate':'yearstyle'" style="font-size: 12px;" v-for='(x,y) in YearRateSList' :key = 'y' @click='goyearurl(x)'>
+                    <td :class="x.Date.indexOf('成長率')!=-1?'growthrate':'yearstyle'" style="font-size: 12px;" v-for='(x,y) in YearRateSList' :key = 'y' >
                         <span :style="{color: getisred(x[item.DataObj]) == true?'#FD0F05':'#111111'}">{{x[item.DataObj]}}%</span>
                     </td>
                 </tr>            

src/components/FinancialModule/ReportForm/dianshangyeardata.vue

@@ -39,11 +39,11 @@
       <div style="padding: 15px ;background: #FFF;margin-bottom: 50px;">
    
         <el-table :data="DataList" v-loading="loading"  header-cell-class-name="headClass" header-row-class-name='angclass' 
-          style="width: 100%;" border :row-class-name="tableRowClassName" :cell-style="columnStyle" @row-click="clickTr">
+          style="width: 100%;" border :row-class-name="tableRowClassName" :cell-style="columnStyle" >
           <el-table-column label="月份" prop="Date" width='80' fixed>
             <template slot-scope="scope">
               <span v-if="scope.row.Date == '平均/总计'" >平均</span>
-              <span v-else>{{scope.row.Date}}</span>
+              <span v-else @click="clickTr(scope.row)">{{scope.row.Date}}</span>
             </template>
           </el-table-column>
           <el-table-column label="平均付款人数(天)" prop='MAvgPeopleNum' width='125'>
@@ -138,11 +138,11 @@
           </el-table-column>       
       </el-table>
       <el-table :data="DataList" v-loading="loading"  header-cell-class-name="headClass" header-row-class-name='angclass' style="width: 100%;margin-top: 20px;" border
-         :row-class-name="tableRowClassName2" :cell-style="columnStyle" @row-click="clickTr">
+         :row-class-name="tableRowClassName2" :cell-style="columnStyle" >
         <el-table-column label="月份" prop="Date" width='80' fixed>
           <template slot-scope="scope">
             <span v-if="scope.row.Date == '平均/总计'" >总计</span>
-            <span v-else>{{scope.row.Date}}</span>
+            <span v-else @click="clickTr(scope.row)">{{scope.row.Date}}</span>
           </template>
         </el-table-column>
         <el-table-column label="付款人数累计" prop="PeopleNum" width='120'>
@@ -219,9 +219,9 @@
         </div>
         <div style="width:1px;  overflow:scroll;flex:1" >
           <table class="singeRowTable TcNewTable" border="1" cellspacing="0" cellpadding="0" :style="{width: tablewidth+'px'}">
-              <tr > <td class="qthuanbicheng" style="width:90px;font-size: 12px;" v-for='(x,y) in RateList' :key = 'y'>{{x.Date}}</td></tr>
+              <tr > <td class="qthuanbicheng" style="width:90px;font-size: 12px;" v-for='(x,y) in RateList' :key = 'y' @click='goMonthurl(x)'>{{x.Date}}</td></tr>
               <tr v-for='(item,index) in leftData' :key = 'index'> 
-                <td :class="x.Date.indexOf('成長率')!=-1?'growthrate':'yearstyle'" style="font-size: 12px;" v-for='(x,y) in RateList' :key = 'y' @click='goMonthurl(x)'>
+                <td :class="x.Date.indexOf('成長率')!=-1?'growthrate':'yearstyle'" style="font-size: 12px;" v-for='(x,y) in RateList' :key = 'y' >
                     <span :style="{color: getisred(x[item.DataObj]) == true?'#FD0F05':'#111111'}">{{x[item.DataObj]}}%</span>
                 </td>
               </tr>     
@@ -302,11 +302,11 @@
             this.Info('结束月份不能大于开始月份')
             return
           }
-          if((new Date(this.msg.EndTime).getTime())>=(new Date()).getTime()){
-            this.msg.EndTime='';
-            this.Info('结束月份不能大于这个月')
-            return
-          }
+          // if((new Date(this.msg.EndTime).getTime())>=(new Date()).getTime()){
+          //   this.msg.EndTime='';
+          //   this.Info('结束月份不能大于这个月')
+          //   return
+          // }
           this.loading = true;
           this.RateList=[];
           this.mallapipost("/api/LiveHouse/GetDSMoreMonthStatistics", this.msg, res => {
@@ -380,8 +380,8 @@
               return 'background:#FFF;'
           }
         },
-        clickTr(row, event, column){
-          if(row.Date.indexOf('平均/总计')==-1){
+        clickTr(row,){
+          
           this.$router.push({
             name: 'onlineRetailersdata',
             query: {
@@ -389,7 +389,7 @@
               blank:'y'
             }
           });
-          }
+          
         },
         goMonthurl(row){
           console.log(row)
@@ -553,10 +553,10 @@
       background: #F6C8AB;
     }
     .dianshangyeardata .el-table .monthstyel2{
-      background: #F6CAAD;
+      background: #FDC022;
     }
     .dianshangyeardata .el-table .monthstyel3{
-      background: #FE9A6B;
+      background: #FFF2CC;
     }
     
     .dianshangyeardata .el-table .whitestyle{

src/components/FinancialModule/ReportForm/onlineRetailersdata.vue

@@ -538,7 +538,7 @@
       background: #9DC2E4;
     }
     .onlineRetailersdata .el-table .qthuanbicheng{
-      background: #FEFF30;
+      background: #FFF2CC;
     }
     .onlineRetailersdata .el-table .monthstyel{
       background: #F6CAAD;