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

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue

@@ -104,7 +104,7 @@
           <td>{{item.OrderProfit}}</td>
           <td>{{item.YCommission}}</td>
           <td>{{item.Commission}}</td>
-          <td>{{item.LimitCommission>0?item.LimitCommission:'-'}}</td>
+          <td>{{item.LimitCommission != 0?item.LimitCommission:'-'}}</td>
           <td>{{item.CommissionRate}}%</td>
           <td @click="GenerateScale(item)">
             <span

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue

@@ -200,7 +200,7 @@
                     :class="item.WageReId?'cursor-p':''">{{item.WageType==1?'新员工比例':item.WageType==2?'上季度定档':'-'}}</span>
                 </td>
                 <td>{{item.Commission}}</td>
-                <td>{{item.LimitCommission>0?item.LimitCommission:'-'}}</td>
+                <td>{{item.LimitCommission != 0?item.LimitCommission:'-'}}</td>
                 <td>{{item.CommissionRate}}%</td>
                 <td>{{item.EmName!='微途'?item.BonusMoney:'-'}}</td>
                 <td>{{item.EmName!='微途'?item.BonusRate+'%':'-'}}</td>