Skip to content

S
SuperMan
Commit 74626e22 authored by youjie's avatar youjie
Browse files
Options

no message

parent 3875f60e
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 44 deletions
src/components/FinancialModule/OpCommission/OpComPersonDetails.vue
View file @ 74626e22
......@@ -4,20 +4,20 @@
position: relative;
top: 1px;
}
.opUl li {
display: inline-block;
margin: 10px 15px 10px 0;
}
.domesticCommissiondetails .opUl li input {
height: 34px !important;
}
.domesticCommissiondetails .singeRowTable tr td {
padding: 8px 5px;
}
.domesticCommissiondetails .hoverSpan span:hover {
cursor: pointer;
text-decoration: underline;
......@@ -36,13 +36,13 @@
<ul class="opUl">
<li>
<em>出团公司</em>
<el-select filterable v-model='msg.RB_Branch_Id'
<el-select filterable v-model='msg.RB_Branch_Id'
@change='handleCurrentChange(1)'>
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
......@@ -57,24 +57,24 @@
</li>
<li>
<em>所属公司</em>
<el-select filterable v-model='msg.EmBranchId'
<el-select filterable v-model='msg.EmBranchId'
@change='getDepartment();handleCurrentChange(1)' :disabled="disabled">
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</li>
<li>
<em>部门</em>
<el-select filterable v-model='msg.RB_Department_Id'
<el-select filterable v-model='msg.RB_Department_Id'
@change='getEmployee();handleCurrentChange(1)'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for='item in departmentList'
<el-option v-for='item in departmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
......@@ -83,7 +83,7 @@
</li>
<li>
<em>人员</em>
<el-select v-model="msg.EmployeeId" size="mini"
<el-select v-model="msg.EmployeeId" size="mini"
@change="handleCurrentChange(1)" :disabled="disabled" filterable>
<el-option label="不限" :value="-1"></el-option>
<el-option label="微途" :value="-2"></el-option>
......@@ -116,8 +116,8 @@
<el-option v-for="item in WayTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</li>
<li style="position: fixed;right: 3px;top: 51px;"><input type="button" class="normalBtn" value="导出" @click="exportExcel"></li>
</ul>
</div>
......@@ -140,7 +140,7 @@
</p>
</div>
</el-col>
</el-row>
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
......@@ -151,11 +151,11 @@
<th style="width: 150px;">团/订单ID</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>
......@@ -163,7 +163,7 @@
<th style="width: 100px;">提成金额</th>
<th style="width: 100px;">期数</th>
<th width='200'>备注</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.OutBranchName?item.OutBranchName:'-'}}</td>
......@@ -171,7 +171,7 @@
<td>
<span class="cursor-p" :style="{'color': !disabled?'#409EFF':''}" @click="clickUrl(item)">{{item.TCID}}</span>
</td>
<td><span class="cursor-p" :style="{'color': !disabled?'#409EFF':''}" v-if="item.TCNUM"
<td><span class="cursor-p" :style="{'color': !disabled?'#409EFF':''}" v-if="item.TCNUM"
@click="!disabled?goTuanDetails(item):''">{{item.TCNUM}}</span></td>
<td>{{item.BranchName?item.BranchName:'-'}}</td>
<td>{{item.DeptName?item.DeptName:'-'}}</td>
......@@ -195,12 +195,12 @@
</el-pagination>
</div>
</template>
<script>
import moment from "moment"
export default {
components:{
},
data() {
return {
......@@ -281,14 +281,14 @@
}
if (this.$route.query) { //不大于0的话用默认值
if (this.$route.query.PeriodId && this.$route.query.PeriodId > 0) {
}
}
this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:''
this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
this.msg.RB_Branch_Id = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
this.msg.EmBranchId = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
......@@ -300,7 +300,7 @@
}else{
this.disabled = true;
}
},
methods: {
GetOrderTypeEnumList() {
......@@ -318,7 +318,7 @@
this.departmentList = res.data.data;
}
}, err => {})
},
getCompany(){
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
......@@ -326,7 +326,7 @@
this.companyList=res.data.data;
}else{}
},err=>{})
},
},
goTuanDetails(row) {
let name = ''
// if (row.IsOneDayOrder == 1) {
......@@ -353,7 +353,7 @@
clickUrl(row){
let name = ''
if (row.OrderType == 5) {//签证
if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
name = 'VisaProductEditOrderOP'
} else {
name = 'VisaProductEditOrder'
......@@ -362,7 +362,7 @@
name: name,
});
} else if (row.OrderType == 1||row.OrderType == 6) { //跟团 一日游 团签
if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
name = 'enrollTotal'
}else{
if (row.TravelType == 0) {//正规团
......@@ -374,13 +374,13 @@
}
}
} else if (row.OrderType == 2) { //酒店
if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
name = 'singleProductHotelOrderOP'
} else {
name = 'singleProductHotelOrder'
}
} else if (row.OrderType == 3) { //门票
if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
name = 'SingleticketOrderListOP'
} else {
name = 'SingleticketOrderList'
......@@ -437,7 +437,7 @@
if (pageData && pageData.length > 0) {
OrderType = pageData[0].OrderType
}
if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
name = 'CharterOrderListOP'
} else {
name = 'CharterOrderList'
......@@ -502,8 +502,8 @@
err => {}
);
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
......@@ -547,9 +547,8 @@
var fileName = "OP提成明细表.xls";
this.GetLocalFile("opcommission_GetNewOPCommissionDetailsListToExcel", msg, fileName);
}
}
}
</script>
\ No newline at end of file
src/components/FinancialModule/TradeCommission/TicketDetails.vue
View file @ 74626e22
......@@ -356,7 +356,7 @@
if (row.OrderType == 1) {
if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
data[0].path = 'customerOrderAllType'
} else {
data[0].path = 'myCustomerOrderAllType'
......@@ -367,7 +367,7 @@
} else {
let name = ''
if (row.OrderType == 6) {
if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
name = 'VisaProductEditOrderOP'
} else {
name = 'VisaProductEditOrder'
......@@ -376,7 +376,7 @@
name: name,
});
} else if (row.OrderType == 2) { //跟团 一日游
if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
name = 'enrollTotal'
} else {
if (row.TravelType == 1) {
......@@ -386,13 +386,13 @@
}
}
} else if (row.OrderType == 3) { //酒店
if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
name = 'singleProductHotelOrderOP'
} else {
name = 'singleProductHotelOrder'
}
} else if (row.OrderType == 4) { //门票
if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
name = 'SingleticketOrderListOP'
} else {
name = 'SingleticketOrderList'
......@@ -456,7 +456,7 @@
if (pageData && pageData.length > 0) {
OrderType = pageData[0].OrderType
}
if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
name = 'CharterOrderListOP'
} else {
name = 'CharterOrderList'
......
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