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

# Conflicts:
#	src/components/rank/dataCount.vue

src/components/FinancialModule/OpCommission/OPCommissionDetail.vue

@@ -198,6 +198,7 @@
               <th>{{$t('objFill.v101.FinancialModule.yuangongxm')}}</th>
               <!-- <th>负责团数</th> -->
               <th>{{$t('objFill.v101.FinancialModule.tuanshujl')}}</th>
+              <th width="120">出团公司分摊奖励</th>
               <th>{{$t('objFill.zongticeng')}}</th>
               <th>{{$t('objFill.v101.FinancialModule.chutuangstc')}}</th>
               <th>{{$t('tips.qishu')}}</th>
@@ -216,6 +217,7 @@
                 </span>
                 <!-- <span v-else>-</span> -->
               </td>
+              <td>{{item.BranchBouns?item.BranchBouns:'-'}}</td>
               <td>{{item.TotalCMoney?item.TotalCMoney:'-'}}</td>
               <td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
               <td><span class="cursor-p" :style="{'color': '#409EFF'}" @click="openCommissionRate(item.EmployeeId,item.UserName)">{{item.Periods}}</span></td>

src/components/FinancialModule/OpCommission/RewardDetail.vue

@@ -16,6 +16,7 @@
           <div>{{$t('objFill.v101.FinancialModule.zongjlje')}}：<span>{{item.Money}}</span></div>
           <div>{{$t('objFill.v101.FinancialModule.fafangrq')}}：<span>{{item.Periods?item.Periods:'-'}}</span></div>
         </div>
+        <div class="dataList-heade"><div>分摊：<span v-for="(items,indexs) in item.BonusDetailsList">{{items.BranchName}}/{{items.Money}}&nbsp;&nbsp;&nbsp;</span></div></div>
         <el-table
         :data="item.DetailList"
         style="width: 100%">
@@ -28,25 +29,33 @@
           <el-table-column
           prop="TravelNum"
           :label="$t('objFill.v101.FinancialModule.dangyuets')" width="80"></el-table-column>
+
+          <!-- <el-table-column prop="TravelNum" label="分摊奖励" width="80">
+            <template slot-scope="scope">
+              <div v-for="(items,indexs) in scope.row.BonusDetailsList" :key="indexs"
+            class="DetailList-form"></div>
+            </template>
+          </el-table-column> -->
+
         <el-table-column :label="$t('objFill.v101.FinancialModule.tuanlieb')">
           <template slot-scope="scope">
             <div v-for="(items,indexs) in scope.row.newTravelList" :key="indexs"
             class="DetailList-form">
               <div class="DetailList-right">
                 <div v-if="indexs==0" class="right-title">
-                  <span>{{$t('visa.v_tuanhao')}}</span>
-                  <span>{{$t('scen.sc_temStatu')}}</span>
-                  <span>{{$t('advmanager.v_type')}}</span>
-                  <span>{{$t('objFill.jietuanriqi')}}</span>
+                  <span style="flex: 0 0 40%;">{{$t('visa.v_tuanhao')}}</span>
+                  <span style="flex: 0 0 20%;">{{$t('scen.sc_temStatu')}}</span>
+                  <span style="flex: 0 0 20%;">{{$t('advmanager.v_type')}}</span>
+                  <span style="flex: 0 0 20%;">{{$t('objFill.jietuanriqi')}}</span>
                 </div>
                 <div>
                   <span @click="goDetails(items)"
-                  style="color: #409EFF;cursor: pointer;">
-                  {{items.TCNUM}} ({{items.TCID}})
+                  style="color: #409EFF;cursor: pointer;flex: 0 0 40%;">
+                  {{items.TCNUM}} ({{items.TCID}}) {{items.OutBranchName}}
                   </span>
-                  <span>{{items.StatusName}}</span>
-                  <span>{{items.TeamTypeName}}</span>
-                  <span>{{items.OutGroupAuditDate}}</span>
+                  <span style="flex: 0 0 20%;">{{items.StatusName}}</span>
+                  <span style="flex: 0 0 20%;">{{items.TeamTypeName}}</span>
+                  <span style="flex: 0 0 20%;">{{items.OutGroupAuditDate}}</span>
                 </div>
               </div>
               <more @change="ViewMore(scope.row,indexs)" :upIcon="scope.row.upIcon"></more>

