no message

src/components/FinancialModule/TradeCommission/TicketUserDetails.vue

@@ -197,10 +197,12 @@
                 <th>公司</th>
                 <th>部门</th>
                 <th>员工姓名</th>
-                <th>日本线及其他人数</th>
-                <th>日本线及其他奖励</th>
-                <th>欧洲线及其他人数</th>
-                <th>欧洲线及其他奖励</th>
+                <th>日本线人数</th>
+                <th>日本线奖励</th>
+                <th>欧洲线人数</th>
+                <th>欧洲线奖励</th>
+                <th>其他线人数</th>
+                <th>其他线奖励</th>
                 <th>总提成</th>
                 <th>出团公司提成</th>
                 <th>期数</th>
@@ -214,6 +216,8 @@
                 <td>{{item.PeopleMoney?item.PeopleMoney:'-'}}</td>
                 <td>{{item.EuropePNum?item.EuropePNum:'-'}}</td>
                 <td>{{item.EuropeMoney?item.EuropeMoney:'-'}}</td>
+                <td>{{item.OtherPNum?item.OtherPNum:'-'}}</td>
+                <td>{{item.OtherMoney?item.OtherMoney:'-'}}</td>
                 <td>{{item.TotalCMoney?item.TotalCMoney:'-'}}</td>
                 <td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
                 <td>{{item.Periods}}</td>

src/components/sale/components/progressComm.vue

@@ -76,21 +76,21 @@
             :percentage="setItemProgress(item)"
             :status="setItemStatus(item)"
             :format="setItemText(item)"
-            :text-color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
+            :text-color="(commissionratioList.type==2&&commissionratioList.CommissionProfit>=item.StartValue)||
             (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?'#666666':'#666666'"
-            :color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
+            :color="(commissionratioList.type==2&&commissionratioList.CommissionProfit>=item.StartValue)||
             (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?customColor[0]:customColor[1]">
             </el-progress>
           <div class="rate-box">
           <div class="sanjiao"
-          :style="{'border-bottom-color':(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
+          :style="{'border-bottom-color':(commissionratioList.type==2&&commissionratioList.CommissionProfit>0&&commissionratioList.CommissionProfit>=item.StartValue)||
           (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)
           ?'#33B3FF':'#CACACA'}"></div>
               <div class="rate full-width"
-              :class="{'active-rate':(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
+              :class="{'active-rate':(commissionratioList.type==2&&commissionratioList.CommissionProfit>0&&commissionratioList.CommissionProfit>=item.StartValue)||
               (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)}">
-                  <i v-if="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
-                    (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)" class="el-icon-check" style="font-size:8px"></i>
+                  <i v-if="(commissionratioList.type==2&&commissionratioList.CommissionProfit>0&&commissionratioList.CommissionProfit>=item.StartValue)||
+                    (commissionratioList.type!=2&&commissionratioList.CommissionProfit>0&&commissionratioList.AvgLureNum>=item.StartValue)" class="el-icon-check" style="font-size:8px"></i>
                   {{item.Rate}}{{commissionratioList.type==2?'%':''}}
               </div>
           </div>
@@ -171,7 +171,7 @@
           &&this.commissionratioList.CommissionProfit>=data.StartValue&&this.commissionratioList.CommissionProfit<=data.EndValue){
             return this.commissionratioList.CommissionProfit>25000?(this.commissionratioList.CommissionProfit/data.StartValue)*100:(this.commissionratioList.CommissionProfit/data.EndValue)*100
           }else{
-            return 100
+            return 0
           }
         }else{
           if(this.commissionratioList.type==1
@@ -181,7 +181,7 @@
           }else if(this.commissionratioList.type==3&&this.commissionratioList.AvgLureNum){
             return (this.commissionratioList.AvgLureNum/data.StartValue)*100
           }else{
-            return 100
+            return 0
           }
         }
         // return 100