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

src/components/FinancialModule/DataAnalysis/components/platfromIncome.vue

+<template>
+  <div style="margin-bottom: 20px; ">
+    <div style="display: flex;align-items: center;">
+      <h3 class="text-center" style="margin-bottom: 5px;">{{$t('objFill.v101.FinancialModule.gongstj')}}</h3>
+    </div>
+
+    <el-table
+    :data="BranchAnalysisData"
+    style="width: 100%;"
+    class="LineAnalysisDataBJ">
+        <el-table-column
+          prop="BName"
+          label="公司"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+              {{scope.row.BName}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="Money"
+          label="总收款"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.Money}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="AgoMoney"
+          label="平台收款"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.AgoMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="Rate"
+          label="平台占比"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.Rate}}%
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="InvoiceMoney"
+          label="银行收款"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.InvoiceMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="sMoney"
+          label="银行占比"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.sMoney}}%
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="WBMoney"
+          label="支付宝收款"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.WBMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fmrMoney"
+          label="支付宝占比"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.fmrMoney}}%
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="MatchMoney"
+          label="现金收款"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.MatchMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="eMoney"
+          label="现金占比"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.eMoney}}%
+          </template>
+        </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['StatisticalData'],
+  data() {
+    return {
+      MonthList: [],//月份列表
+      BranchAnalysisData: [],
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+
+  },
+  watch: {
+    StatisticalData:{
+      handler(n,o){
+        this.MonthList = n.MonthList//月份列表
+        this.BranchAnalysisData = n.BranchAnalysisData
+      },
+      deep: true,
+      immediate: false,
+    }
+  },
+}
+</script>
+
+<style scoped>
+/deep/.LineAnalysisDataBJ tr td:nth-child(1n){
+  background: #F5F7FA;
+}
+/deep/.LineAnalysisDataBJ tr td:nth-child(2n){
+  background: #fff;
+}
+/deep/.LineAnalysisDataBJ tr th{
+  background: #F5F7FA;
+}
+/deep/.el-table.LineAnalysisDataBJ tr:first-child th:first-child{
+  background: #F5F7FA;
+}
+/deep/.el-table.LineAnalysisDataBJ tr:nth-child(2) th:nth-child(1n){
+  /* background: #fff; */
+}
+/deep/.el-table.LineAnalysisDataBJ tr:nth-child(2) th:nth-child(2n){
+  background: #F5F7FA;
+}
+/deep/.el-table.LineAnalysisDataBJ tr:first-child th{
+  background: #fff;
+}
+/deep/.el-table.LineAnalysisDataBJ2 tr:first-child th:nth-child(1n){
+  background: #F5F7FA;
+}
+/deep/.el-table.LineAnalysisDataBJ2 tr:first-child th:nth-child(2n){
+  background: #fff;
+}
+/deep/.el-table.LineAnalysisDataBJ tr th{
+  height: 20px;
+  line-height: 20px;
+  padding: 5px 0;
+}
+/deep/.el-table.LineAnalysisDataBJ2 tr th{
+  height: 20px;
+  line-height: 20px;
+  padding: 5px 0;
+}
+/deep/.el-table.LineAnalysisDataBJ tr td{
+  height: 20px;
+  line-height: 20px;
+  padding: 5px 0;
+}
+/deep/.el-table.LineAnalysisDataBJ2 tr td{
+  height: 20px;
+  line-height: 20px;
+  padding: 5px 0;
+}
+.corporatioBox{
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  margin-left: 15px;
+}
+.corporatioBox div{
+  /* display: flex;
+  flex-direction: column; */
+  background: #fff;
+  padding: 5px 10px;
+  margin-right: 10px;
+}
+.corporatioBox div span:first-child{
+  text-align: left;
+  font-size: 14px;
+}
+.corporatioBox div span:last-child{
+  color: red;
+  margin-left: 10px;
+}
+</style>

src/components/FinancialModule/DataAnalysis/index.vue

