no message

src/components/FinancialModule/domesticCommissionUserTW2.vue

@@ -69,7 +69,7 @@
           </div>
         <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
             <tr>
-                <th>公司</th>
+                <th>出团公司</th>
                 <th>部门</th>
                 <th>销售</th>
                 <!-- <th>团的数量</th> -->
@@ -80,7 +80,7 @@
                 <th>年终奖金</th>
                 <th>当月业绩</th>
                 <th>提成比例</th>
-                <!-- <th>期数</th> -->
+                <th>币种</th>
 
                 <th>操作</th>
             </tr>
@@ -95,7 +95,7 @@
                 <td>{{item.YearBonus?item.YearBonus:'-'}}</td>
                 <td>{{item.OrderProfit?item.OrderProfit:'-'}}</td>
                 <td>{{item.CommissionRate?item.CommissionRate+'%':'-'}}</td>
-                <!-- <td>{{item.Periods}}</td> -->
+                <td>{{item.CurrencyName}}</td>
 
                 <td>
 

src/components/FinancialModule/domesticCommissiondetailsTW2.vue

@@ -107,19 +107,23 @@
       style="margin-top: 10px;">
       <tr>
 
-        <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>
+        <th>订单利润</th>
         <th>币种</th>
+        <th>台币利润</th>
+        <th>业绩核算比例</th>
+        <th>业绩利润</th>
+        <th>提成金额</th>
+        
+        
+        <th>提成比例</th>
+        
         <th>期数</th>
         <th width='400'>备注</th>
 
@@ -127,24 +131,23 @@
       </tr>
       <tr v-for="item in dataList">
         
-        <td>{{item.UserName}}</td>
+        
         <td>{{item.OutBranchName}}</td>
-        <td>
-          <div>{{item.OutBranchName}}</div>
-          <span style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">
-            {{item.TCNUM}}({{item.TCID}})
-          </span>
-
-        </td>
+        <td>{{item.UserName}}</td>
+        <td>销售</td>
+        <td>{{item.OrderType==1?'团队':item.OrderType==2?'酒店':item.OrderType==3?'门票':item.OrderType==4?'车辆':''}}</td>
+        <td>{{item.OrderId?item.OrderId:'-'}} {{item.OrderType==1?'('+item.TCNUM+')':''}}</td>
         <td>{{item.LineName}}</td>
-        <td>{{item.OrderId?item.OrderId:'-'}} {{item.OrderType==1?item.TCNUM:''}}</td>
-        <td>{{item.GuestCount}}</td>
-        <td>{{item.CommissionMoney}}</td>
         <td>{{item.OriginalProfit?item.OriginalProfit:'-'}}</td>
+        <td>{{item.CurrencyName}}</td>
         <td>{{item.StandardProfit?item.StandardProfit:'-'}}</td>
         <td>{{item.ProfitRate?item.ProfitRate+'%':'-'}}</td>
+        <td>{{(item.StandardProfit*item.ProfitRate).toFixed(2)}}</td>
+        <td>{{item.CommissionMoney}}</td>
+        
+        
         <td>{{item.CommissionRate?item.CommissionRate+'%':'-'}}</td>
-        <td>{{item.CurrencyName}}</td>
+        
         <td>{{item.Periods}}</td>
         <td>{{item.Description}}</td>
       </tr>
@@ -280,7 +283,7 @@
       },
       getqishilist() {
         this.apipost(
-          "sellcommission_GetTWCommissionPeriodsList", {},
+          "sellcommission_GetTWSellCommissionPeriodsList", {},
           res => {
             if (res.data.resultCode == 1) {
               this.PeriodsList = res.data.data;