no message

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue

@@ -94,9 +94,9 @@
           <td>{{item.OrderId}}</td>
           <td>{{item.OrderProfit}}</td>
           <td>{{item.Commission}}</td>
-          <td>{{item.CommissionRate}}</td>
+          <td>{{item.CommissionRate?item.CommissionRate+'%':'-'}}</td>
           <td>{{item.BonusMoney}}</td>
-          <td>{{item.BonusRate}}</td>
+          <td>{{item.BonusRate?item.BonusRate+'%':'-'}}</td>
           <td>{{item.Month}}</td>
           <td>{{item.Remark?item.Remark:'-'}}</td>
         </tr>

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue

@@ -36,6 +36,12 @@
     .cursor-p:hover{
         color: #409EFF;
     }
+    .ITUDWageMoney-box{
+        margin-bottom: 20px;
+    }
+    .ITUDWageMoney-box span:first-child{
+        margin-right: 20px;
+    }
 </style>
 <template>
     <div class="flexOne domesticCommissionUser">
@@ -84,10 +90,13 @@
                 <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>
             </tr>
@@ -100,12 +109,14 @@
                 <td>{{item.ProfitMoney}}</td>
                 <td>{{item.EmpType!=1?item.LureNum:'-'}}</td>
                 <td>{{item.EmpType!=1?item.OrderNum:'-'}}</td>
+                <td>{{item.WageMoney}}</td>
                 <td @click="GenerateScale(item)">
                     <span class="cursor-p">{{item.WageType!=1?'上季度定档':'新员工比例'}}</span>
                 </td>
-                <td>{{item.WageMoney}}</td>
                 <td>{{item.Commission}}</td>
+                <td>{{item.CommissionRate?item.CommissionRate+'%':'-'}}</td>
                 <td>{{item.BonusMoney}}</td>
+                <td>{{item.bonusRate?item.bonusRate+'%':'-'}}</td>
                 <td>{{item.Month}}</td>
                 <td>
 
@@ -132,39 +143,11 @@
                   class="cm_content"
                   style="width: 100%;margin-bottom: 35px;margin-top: 30px;"
                 >
-                  <table
-                    class="po_content singeRowTable"
-                    style="border:1px solid #E6E6E6;"
-                    cellspacing="0"
-                    cellpadding="0"
-                    v-loading="loading"
-                  >
-                    <tr>
-                      <th width="100" style="min-width: 100px;max-width: 100px;">工资</th>
-                      <th width="100" style="min-width: 100px;max-width: 100px;">提成比例</th>
-                      <th width="100" style="min-width: 100px;max-width: 100px;">平均引流数量</th>
-                      <th width="100" style="min-width: 100px;max-width: 100px;">平均成交单数</th>
-                    </tr>
-                    <tr>
-                      <td>
-                        <span>{{commissionratioList.WageMoney}}</span>
-                      </td>
-                      <td>
-                        <span>{{commissionratioList.CommissionRate}}</span>
-                      </td>
-                      <td style="padding: 0 10px;">
-                        <span>
-                          {{commissionratioList.AvgLureNum}}
-                        </span>
-                      </td>
-                      <td style="padding: 0 10px;">
-                        <span>
-                          {{commissionratioList.AvfOrderNum}}
-                        </span>
-                      </td>
-                    </tr>
-                    
-                  </table>
+                  
+                  <div class="ITUDWageMoney-box">
+                      <span>工资：{{commissionratioList.WageMoney}}</span>
+                      <span>提成比例：{{commissionratioList.WageMoney?commissionratioList.WageMoney+'%':'-'}}</span>
+                  </div>
                   <table
                     class="po_content singeRowTable"
                     style="border:1px solid #E6E6E6;"
@@ -188,8 +171,11 @@
                         <td>{{item.OrderNum}}</td>
                     </tr>
                     <tr>
-                        <td colspan="1">平均利润：</td>
-                        <td colspan="4">{{commissionratioList.AvgProfit}}</td>
+                        <td>平均</td>
+                        <td>-</td>
+                        <td>{{commissionratioList.AvgProfit}}</td>
+                        <td>{{commissionratioList.AvgLureNum}}</td>
+                        <td>{{commissionratioList.AvfOrderNum}}</td>
                     </tr>
                   </table>
                   <!-- <div style="width:100%;overflow-x: auto;">