@@ -7,6 +7,7 @@
       <el-tab-pane v-if="PermissionState!=2&&PermissionState!=4" :label="$t('objFill.v101.FinancialModule.gouwuyjqk')" name="4"></el-tab-pane>
       <el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.yushiduibiqk')" name="5"></el-tab-pane>
       <!-- <el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.cashqk')" name="6"></el-tab-pane> -->
+      <el-tab-pane v-if="PermissionState!=3&&PermissionState!=4" label="平台收款占比" name="7"></el-tab-pane>
     </el-tabs>
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="90px">
@@ -93,7 +94,7 @@
               <el-input v-model="shopMsg.MaoLiRate" type="number"  @change="getMaoLiRate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" v-if="activeName!=4 && activeName!=3">
+          <el-col :span="4" v-if="activeName!=4 && activeName!=3 && activeName!=7">
             <el-form-item :label="$t('advmanager.v_line')">
               <el-select filterable v-model="msg.LineId" @change="getStatement"
               clearable>
@@ -148,7 +149,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="2" v-if="activeName!=3 && activeName!=5">
+          <el-col :span="2" v-if="activeName!=3 && activeName!=5 && activeName!=7">
             <el-form-item :label="$t('objFill.v101.FinancialModule.jiduhuiz')">
               <el-checkbox v-model="msg.LossType" true-label="1" false-label="0" @change="getStatement"></el-checkbox>
             </el-form-item>
@@ -169,6 +170,9 @@
           <button v-if="activeName==5" class="normalBtn" @click="exportExcel3">
             {{$t('visa.v_daochu')}}
           </button>
+          <button v-if="activeName==7" class="normalBtn" @click="exportExcel4">
+            {{$t('visa.v_daochu')}}
+          </button>
         </li>
       </ul>
     </div>
@@ -179,6 +183,7 @@
       <ShoppingCommission v-if="activeName=='4'" :StatisticalData="StatisticalData"></ShoppingCommission>
       <PrerealContrast v-if="activeName=='5'" :StatisticalData="StatisticalData"></PrerealContrast>
       <Cashflows v-if="activeName=='6'" :StatisticalData="StatisticalData"></Cashflows>
+      <PlatfromIncomes v-if="activeName=='7'" :StatisticalData="StatisticalData"></PlatfromIncomes>
     </div>
   </div>
 </template>
@@ -188,12 +193,13 @@ import moment from 'moment';
 import Lines from "./components/line.vue";
 import Corporations from "./components/corporation.vue";
 import Cashflows from "./components/cashflow.vue";
+import PlatfromIncomes from "./components/platfromIncome.vue";
 import Packets from "./components/packet.vue";
 import ShoppingCommission from "./components/ShoppingCommission.vue";
 import PrerealContrast from "./components/PrerealContrast.vue";
 import StartYMDateLimit from '../../public/StartYMDateLimit.vue';
 export default {
-  components: {Lines,Corporations,Cashflows,Packets,ShoppingCommission,PrerealContrast,StartYMDateLimit},
+  components: {Lines,Corporations,Cashflows,PlatfromIncomes,Packets,ShoppingCommission,PrerealContrast,StartYMDateLimit},
   data() {
     return {
       coinGetShow: false,
@@ -355,6 +361,9 @@ export default {
       if(this.activeName=='6'){
         url = 'financestatistics_post_GetCashFlowAnalysisStat'
       }
+      if(this.activeName=='7'){
+        url = 'financestatistics_post_GetPlatformIncomeAnalysisStat'
+      }
       this.loading = true
       this.apipost(
         url,
@@ -448,6 +457,13 @@ export default {
       }
       this.GetLocalFile("financestatistics_post_GetExpectedCostAnalysisStatToExcel", msg, '预实对比'+ this.$commonUtils.getCurrentDate() + ".xls");
     },
+    exportExcel4(){//导出报表
+      let msg = {
+        EmployeeId: this.getLocalStorage().EmployeeId,
+        ...this.msg
+      }
+      this.GetLocalFile("financestatistics_post_GetPlatformIncomeAnalysisStatToExcel", msg, '平台收入占比'+ this.$commonUtils.getCurrentDate() + ".xls");
+    },
     getQueryData() {
       //获取公司列表
       this.apipost(