src/components/rank/components/customer.vue

@@ -51,6 +51,11 @@
       initChart() {
         const chartDom = document.getElementById('chart');
         this.chart = echarts.init(chartDom);
+         var intervalNum=0;
+            if(this.xAxisData&&this.xAxisData.length>0)
+            {
+                intervalNum=this.calculateInterval(this.xAxisData.length);
+            }
         const option = {
           tooltip: {
             trigger: 'axis', // 设置为 'axis' 以确保鼠标悬浮在曲线任意位置时都能触发事件
@@ -94,7 +99,7 @@
             },
             axisLabel: {
               color: '#121212',
-              interval: this.calculateInterval(this.xAxisData.length)
+              interval: intervalNum
             },
             axisTick: {
               show: false,

src/components/rank/components/tradecount.vue

@@ -11,22 +11,15 @@ export default {
         return {
             chart: null,
             barData: {
-                name: '新增同业数',
-                data: [123, 211, 178, 289, 90, 156, 222, 101, 267, 199, 125, 291, 187, 92, 243, 148, 212, 117, 279, 103, 137, 256, 221, 193, 88, 283, 165, 111, 239, 107],
+                name: '总订单',
+                data: []
             },
             lineData: {
-                name: '新增激活数',
-                data: [105, 219, 142, 297, 176, 84, 233, 120, 265, 199, 207, 91, 251, 153, 281, 113, 224, 168, 246, 131, 273, 185, 99, 237, 147, 292, 109, 214, 171, 260],
+                name: '小程序订单',
+                data:[]
             },
-            xAxisData: [
-                '11/01', '11/02', '11/03', '11/04', '11/05',
-                '11/06', '11/07', '11/08', '11/09', '11/10',
-                '11/11', '11/12', '11/13', '11/14', '11/15',
-                '11/16', '11/17', '11/18', '11/19', '11/20',
-                '11/21', '11/22', '11/23', '11/24', '11/25',
-                '11/26', '11/27', '11/28', '11/29', '11/30'
-            ],
-            unit: '人',
+            xAxisData: [ ],
+            unit: '单',
         };
     },
     props: {
@@ -34,12 +27,21 @@ export default {
             type: Object,
             default: null
         }
+    },
+      watch: {
+      chartData: function (old, val) {
+        if (this.chartData) {
+            this.barData.data = this.chartData.allOrderData;
+            this.lineData.data = this.chartData.appOrderData;
+            this.xAxisData = this.chartData.xAxisData;
+        }
+        this.initChart();
+      }
     },
     mounted() {
         if (this.chartData) {
-            this.barData = this.chartData.barData;
-            this.lineData = this.chartData.lineData;
-            this.unit = this.chartData.unit;
+            this.barData.data = this.chartData.allOrderData;
+            this.lineData.data = this.chartData.appOrderData;
             this.xAxisData = this.chartData.xAxisData;
         }
         this.initChart();
@@ -48,6 +50,11 @@ export default {
         initChart() {
             const chartDom = document.getElementById('tradecount');
             this.chart = echarts.init(chartDom);
+            var intervalNum=0;
+            if(this.xAxisData&&this.xAxisData.length>0)
+            {
+                intervalNum=this.calculateInterval(this.xAxisData.length);
+            }
 
             const option = {
                 tooltip: {
@@ -83,7 +90,7 @@ export default {
                     },
                     axisLabel: {
                         color: '#121212',
-                        interval: this.calculateInterval(this.xAxisData.length),
+                        interval: intervalNum,
                     },
                     axisTick: {
                         show: false,

src/components/rank/dataCount.vue

@@ -155,7 +155,7 @@
       <div class="card rounded big">
         <div class="row items-center">
           <div style="margin: 0 12px;" class="col">
-            <div class="sub-title">今日客户数据</div>
+            <div class="sub-title">客户交易数据</div>
             <div class="">
               <span class="dot"></span>
               <span class="text-info">{{
@@ -163,20 +163,19 @@
               }}</span>
             </div>
           </div>
-          <el-select v-model="platformId" style="width: 140px;">
-            <el-option
-              v-for="(x, i) in platforms"
-              :key="i"
-              :label="x.Name"
-              :value="x.Id"
-            ></el-option>
-          </el-select>
+          <!-- <el-select v-model="platformId" style="width: 140px;">
+            <el-option v-for="(x,i) in platforms" :key="i" :label="x.Name" :value="x.Id"></el-option>
+          </el-select> -->
         </div>
         <div class="q-mt-md row items-center">
           <div class="data-items col">
             <div>交易金额</div>
             <div class="num" style="margin: 6px 0;">
-              <span class="datanum">5000000.00</span>
+              <span class="datanum">
+                <template v-if="customerObj">
+                    {{customerObj.OrderTotalPreferPrice}}
+                </template>
+              </span>
               <span>元</span>
             </div>
           </div>
@@ -187,7 +186,11 @@
           <div class="data-items col">
             <div>收客人数</div>
             <div class="num" style="margin: 6px 0;">
-              <span class="datanum">89</span>
+              <span class="datanum">
+                 <template v-if="customerObj">
+                    {{customerObj.OrderTotalGuestNum}}
+                </template>
+              </span>
               <span>人</span>
             </div>
           </div>
@@ -195,7 +198,11 @@
           <div class="data-items col">
             <div>订单数</div>
             <div class="num" style="margin: 6px 0;">
-              <span class="datanum">455</span>
+              <span class="datanum">
+                  <template v-if="customerObj">
+                    {{customerObj.OrderTotalCount}}
+                </template>
+              </span>
               <span>个</span>
             </div>
           </div>
@@ -204,7 +211,9 @@
           <div class="data-items col">
             <div>用卷订单数</div>
             <div class="num" style="margin: 6px 0;">
-              <span class="datanum">26052</span>
+              <span class="datanum">     <template v-if="customerObj">
+                    {{customerObj.OrderTotalUseCoupinCount}}
+                </template></span>
               <span>个</span>
             </div>
           </div>
@@ -221,7 +230,7 @@
           </div>
         </div>
         <div style="height: 320px;">
-          <Tradecount></Tradecount>
+          <Tradecount :chartData="customerObj"></Tradecount>
         </div>
       </div>
 

src/components/sale/ExpectedCommission.vue

@@ -337,7 +337,7 @@
               <p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">{{$t('objFill.v101.Rest.zhunianzmnsyyqi')}}</span></p>
               <div class="CommissionInfor">
                 <span @click="IsYearBonus=true" style="cursor: pointer;">{{$t('objFill.v101.Rest.daibiao')}} <span style="margin-left: 5px;margin-right: 5px;">{{CommissionInfor.BonusNum}}</span>{{$t('objFill.v101.Rest.geyuedcckan')}}</span>
-                <span><span>{{$t('objFill.v101.Rest.meiyuerens')}}{{CommissionInfor.BonusMinPNum}}{{$t('objFill.v101.FinancialModule.renyishang')}}</span><span v-if="CommissionInfor.TaskNum>0">,{{$t('objFill.v101.Rest.bingqie')}} {{CommissionInfor.EnableDate}}{{$t('objFill.v101.Rest.qiozcpskxdad')}}  {{CommissionInfor.TaskNum}}{{$t('hotel.hotel_people')}}*New</span></span>
+                <span><span>{{$t('objFill.v101.Rest.meiyuerens')}}{{CommissionInfor.BonusMinPNum}}{{$t('objFill.v101.FinancialModule.renyishang')}}，7/8月上调为50人达标*</span><span v-if="CommissionInfor.TaskNum>0">,{{$t('objFill.v101.Rest.bingqie')}} {{CommissionInfor.EnableDate}}{{$t('objFill.v101.Rest.qiozcpskxdad')}}  {{CommissionInfor.TaskNum}}{{$t('hotel.hotel_people')}}*New</span></span>
               </div>
               <div>
                 <progressComm :commissionratioList="AnnualBonus"></progressComm>
@@ -604,7 +604,7 @@
         rightOpen: false,
         msg:{
           Month: '',
-          BonusYear:'2024'
+          BonusYear:'2025'
         },
         Month: 1,
         MonthList:[