Commit 88a972ad authored by 黄奎's avatar 黄奎

页面修改

parent 53912d91
...@@ -1437,7 +1437,6 @@ ...@@ -1437,7 +1437,6 @@
break break
} }
} }
// console.log(this.msg.detailList,'this.msg.detailList')
let price = 0 let price = 0
if(obj.SettlementType==1){ if(obj.SettlementType==1){
if(this.msg.detailList && this.msg.detailList.length>0){ if(this.msg.detailList && this.msg.detailList.length>0){
...@@ -1447,14 +1446,11 @@ ...@@ -1447,14 +1446,11 @@
} }
}) })
} }
// console.log(price,obj.Commission,'obj.Commission')
this.msg.OriginalFee = Math.round((price * obj.Commission) ) / 100; this.msg.OriginalFee = Math.round((price * obj.Commission) ) / 100;
}else{ }else{
this.msg.OriginalFee = 0 this.msg.OriginalFee = 0
this.msg.Fee = 0 this.msg.Fee = 0
} }
}, },
Calculation(t, i) { // 计算原币 本位币 Calculation(t, i) { // 计算原币 本位币
let numberC = 0; let numberC = 0;
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
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;
} }
...@@ -22,32 +23,34 @@ ...@@ -22,32 +23,34 @@
text-decoration: underline; text-decoration: underline;
color: red; color: red;
} }
</style> </style>
<template> <template>
<div class="flexOne domesticCommissiondetails"> <div class="flexOne domesticCommissiondetails">
<div style="min-height: 70px;"> <div style="min-height: 70px;">
<ul class="opUl" > <ul class="opUl">
<li> <li>
<em>期数</em> <em>期数</em>
<el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)"> <el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)">
<el-option label="不限" :value="0"></el-option> <el-option label="不限" :value="0"></el-option>
<el-option v-for="(item,index) in PeriodsList" :key="item.index" :label="item.Name" :value="item.Id"></el-option> <el-option v-for="(item,index) in PeriodsList" :key="item.index" :label="item.Name" :value="item.Id">
</el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<em>出团公司</em> <em>出团公司</em>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)" > <el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)">
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" :value="item.Id">
:value="item.Id"></el-option> </el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<em>公司</em> <em>公司</em>
<el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'> <el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" :value="item.Id">
:value="item.Id"></el-option> </el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
...@@ -62,8 +65,8 @@ ...@@ -62,8 +65,8 @@
<em>人员</em> <em>人员</em>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'> <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name" <el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name" :value="item.empId">
:value="item.empId"></el-option> </el-option>
</el-select> </el-select>
</li> </li>
...@@ -93,7 +96,8 @@ ...@@ -93,7 +96,8 @@
<input type="button" class="normalBtn" value="导出" @click="exportExcel"> <input type="button" class="normalBtn" value="导出" @click="exportExcel">
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0" style="margin-top: 10px;"> <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
style="margin-top: 10px;">
<tr> <tr>
<th>公司</th> <th>公司</th>
...@@ -116,7 +120,7 @@ ...@@ -116,7 +120,7 @@
<td>{{item.BranchName}}</td> <td>{{item.BranchName}}</td>
<td>{{item.DeptName}}</td> <td>{{item.DeptName}}</td>
<td>{{item.UserName}}</td> <td>{{item.UserName}}</td>
<td > <td>
<div>{{item.OutBranchName}}</div> <div>{{item.OutBranchName}}</div>
<span style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)"> <span style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">
{{item.TCNUM}}({{item.TCID}}) {{item.TCNUM}}({{item.TCID}})
...@@ -168,9 +172,9 @@ ...@@ -168,9 +172,9 @@
UserId: -1, UserId: -1,
RB_Branch_Id: -1, RB_Branch_Id: -1,
RB_Department_Id: -1, RB_Department_Id: -1,
OrderId:'', OrderId: '',
TCNUM:'', TCNUM: '',
OutBranchId:-1 OutBranchId: -1
}, },
loading: false, loading: false,
//数据源 //数据源
...@@ -180,42 +184,41 @@ ...@@ -180,42 +184,41 @@
PeriodsList: [], PeriodsList: [],
BranchList: [], BranchList: [],
searchList: [], searchList: [],
departMentList:[], departMentList: [],
TotalMoney:0, TotalMoney: 0,
TotalNum:0, TotalNum: 0,
disabled:true disabled: true
} }
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode; let ActionMenuCode = userInfo.ActionMenuCode;
console.log(this.$route.query,'this.$route.query') 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.PeriodId = Number(this.$route.query.PeriodId) this.msg.PeriodId = Number(this.$route.query.PeriodId)
} }
if(this.$route.query.UserId && this.$route.query.UserId>0){ if (this.$route.query.UserId && this.$route.query.UserId > 0) {
this.msg.UserId =Number(this.$route.query.UserId) this.msg.UserId = Number(this.$route.query.UserId)
} }
if(this.$route.query.RB_Branch_Id){ if (this.$route.query.RB_Branch_Id) {
this.msg.RB_Branch_Id = Number(this.$route.query.RB_Branch_Id) this.msg.RB_Branch_Id = Number(this.$route.query.RB_Branch_Id)
} }
if(this.$route.query.RB_Department_Id && this.$route.query.RB_Department_Id>0){ if (this.$route.query.RB_Department_Id && this.$route.query.RB_Department_Id > 0) {
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id) this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id)
} }
} }
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限 if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限
this.disabled = false; this.disabled = false;
}else{ } else {
this.disabled = true; this.disabled = true;
this.msg.UserId = Number(userInfo.EmployeeId) this.msg.UserId = Number(userInfo.EmployeeId)
} }
this.getList(); this.getList();
this.getqishilist() this.getqishilist()
this.getCompanyList()//获取公司 this.getCompanyList() //获取公司
this.getEmployee()//人员 this.getEmployee() //人员
this.getDerpartMent()//部门 this.getDerpartMent() //部门
}, },
methods: { methods: {
getDerpartMent() { getDerpartMent() {
...@@ -226,12 +229,12 @@ ...@@ -226,12 +229,12 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.departMentList = res.data.data; this.departMentList = res.data.data;
} else { } } else {}
}, },
err => { } err => {}
); );
}, },
getEmployee() {//所有人员下拉 getEmployee() { //所有人员下拉
let employeeMsg = { let employeeMsg = {
RB_Group_id: "0", RB_Group_id: "0",
RB_Branch_id: "-1", RB_Branch_id: "-1",
...@@ -246,7 +249,7 @@ ...@@ -246,7 +249,7 @@
this.searchList = res.data.data; this.searchList = res.data.data;
} }
}, },
err => { } err => {}
); );
}, },
//初始化公司 //初始化公司
...@@ -267,13 +270,12 @@ ...@@ -267,13 +270,12 @@
} }
}, },
err => { } err => {}
); );
}, },
getqishilist() { getqishilist() {
this.apipost( this.apipost(
"sellcommission_GetGNCommissionPeriodsList", "sellcommission_GetGNCommissionPeriodsList", {},
{},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.PeriodsList = res.data.data; this.PeriodsList = res.data.data;
...@@ -307,7 +309,7 @@ ...@@ -307,7 +309,7 @@
//获取数据 //获取数据
getList() { getList() {
let msg = JSON.parse(JSON.stringify(this.msg)) let msg = JSON.parse(JSON.stringify(this.msg))
if(msg.OrderId==''){ if (msg.OrderId == '') {
msg.OrderId = 0 msg.OrderId = 0
} }
this.loading = true; this.loading = true;
...@@ -317,8 +319,8 @@ ...@@ -317,8 +319,8 @@
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.TotalMoney = res.data.data.TotalMoney?res.data.data.TotalMoney:0 this.TotalMoney = res.data.data.TotalMoney ? res.data.data.TotalMoney : 0
this.TotalNum = res.data.data.TotalNum?res.data.data.TotalNum:0 this.TotalNum = res.data.data.TotalNum ? res.data.data.TotalNum : 0
this.dataList = res.data.data.pmodel.pageData; this.dataList = res.data.data.pmodel.pageData;
this.total = res.data.data.pmodel.count; this.total = res.data.data.pmodel.count;
} else { } else {
...@@ -328,9 +330,9 @@ ...@@ -328,9 +330,9 @@
null null
); );
}, },
exportExcel(){//导出 exportExcel() { //导出
let msg = JSON.parse(JSON.stringify(this.msg)) let msg = JSON.parse(JSON.stringify(this.msg))
if(msg.OrderId==''){ if (msg.OrderId == '') {
msg.OrderId = 0 msg.OrderId = 0
} }
...@@ -339,7 +341,7 @@ ...@@ -339,7 +341,7 @@
var fileName = "国内提成明细.xls"; var fileName = "国内提成明细.xls";
this.GetLocalFile("sellcommission_post_GetGNCommissionSingleDetailsListToExcel", msg, fileName); this.GetLocalFile("sellcommission_post_GetGNCommissionSingleDetailsListToExcel", msg, fileName);
}, },
goTravel(TCID){//跳转到团队列表 goTravel(TCID) { //跳转到团队列表
this.$router.push({ this.$router.push({
path: 'TravelControlList', path: 'TravelControlList',
query: { query: {
...@@ -352,4 +354,5 @@ ...@@ -352,4 +354,5 @@
} }
} }
</script> </script>
...@@ -1398,7 +1398,6 @@ ...@@ -1398,7 +1398,6 @@
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => { this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.TeamListArr = res.data.data; this.TeamListArr = res.data.data;
console.log("this.TeamListArr", this.TeamListArr);
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
}, },
}, },
created() { created() {
this.ViewDomain = this.domainManager().ViewFileUrl; this.ViewDomain = this.domainManager().ViittoFileUrl;
}, },
mounted() { mounted() {
this.loadUe(); this.loadUe();
......
...@@ -127,13 +127,11 @@ ...@@ -127,13 +127,11 @@
newArr.push(files.file); newArr.push(files.file);
var that=this; var that=this;
this.UploadSelfFileT('Attachment', newArr, res => { this.UploadSelfFileT('Attachment', newArr, res => {
console.log("res", res);
if (res.data.StatusCode == 1) { if (res.data.StatusCode == 1) {
this.chooseFileArray.push({ this.chooseFileArray.push({
fileName: res.data.FileName, fileName: res.data.FileName,
fileUrl: that.domainManager().ViittoFileUrl + res.data.FilePath fileUrl: that.domainManager().ViittoFileUrl + res.data.FilePath
}) })
console.log(" this.chooseFileArray", this.chooseFileArray);
this.$emit("selected", this.chooseFileArray); this.$emit("selected", this.chooseFileArray);
this.chooseFileArray = []; this.chooseFileArray = [];
} }
......
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