Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/platformFinancial.vue

@@ -2,6 +2,9 @@
 /deep/.el-table th.el-table__cell{
   background-color: #E6E6E6;
 }
+/deep/.eltableBox .el-table .el-table__cell{
+  padding: 5px 0;
+}
 
 </style>
 
@@ -62,20 +65,30 @@
       </div>
 
 
-      <div style="display: flex;flex-wrap: nowrap; padding: 10px;">
-        <div style="float:left;display: flex;flex-wrap: nowrap; padding: 10px;">
-          <div style="display: flex;flex-wrap: wrap; ">
-
-                    <template v-if="multipleSelection.length>0">
+      <div class="eltableBox"  style="padding-top: 1px; padding-bottom: 10px;">
+        <!-- <div style="float:left;display: flex;flex-wrap: nowrap; padding: 10px;">
+           <div style="display: flex;flex-wrap: wrap; ">
+                     <template v-if="multipleSelection.length>0">
                       <el-tag size="small"
-                      style="margin-right: 5px;margin-bottom: 5px;"
-                      v-for="(x,index) in multipleSelection" :key="x.FrID" :type="x.Type==0?'danger':''">
-                      {{x.Alias}}：{{x.TotalMoney}}
-                    </el-tag>
+                       style="margin-right: 5px;margin-bottom: 5px;"
+                       v-for="(x,index) in multipleSelection" :key="x.FrID" :type="x.Type==0?'danger':''">
+                       {{x.Alias}}：在途{{x.TotalMoney}}、可提现{{x.RemitMoney}}、已申请{{x.InvoiceMoney}}、待申请{{x.WaitMoney}}
+                     </el-tag>
                     </template>
                   </div>
-
-        </div>
+         </div>-->
+        <el-table :data="multipleSelection" stripe max-height="400px" highlight-current-row>
+          <el-table-column prop="Alias" label="平台名称" >
+          </el-table-column>
+          <el-table-column prop="TotalMoney" label="在途总额" sortable>
+          </el-table-column>
+          <el-table-column prop="RemitMoney" label="可提现" sortable>
+          </el-table-column>
+          <el-table-column prop="InvoiceMoney" label="已申请" sortable>
+          </el-table-column>
+          <el-table-column prop="WaitMoney" label="待申请" sortable>
+          </el-table-column>
+        </el-table>
 
       </div>
 
@@ -282,32 +295,7 @@
             :label="$t('fnc.dqzhuangtai')"
             show-overflow-tooltip width="100">
             <template slot-scope="scope">
-              <i v-if="scope.row.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
-              <i v-if="scope.row.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i>
-              <i v-if="scope.row.Status==2" class="iconfont icon-yiqueren" style="color: #959595"></i>
-              <i  v-if="scope.row.Status==3" class="iconfont icon-shenhebohui" style="color: #E95252"></i>
-              <i  v-if="scope.row.Status==0" class="iconfont icon-zancun" style="color: #FF9C01"></i>
-              <el-popover
-                  popper-class="detailsIT_Journal"
-                  width="250"
-                  trigger="click">
-                      <div style="height: auto;max-height: 220px;background-color: #FFFFFF;">
-                          <div class="changLog">
-                              <p class="_log_t">{{$t('fnc.lcrizhi')}}</p>
-                              <ul style="padding-left: 20px;max-height: 180px;overflow: auto;" v-if="GetFinancLogList" v-loading='LogLoading'>
-                                  <li style="border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;" v-for="(log,li) in GetFinancLogList">
-                                      <span style="background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;"></span>
-                                      <p> <span class="_color_blue">{{log.EmName}}</span>  <span class="fr changLog_time">{{log.UpdateDate}}</span> </p>
-                                      <p class="_dtel">{{log.StartValue}}</p>
-                                  </li>
-                              </ul>
-                              <ul v-else>
-                                  <li>{{$t('fnc.zwxgrizhi')}}</li>
-                              </ul>
-                          </div>
-                      </div>
-                  <span slot="reference" class="text_d _font_init"  @click="Financial_post_GetFinancLogList(scope.row.FrID)">{{scope.row.StatusStr}}</span>
-              </el-popover>
+              <span slot="reference" class="text_d _font_init" :style="(scope.row.EfficaciousStatus==1?'color:red':'')">{{scope.row.StatusStr}}</span>
             </template>
             </el-table-column>
 
@@ -649,10 +637,10 @@ export default {
           if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
           if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
           this.loading= true;
-          this.apipost('Financial_post_GetPlatformStatisticsList',this.msg,res=>{
+          this.apipost('Financial_post_GetPlatformSumStatistics',this.msg,res=>{
               if(res.data.resultCode == 1) {
                   let data = res.data.data;
-                this.multipleSelection=data;
+                  this.multipleSelection=data;
                   this.loading=false;
               }else{
                   this.loading= false;
@@ -816,18 +804,6 @@ export default {
           this.getPageList();
           this.getStatisticsList();
       },
-      getMoney(){
-        let Money = 0
-        this.multipleSelection.forEach(x=>{
-          x.DetailList.forEach(y=>{
-            if(y.CostTypeId!=114){
-              Money += (y.OriginalMoney*100)
-            }
-          })
-
-        })
-        return Money/100
-      }
   }
 }
 </script>