no message

src/components/FinancialModule/domesticCommissionUserTW2.vue

@@ -59,10 +59,14 @@
                             :value="item.DepartmentID"></el-option>
                     </el-select>
                 </li>
-
                 
             </ul>
         </div>
+        <div style="display: flex;align-items: center;height: 50px;justify-content: space-between;">
+            <div style="display: flex;align-items: center;"></div>
+            <input type="button" class="normalBtn" value="导出" @click="exportExcel">
+      
+          </div>
         <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
             <tr>
                 <th>公司</th>
@@ -267,6 +271,17 @@
                     null
                 );
             },
+            exportExcel() { //导出
+                let msg = JSON.parse(JSON.stringify(this.msg))
+                if (msg.OrderId == '') {
+                msg.OrderId = 0
+
+                }
+                let userInfo = this.getLocalStorage();
+                msg.EmployeeIdUser = userInfo.EmployeeId
+                var fileName = "台湾提成用户分组.xls";
+                this.GetLocalFile("sellcommission_GetTWSellCommissionEmpToExcel", msg, fileName);
+            },
 
         }
     }

src/components/FinancialModule/domesticCommissiondetailsTW2.vue

@@ -107,28 +107,28 @@
       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 width='400'>备注</th>
 
         <!-- <th>操作</th> -->
       </tr>
       <tr v-for="item in dataList">
-
-        <td>{{item.BranchName}}</td>
-        <td>{{item.DeptName}}</td>
+        
         <td>{{item.UserName}}</td>
+        <td>{{item.OutBranchName}}</td>
         <td>
           <div>{{item.OutBranchName}}</div>
           <span style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">
@@ -137,26 +137,16 @@
 
         </td>
         <td>{{item.LineName}}</td>
-        <td>{{item.OrderId?item.OrderId:'-'}}</td>
-        <!-- <td>{{item.TCProfit}}</td> -->
+        <td>{{item.OrderId?item.OrderId:'-'}} {{item.OrderType==1?item.TCNUM:''}}</td>
         <td>{{item.GuestCount}}</td>
         <td>{{item.CommissionMoney}}</td>
-        <!-- <td>{{item.OtherMoney}}</td>
-        <td>{{item.BackMoney}}</td>
-        <td>{{item.RealityCommissionMoney}}</td> -->
+        <td>{{item.OriginalProfit?item.OriginalProfit:'-'}}</td>
+        <td>{{item.StandardProfit?item.StandardProfit:'-'}}</td>
+        <td>{{item.ProfitRate?item.ProfitRate:'-'}}</td>
+        <td>{{item.CommissionRate?item.CommissionRate:'-'}}</td>
+        <td>{{item.CurrencyName}}</td>
         <td>{{item.Periods}}</td>
         <td>{{item.Description}}</td>
-
-
-        <!-- <td>
-
-                    <el-tooltip class="item" effect="dark" content="查看" placement="top">
-                        <el-button type="primary" class="CM_look" @click="goUrl('OPCommissionDetail',item.ID)"
-                            icon="iconfont icon-chakan" circle></el-button>
-                    </el-tooltip>
-
-
-                </td> -->
       </tr>
       <tr v-if="dataList.length==0">
         <td style="text-align:center" colspan="10">暂无数据</td>
@@ -328,7 +318,7 @@
         }
         this.loading = true;
         this.apipost(
-          "sellcommission_GetTWCommissionSingleDetailsList",
+          "sellcommission_GetTWSellCommissionDetailsList",
           msg,
           res => {
             this.loading = false;
@@ -353,7 +343,7 @@
         let userInfo = this.getLocalStorage();
         msg.EmployeeIdUser = userInfo.EmployeeId
         var fileName = "台湾提成明细.xls";
-        this.GetLocalFile("sellcommission_GetTWCommissionSingleDetailsListToExcel", msg, fileName);
+        this.GetLocalFile("sellcommission_GetTWSellCommissionDetailsListToExcel", msg, fileName);
       },
       goTravel(TCID) { //跳转到团队列表
         this.$router.push({