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

src/components/FinancialModule/DataAnalysis/components/MemberRebate.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 align="center" label="幸福存折">
+        <el-table-column
+          prop="BalanceFan"
+          label="返幸福存折"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.BalanceFan}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="BalanceFanRate"
+          label="返存折占比"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.BalanceFanRate}}%
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="BalanceCost"
+          label="存折成本"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.BalanceCost}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="BalanceIncome"
+          label="存折收入"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.BalanceIncome}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="BalanceProfit"
+          label="存折盈亏"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.BalanceProfit}}
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column align="center" label="积分">
+        <el-table-column
+          prop="IntegralFan"
+          label="返积分数量"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.IntegralFan}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="IntegralFanRate"
+          label="返积分占比"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.IntegralFanRate}}%
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="IntegralCost"
+          label="积分成本"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.IntegralCost}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="IntegralIncome"
+          label="积分收入"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.IntegralIncome}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="IntegralProfit"
+          label="积分盈亏"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.IntegralProfit}}
+          </template>
+        </el-table-column>
+      </el-table-column>
+    </el-table>
+
+
+    <div style="display: flex;align-items: center;margin-top: 30px;">
+      <h3 class="text-center" style="margin-bottom: 5px;">同行统计（仅展示Top50）</h3>
+    </div>
+
+    <el-table
+    :data="CustomerAnalysisData"
+    style="width: 100%;"
+    class="LineAnalysisDataBJ">
+        <el-table-column
+          prop="Rank"
+          label="排名"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+              {{scope.row.Rank}}
+          </template>
+        </el-table-column>
+        
+        <el-table-column
+          prop="CustomerName"
+          label="同行名称"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.CustomerName}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="幸福存折">
+        <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="OrderNum"
+          label="订单数"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.OrderNum}}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
+          prop="Income"
+          label="返存折销售额"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.Income}}
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          prop="UseMoney"
+          label="已使用"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.UseMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="SurplusBalance"
+          label="余额"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.SurplusBalance}}
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column align="center" label="积分">
+        <el-table-column
+          prop="IntegralNum"
+          label="返积分数量"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.IntegralNum}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="UseIntegral"
+          label="已使用"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.UseIntegral}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="SurplusIntegral"
+          label="余额"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.SurplusIntegral}}
+          </template>
+        </el-table-column>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['StatisticalData'],
+  data() {
+    return {
+      MonthList: [],//月份列表
+      BranchAnalysisData: [],
+      CustomerAnalysisData: []
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+
+  },
+  watch: {
+    StatisticalData:{
+      handler(n,o){
+        this.MonthList = n.MonthList//月份列表
+        this.BranchAnalysisData = n.BranchAnalysisData
+        this.CustomerAnalysisData = n.CustomerAnalysisData
+      },
+      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

@@ -9,6 +9,7 @@
       <!-- <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-tab-pane v-if="PermissionState!=3&&PermissionState!=4" label="待付款情况" name="8"></el-tab-pane>
+      <el-tab-pane v-if="PermissionState!=3&&PermissionState!=4" label="会员返利情况" name="9"></el-tab-pane>
     </el-tabs>
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="90px">
@@ -77,7 +78,7 @@
               </el-form-item>
             </el-col>
           </template>
-          <el-col :span="4" v-if="activeName!=5 && activeName!=8">
+          <el-col :span="4" v-if="activeName!=5 && activeName!=8 && activeName!=9">
             <el-form-item :label="$t('fnc.bweibi')">
               <el-select :disabled="coinGetShow" filterable v-model="msg.StandardCurrencyId"  @change="getChange">
                 <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
@@ -95,7 +96,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 && activeName!=7&& activeName!=8">
+          <el-col :span="4" v-if="activeName!=4 && activeName!=3 && activeName!=7&& activeName!=8&& activeName!=9">
             <el-form-item :label="$t('advmanager.v_line')">
               <el-select filterable v-model="msg.LineId" @change="getStatement"
               clearable>
@@ -150,7 +151,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="2" v-if="activeName!=3 && activeName!=5 && activeName!=7&& activeName!=8">
+          <el-col :span="2" v-if="activeName!=3 && activeName!=5 && activeName!=7&& activeName!=8&& activeName!=9">
             <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>
@@ -162,7 +163,7 @@
           <button class="hollowFixedBtn" @click="getStatement">
             {{ $t("pub.searchBtn") }}
           </button>
-          <button v-if="activeName!=4 && activeName!=5 && activeName!=7&& activeName!=8" class="normalBtn" @click="exportExcel">
+          <button v-if="activeName!=4 && activeName!=5 && activeName!=7&& activeName!=8&& activeName!=9" class="normalBtn" @click="exportExcel">
             {{$t('visa.v_daochu')}}
           </button>
           <button v-if="activeName==4" class="normalBtn" @click="exportExcel2">
@@ -177,6 +178,9 @@
           <button v-if="activeName==8" class="normalBtn" @click="exportExcel5">
             {{$t('visa.v_daochu')}}
           </button>
+          <button v-if="activeName==9" class="normalBtn" @click="exportExcel6">
+            {{$t('visa.v_daochu')}}
+          </button>
         </li>
       </ul>
     </div>
@@ -189,6 +193,7 @@
       <Cashflows v-if="activeName=='6'" :StatisticalData="StatisticalData"></Cashflows>
       <PlatfromIncomes v-if="activeName=='7'" :StatisticalData="StatisticalData"></PlatfromIncomes>
       <WaitPays v-if="activeName=='8'" :StatisticalData="StatisticalData"></WaitPays>
+      <MemberRebates v-if="activeName=='9'" :StatisticalData="StatisticalData"></MemberRebates>
     </div>
   </div>
 </template>
@@ -199,13 +204,14 @@ 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 MemberRebates from "./components/MemberRebate.vue";
 import WaitPays from "./components/waitpay.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,PlatfromIncomes,WaitPays,Packets,ShoppingCommission,PrerealContrast,StartYMDateLimit},
+  components: {Lines,Corporations,Cashflows,PlatfromIncomes,MemberRebates,WaitPays,Packets,ShoppingCommission,PrerealContrast,StartYMDateLimit},
   data() {
     return {
       coinGetShow: false,
@@ -373,6 +379,9 @@ export default {
       if(this.activeName=='8'){
         url = 'financestatistics_post_GetWiatPayAnalysisStat'
       }
+      if(this.activeName=='9'){
+        url = 'financestatistics_post_GetMemberRebateStat'
+      }
       this.loading = true
       this.apipost(
         url,
@@ -480,6 +489,13 @@ export default {
       }
       this.GetLocalFile("financestatistics_post_GetWiatPayAnalysisStatToExcel", msg, '待付款情况'+ this.$commonUtils.getCurrentDate() + ".xls");
     },
+    exportExcel6(){//导出报表
+      let msg = {
+        EmployeeId: this.getLocalStorage().EmployeeId,
+        ...this.msg
+      }
+      this.GetLocalFile("financestatistics_post_GetMemberRebateStatToExcel", msg, '会员返利情况'+ this.$commonUtils.getCurrentDate() + ".xls");
+    },
     getQueryData() {
       //获取公司列表
       this.apipost(