Commit 4af9e597 authored by youjie's avatar youjie

no message

parent 14d4bd36
...@@ -4,20 +4,20 @@ ...@@ -4,20 +4,20 @@
position: relative; position: relative;
top: 1px; top: 1px;
} }
.opUl li { .opUl li {
display: inline-block; display: inline-block;
margin: 10px 15px 10px 0; margin: 10px 15px 10px 0;
} }
.domesticCommissiondetails .opUl li input { .domesticCommissiondetails .opUl li input {
height: 34px !important; height: 34px !important;
} }
.domesticCommissiondetails .singeRowTable tr td { .domesticCommissiondetails .singeRowTable tr td {
padding: 8px 5px; padding: 8px 5px;
} }
.domesticCommissiondetails .hoverSpan span:hover { .domesticCommissiondetails .hoverSpan span:hover {
cursor: pointer; cursor: pointer;
text-decoration: underline; text-decoration: underline;
...@@ -36,13 +36,13 @@ ...@@ -36,13 +36,13 @@
<ul class="opUl"> <ul class="opUl">
<li> <li>
<em>出团公司</em> <em>出团公司</em>
<el-select filterable v-model='msg.OutBranchId' <el-select filterable v-model='msg.OutBranchId'
@change='handleCurrentChange(1)'> @change='handleCurrentChange(1)'>
<el-option label="不限" :value="-1" :key="-1"></el-option> <el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option <el-option
v-for="item in companyList" v-for="item in companyList"
:label='item.BName' :label='item.BName'
:value='item.Id' :value='item.Id'
:key='item.Id' :key='item.Id'
></el-option> ></el-option>
</el-select> </el-select>
...@@ -57,24 +57,24 @@ ...@@ -57,24 +57,24 @@
</li> </li>
<li> <li>
<em>所属公司</em> <em>所属公司</em>
<el-select filterable v-model='msg.RB_Branch_Id' <el-select filterable v-model='msg.RB_Branch_Id'
@change='getDepartment();handleCurrentChange(1)' :disabled="disabled"> @change='getDepartment();handleCurrentChange(1)' :disabled="disabled">
<el-option label="不限" :value="-1" :key="-1"></el-option> <el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option <el-option
v-for="item in companyList" v-for="item in companyList"
:label='item.BName' :label='item.BName'
:value='item.Id' :value='item.Id'
:key='item.Id' :key='item.Id'
></el-option> ></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<em>部门</em> <em>部门</em>
<el-select filterable v-model='msg.RB_Department_Id' <el-select filterable v-model='msg.RB_Department_Id'
@change='getEmployee();handleCurrentChange(1)'> @change='getEmployee();handleCurrentChange(1)'>
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option v-for='item in departmentList' <el-option v-for='item in departmentList'
:label='item.DepartmentName' :label='item.DepartmentName'
:value='item.DepartmentID' :value='item.DepartmentID'
:key='item.DepartmentID'> :key='item.DepartmentID'>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</li> </li>
<li> <li>
<em>人员</em> <em>人员</em>
<el-select v-model="msg.UserId" size="mini" <el-select v-model="msg.UserId" size="mini"
@change="handleCurrentChange(1)" :disabled="disabled" filterable> @change="handleCurrentChange(1)" :disabled="disabled" filterable>
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option label="微途" :value="-2"></el-option> <el-option label="微途" :value="-2"></el-option>
...@@ -109,9 +109,9 @@ ...@@ -109,9 +109,9 @@
<el-option v-for="item in OrderTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option> <el-option v-for="item in OrderTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select> </el-select>
</li> </li>
<li style="position: fixed;right: 3px;top: 51px;"><input type="button" class="normalBtn" value="导出" @click="exportExcel"></li> <li style="position: fixed;right: 3px;top: 51px;"><input type="button" class="normalBtn" value="导出" @click="exportExcel"></li>
</ul> </ul>
</div> </div>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
</p> </p>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0" <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
...@@ -145,12 +145,12 @@ ...@@ -145,12 +145,12 @@
<th style="width: 80px;">订单号</th> <th style="width: 80px;">订单号</th>
<th style="width: 150px;">团号</th> <th style="width: 150px;">团号</th>
<th style="width: 100px;">所属公司</th> <th style="width: 100px;">所属公司</th>
<th style="width: 100px;">部门</th> <th style="width: 100px;">部门</th>
<th style="width: 100px;">姓名</th> <th style="width: 100px;">姓名</th>
<th style="width: 100px;">线路</th> <th style="width: 100px;">线路</th>
<th style="width: 100px;">是否欧洲</th> <th style="width: 100px;">是否欧洲</th>
<th style="width: 100px;">订单利润</th> <th style="width: 100px;">订单利润</th>
<th style="width: 100px;">团队总人数</th> <th style="width: 100px;">团队总人数</th>
<th style="width: 100px;">团队利润</th> <th style="width: 100px;">团队利润</th>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<th style="width: 100px;">提成金额</th> <th style="width: 100px;">提成金额</th>
<th style="width: 100px;">期数</th> <th style="width: 100px;">期数</th>
<th width='200'>备注</th> <th width='200'>备注</th>
</tr> </tr>
<tr v-for="item in dataList"> <tr v-for="item in dataList">
<td>{{item.OutBranchName?item.OutBranchName:'-'}}</td> <td>{{item.OutBranchName?item.OutBranchName:'-'}}</td>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
<td>{{item.IsEurope==1?'是':''}}</td> <td>{{item.IsEurope==1?'是':''}}</td>
<td>{{item.TCProfit?item.TCProfit:'-'}}</td> <td>{{item.TCProfit?item.TCProfit:'-'}}</td>
<td>{{item.PeopleNum?item.PeopleNum:'-'}}</td> <td>{{item.PeopleNum?item.PeopleNum:'-'}}</td>
<td>{{item.TCGuestNum?item.TCGuestNum:'-'}}</td> <td>{{item.TCProfit?item.TCProfit:'-'}}</td><!-- TCGuestNum -->
<td>{{item.Way==1?'销售额':'利润比'}}</td> <td>{{item.Way==1?'销售额':'利润比'}}</td>
<td>{{item.Rate?item.Rate+'%':'-'}}</td> <td>{{item.Rate?item.Rate+'%':'-'}}</td>
<td>{{item.OrderProfit}}</td> <td>{{item.OrderProfit}}</td>
...@@ -192,12 +192,12 @@ ...@@ -192,12 +192,12 @@
</el-pagination> </el-pagination>
</div> </div>
</template> </template>
<script> <script>
import moment from "moment" import moment from "moment"
export default { export default {
components:{ components:{
}, },
data() { data() {
return { return {
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
} }
if (this.$route.query) { //不大于0的话用默认值 if (this.$route.query) { //不大于0的话用默认值
if (this.$route.query.PeriodId && this.$route.query.PeriodId > 0) { if (this.$route.query.PeriodId && this.$route.query.PeriodId > 0) {
} }
} }
this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:'' this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:''
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
this.msg.OrderId = this.$route.query.OrderId?this.$route.query.OrderId:'' this.msg.OrderId = this.$route.query.OrderId?this.$route.query.OrderId:''
this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1 this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id) this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId) this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1 ||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限 ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
}else{ }else{
this.disabled = true; this.disabled = true;
} }
}, },
methods: { methods: {
GetOrderTypeEnumList() { GetOrderTypeEnumList() {
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
this.departmentList = res.data.data; this.departmentList = res.data.data;
} }
}, err => {}) }, err => {})
}, },
getCompany(){ getCompany(){
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
this.companyList=res.data.data; this.companyList=res.data.data;
}else{} }else{}
},err=>{}) },err=>{})
}, },
goTuanDetails(row) { goTuanDetails(row) {
let name = '' let name = ''
if (row.IsOneDayOrder == 1) { if (row.IsOneDayOrder == 1) {
...@@ -513,8 +513,8 @@ ...@@ -513,8 +513,8 @@
err => {} err => {}
); );
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
...@@ -558,9 +558,8 @@ ...@@ -558,9 +558,8 @@
var fileName = "同业提成人员表.xls"; var fileName = "同业提成人员表.xls";
this.GetLocalFile("sellcommission_GetTYSaleCommissionSingleDetailsListToExcel", msg, fileName); this.GetLocalFile("sellcommission_GetTYSaleCommissionSingleDetailsListToExcel", msg, fileName);
} }
} }
} }
</script> </script>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment