1

src/components/FinancialModule/domesticCommission.vue

@@ -49,7 +49,7 @@
                 <th>期数</th>
                 <th>名称</th>
                 <th>总金额</th>
-                <th>所属公司提出</th>
+                <th>所属公司提成</th>
                 <th>财务单据</th>
                 <th>操作信息</th>
                 <th>操作</th>
@@ -63,8 +63,11 @@
                 </td>
                 <td>{{item.BranchCommission}}</td>
                 <td>
-                    <span v-for="(x,y) in item.FinanceIdList" style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'>
-                        {{x}}{{item.FinanceIdList.length == y+1 ?'':'、'}}
+                    <span v-for="(x,y) in item.FinanceIdList" >
+                        <span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'>
+                            {{x}}
+                        </span>
+                       {{item.FinanceIdList.length == y+1 ?'':'、'}}
                     </span>
                 </td>
                 <td>

src/components/FinancialModule/domesticCommissiondetails.vue

@@ -35,11 +35,11 @@
                     </el-select>
                 </li>
                 <li>
-                    <em>人员</em>
-                    <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
+                    <em>出团公司</em>
+                    <el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)" >
                         <el-option label="不限" :value="-1"></el-option>
-                        <el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name"
-                            :value="item.empId"></el-option>
+                        <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
+                            :value="item.Id"></el-option>
                     </el-select>
                 </li>
                 <li>
@@ -58,6 +58,15 @@
                             :value="item.DepartmentID"></el-option>
                     </el-select>
                 </li>
+                <li>
+                    <em>人员</em>
+                    <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
+                        <el-option label="不限" :value="-1"></el-option>
+                        <el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name"
+                            :value="item.empId"></el-option>
+                    </el-select>
+                </li>
+               
                 <li>
                     <em>订单号</em>
                     <el-input maxlength="50" v-model="msg.OrderId" class="permiss-input w200"
@@ -90,6 +99,7 @@
                 <th>公司</th>
                 <th>部门</th>
                 <th>销售</th>
+                <th>出团公司</th>
                 <th>团信息</th>
                 <th>订单号</th>
                 <th>人数</th>
@@ -107,6 +117,7 @@
                 <td>{{item.BranchName}}</td>
                 <td>{{item.DeptName}}</td>
                 <td>{{item.UserName}}</td>
+                <td>{{item.OutBranchName}}</td>
                 <td style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">{{item.TCNUM}}({{item.TCID}})</td>
                 <td>{{item.OrderId}}</td>
                 <td>{{item.PeopleCount}}</td>
@@ -155,6 +166,7 @@
                     RB_Department_Id: -1,
                     OrderId:'',
                     TCNUM:'',
+                    OutBranchId:-1
                 },
                 loading: false,
                 //数据源
@@ -316,7 +328,10 @@
                 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_post_GetGNCommissionSingleDetailsListToExcel", msg, fileName);
             },