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

src/components/FinancialModule/domesticCommission.vue

@@ -31,6 +31,18 @@
                         <el-option v-for="(item,index) in PeriodsList" :key="item.index" :label="item.Name" :value="item.Id"></el-option>
                     </el-select>
                 </li>
+                <li>
+                    <em>选择月份</em>
+                    <el-date-picker
+                    v-model="Month"
+                    value-format="yyyy-MM"
+                    type="month"
+                    placeholder="选择月">
+                  </el-date-picker>
+                  </li>
+                  <li v-show="btnShow">
+                      <el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="generateTable">生成提成</el-button>
+                  </li>
 
             </ul>
         </div>
@@ -75,7 +87,7 @@
         </table>
         <!-- 分页 -->
         <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
-            layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
+            layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
         </el-pagination>
        
     </div>
@@ -98,12 +110,13 @@
                 total: 0,
                 btnShow: false,
                 PeriodsList:[],
+                btnLoading:false
             }
         },
         mounted() {
             let userInfo = this.getLocalStorage();
             let ActionMenuCode = userInfo.ActionMenuCode;
-            if (ActionMenuCode.indexOf('P_OPCommissionSend') != -1) {
+            if (ActionMenuCode.indexOf('F_DCommissionSend') != -1) {
                 this.btnShow = true;
             }
             this.getqishilist()
@@ -166,6 +179,28 @@
                     null
                 );
             },
+            //生成提成报表
+            generateTable(){
+                if(!this.Month||this.Month==""){
+                    this.Error("请选择月份！")
+                    return;
+                }
+                this.btnLoading=true;
+                this.apipost(
+                    "sellcommission_Post_SetGNCommissionSend",{Month:this.Month},
+                    res => {
+                    this.btnLoading=false;
+
+                    if(res.data.resultCode==1){
+                        this.handleCurrentChange(1);
+                        this.Success('报表生成成功')
+                    }else{
+                        this.Error(res.data.message);
+                    }
+                    },
+                    null
+                );
+            }
      
         }
     }

src/components/FinancialModule/domesticCommissionUser.vue

@@ -55,28 +55,31 @@
         </div>
         <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
             <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>
             </tr>
             <tr v-for="item in dataList">
-                <td>{{item.Periods}}</td>
-                <td>{{item.UserName}}</td>
-                <td>{{item.DeptName}}</td>
                 <td>{{item.BranchName}}</td>
+                <td>{{item.DeptName}}</td>
+                <td>{{item.UserName}}</td>
+                <td>{{item.PeopleCount}}</td>
+
                 <td>{{item.CommissionMoney}}</td>
                 <td>{{item.OtherMoney}}</td>
                 <td>{{item.BackMoney}}</td>
                 <td>{{item.YFMoney}}</td>
-                <td>{{item.PeopleCount}}</td>
-             
+                <td>{{item.Periods}}</td>
+
                 <td>
 
                     <el-tooltip class="item" effect="dark" content="查看" placement="top">
@@ -93,7 +96,7 @@
         </table>
         <!-- 分页 -->
         <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
-            layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
+            layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
         </el-pagination>
 
     </div>

src/components/FinancialModule/domesticCommissiondetails.vue

@@ -48,31 +48,35 @@
         </div>
         <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0" 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> -->
             </tr>
             <tr v-for="item in dataList">
-                <td>{{item.Periods}}</td>
-                <td>{{item.TCNUM}}({{item.TCID}})</td>
+                <td style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">{{item.TCNUM}}({{item.TCID}})</td>
                 <td>{{item.OrderId}}</td>
-                <td>{{item.UserName}}</td>
-                <td>{{item.DeptName}}</td>
                 <td>{{item.BranchName}}</td>
+                <td>{{item.DeptName}}</td>
+                <td>{{item.UserName}}</td>
+                <td>{{item.PeopleCount}}</td>
                 <td>{{item.CommissionMoney}}</td>
                 <td>{{item.OtherMoney}}</td>
                 <td>{{item.BackMoney}}</td>
                 <td>{{item.YFMoney}}</td>
-                <td>{{item.PeopleCount}}</td>
+                <td>{{item.Periods}}</td>
+
              
                 <!-- <td>
 
@@ -90,7 +94,7 @@
         </table>
         <!-- 分页 -->
         <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
-            layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
+            layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
         </el-pagination>
 
     </div>
@@ -271,6 +275,16 @@
                 var fileName = "国内提成明细.xls";
                 this.GetLocalFile("sellcommission_post_GetGNCommissionSingleDetailsListToExcel", msg, fileName);
             },
+            goTravel(TCID){//跳转到团队列表
+                this.$router.push({
+                    path: 'TravelControlList',
+                    query: {
+                        TCID: TCID,
+                        blank: 'y',
+                        tab: '团控列表'
+                    }
+                });
+            }
 
         }
     }