1

src/components/sale/ExpectedCommission.vue

@@ -308,12 +308,12 @@
               <div style="display: flex;justify-content: space-between;">
                <span>年终奖(不含单项产品、国内游)</span>
                <div>
-                <detailsButtom :type="3" :obj="commissionMsg" :Month="Month"/>
+                <!-- <detailsButtom :type="3" :obj="commissionMsg" :Month="Month"/> -->
                 </div>
               </div>
               <p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:年终奖励从每年11月起始</span></p>
               <div class="CommissionInfor">
-                <span>达标 <span style="margin-left: 5px;margin-right: 5px;">{{CommissionInfor.BonusNum}}</span>月</span>
+                <span @click="IsYearBonus=true" style="cursor: pointer;">达标 <span style="margin-left: 5px;margin-right: 5px;">{{CommissionInfor.BonusNum}}</span>个月</span>
                 <span><span>每月人数{{CommissionInfor.BonusMinPNum}}人以上</span></span>
               </div>
               <div>
@@ -466,6 +466,21 @@
 
 
     </div>
+
+    <el-dialog :visible.sync="IsYearBonus" width="686px" title="年终明细">
+      <div style="height:320px;">
+        <table style=" border: 1px solid black;border-collapse: collapse; text-align: center; width: 100%;">
+                <tr style="border: 1px solid black">
+                  <th style="border: 1px solid black">月份</th>
+                  <th style="border: 1px solid black">人数</th>
+                </tr>
+                  <tr v-for="item in CommissionInfor.BonusPeriods" style="border: 1px solid black">
+                    <td style="border: 1px solid black">{{item.TradeDate}}</td>
+                    <td style="border: 1px solid black"><span :style="item.GuestNum>=35?'color:red':'color:black'">{{item.GuestNum}}</span></td>
+                  </tr>
+          </table>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -492,6 +507,7 @@
         newRlist:[],
         newRlistAll:[],
         DomesticLine:{},
+        IsYearBonus:false,
         AnnualBonus:{
           type:3,
           AvgLureNum:0,
@@ -709,7 +725,6 @@
               // 年终奖
               this.AnnualBonus.AvgLureNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0
               this.AnnualBonus.AvfOrderNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0
-              this.AnnualBonus.Commission = this.CommissionInfor.BonusPeriods?this.CommissionInfor.BonusPeriods:0
               this.GetGNSaleExpectCommission()
             }else {
               this.Error(res.data.message);

src/components/sale/components/progressComm.vue

@@ -180,8 +180,8 @@
           &&this.commissionratioList.AvgLureNum>=data.StartValue
           &&this.commissionratioList.AvgLureNum<=data.EndValue){
             return (this.commissionratioList.AvgLureNum/data.EndValue)*100
-          }else if(this.commissionratioList.type==3&&this.commissionratioList.AvgLureNum){
-            return (this.commissionratioList.AvgLureNum/data.StartValue)*100
+          }else if(this.commissionratioList.type==3&&this.commissionratioList.AvfOrderNum){
+            return (this.commissionratioList.AvfOrderNum/data.StartValue)*100
           }else{
             if(this.commissionratioList.AvgLureNum>=data.StartValue){
               return 100