no message

src/components/sale/ExpectedCommission.vue

@@ -116,7 +116,7 @@
     <div style="display: flex;align-items: center; justify-content: space-between;background: #fff;
     height: 40px;padding: 0 20px;">
       <div class="headerTitle">
-        <template v-if="CommissionInfor.TotalCMoney">
+        <template v-if="CommissionInfor">
         <!-- <p>总提成：<span>{{CommissionInfor.TotalCMoney}}</span></p> -->
         <p>总订单数：<span>{{CommissionInfor.SalesOrderNum+CommissionInfor.JapanOrderNum+CommissionInfor.EuropeOrderNum+GNOrderNum}}</span></p>
         <p>总人头数：<span>{{CommissionInfor.PeopleNum+CommissionInfor.EuropePNum+CommissionInfor.SalesPeopleNum+CommissionInfor.JapanPeopleNum+CommissionInfor.EuropePeopleNum+GNEopleNum}}</span></p>
@@ -287,18 +287,18 @@
               <el-table-column width="70" prop="OrderNum"
               label="订单数">
               <template slot-scope="scope">
-                <div class="tableTd">{{scope.row.OrderNum?scope.row.OrderNum:'-'}}</div>
+                <div class="tableTd">{{scope.row.OrderNum?scope.row.OrderNum:scope.row.OrderNum}}</div>
                 <div>
-                  {{scope.row.WaitOrderNum?scope.row.WaitOrderNum:'-'}}
+                  {{scope.row.WaitOrderNum?scope.row.WaitOrderNum:scope.row.WaitOrderNum}}
                 </div>
               </template>
               </el-table-column>
               <el-table-column width="70" prop="PeopleNum"
               label="报名数">
               <template slot-scope="scope">
-                <div class="tableTd">{{scope.row.PeopleNum?scope.row.PeopleNum:'-'}}</div>
+                <div class="tableTd">{{scope.row.PeopleNum?scope.row.PeopleNum:scope.row.PeopleNum}}</div>
                 <div>
-                  {{scope.row.WaitPeopleNum?scope.row.WaitPeopleNum:'-'}}
+                  {{scope.row.WaitPeopleNum?scope.row.WaitPeopleNum:scope.row.WaitPeopleNum}}
                 </div>
               </template>
               </el-table-column>
@@ -327,7 +327,7 @@
                 <template slot-scope="scope">
                   <div class="tableTd">{{scope.row.Way==2&&scope.row.Profit?scope.row.Profit:'-'}}</div>
                   <div>
-                    {{scope.row.WaitProfit?scope.row.WaitProfit:'-'}}
+                    {{scope.row.Way==2&&scope.row.WaitProfit?scope.row.WaitProfit:'-'}}
                   </div>
                 </template>
               </el-table-column>
@@ -336,7 +336,7 @@
               <template slot-scope="scope">
                 <div class="tableTd">{{scope.row.Commission}}</div>
                 <div>
-                  {{scope.row.WaitCommission?scope.row.WaitCommission:'-'}}
+                  {{scope.row.WaitCommission}}
                 </div>
               </template>
             </el-table-column>

src/components/sale/components/progressComm.vue

@@ -75,17 +75,17 @@
             :percentage="setItemProgress(item)"
             :status="setItemStatus(item)"
             :format="setItemText(item)"
-            :color="commissionratioList.CommissionRate>=item.Rate||
-            commissionratioList.AvgLureNum>item.StartValue?customColor[0]:customColor[1]">
+            :color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
+            (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.CommissionRate>=item.Rate||
-          commissionratioList.AvgLureNum>item.StartValue
+          :style="{'border-bottom-color':(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
+          (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)
           ?'#33B3FF':'#CACACA'}"></div>
               <div class="rate full-width"
-              :class="{'active-rate':commissionratioList.CommissionRate>=item.Rate||
-              commissionratioList.AvgLureNum>item.StartValue}">
+              :class="{'active-rate':(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
+              (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)}">
                   <i class="el-icon-check" style="font-size:8px"></i>
                   {{item.Rate}}{{commissionratioList.type==2?'%':''}}
               </div>