Skip to content

S
SuperMan
Commit 2f307dee authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 25420239
Hide whitespace changes
Inline Side-by-side
Showing with 4310 additions and 3748 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 2f307dee
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ 2f307dee
...@@ -911,7 +911,6 @@ export default { ...@@ -911,7 +911,6 @@ export default {
} }
if(rowIndex<15){ if(rowIndex<15){
console.log(rowData.ZhaiYao,'----11111111111')
if(BranchId == 1245){ if(BranchId == 1245){
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} }) that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
}else if(rowData.ZhaiYao=="联运收入"){ }else if(rowData.ZhaiYao=="联运收入"){
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 2f307dee
...@@ -1743,13 +1743,6 @@ ...@@ -1743,13 +1743,6 @@
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.GetCostTypeList = res.data.data; this.GetCostTypeList = res.data.data;
// let ids = res.data.data.forEach(x=> {
// if(x.ID==1546){
// console.log(x,'==========')
// return x.ID
// }
// })
if (type) { if (type) {
this.msg.detailList.forEach(x => { this.msg.detailList.forEach(x => {
this.GetCostTypeList.forEach(y => { this.GetCostTypeList.forEach(y => {
......
src/components/FinancialModule/components/UserCredit.vue
View file @ 2f307dee
<style> <style>
@import url('../../../assets/css/domestic/TicketingModule.css'); @import url('../../../assets/css/domestic/TicketingModule.css');
.sanjiao-box{
position: relative; .sanjiao-box {
position: relative;
}
.sanjiao-box .Receipt_table td {
padding: 0 10px;
}
.hover_text span {
cursor: pointer;
text-decoration: underline;
} }
.sanjiao-box .Receipt_table td{
padding: 0 10px; .czBillModule td {
} text-align: center !important;
.hover_text span{ padding: 6px 0 !important;
cursor: pointer; }
text-decoration: underline;
} ._tit2 {
.czBillModule td{
text-align: center!important;
padding:6px 0!important;
}
._tit2{
border: none !important; border: none !important;
} }
</style>
<template> </style>
<div class="m_TicketingModule" v-if="DataList&&DataList.length>0"> <template>
<div> <div class="m_TicketingModule" v-if="DataList&&DataList.length>0">
<div class="_tit"> <div>
<span class="_text">预存客户</span> <div class="_tit">
<!-- <div> <span class="_text">预存客户</span>
<!-- <div>
<span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span> <span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span> <span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</div> --> </div> -->
<div> <div>
<span class="_btn" @click="goPrestorageManagement">查看更多</span> <span class="_btn" @click="goPrestorageManagement">查看更多</span>
</div> </div>
</div> </div>
<div v-show="tableShow" class="sanjiao-box _padding_20_15"> <div v-show="tableShow" class="sanjiao-box _padding_20_15">
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"> <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr> <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>
<tr class="_color_b" v-for="(item,index) in DataList" :key="index"> <tr class="_color_b" v-for="(item,index) in DataList" :key="index">
<td>{{item.CustomerName}}</td> <td>{{item.CustomerName}}</td>
<td>{{ item.Contact+'/'+item.ContactNumber }}</td> <td>{{ item.Contact+'/'+item.ContactNumber }}</td>
<td>{{item.Income}}</td> <td>{{item.Income}}</td>
<td>{{item.WaitIncome}}</td> <td>{{item.WaitIncome}}</td>
<td>{{item.Refund}}</td> <td>{{item.Refund}}</td>
<td>{{item.UseMoney}}</td> <td>{{item.UseMoney}}</td>
<td>{{item.DepositMoney}}({{item.DepositCurrencyName}})</td> <td>{{item.DepositMoney}}({{item.DepositCurrencyName}})</td>
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props:["GetDetail"], props: ["GetDetail"],
data(){ data() {
return{ return {
loading: true, loading: true,
cdtotal: 0, cdtotal: 0,
ybtotal: 0, ybtotal: 0,
tableShow: true, tableShow: true,
DataList: [], DataList: [],
msg:{ msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
RemitterName: '', RemitterName: '',
ClientIdStr: '', ClientIdStr: '',
QStartDate: '', QStartDate: '',
QEndDate: '', QEndDate: '',
} }
} }
}, },
watch:{ watch: {
GetDetail:{ GetDetail: {
handler(val, oldVal) { handler(val, oldVal) {
if(this.GetDetail&&this.GetDetail.OtherType==74&&this.GetDetail.ReFinanceId){ if (this.GetDetail && this.GetDetail.OtherType == 74 && this.GetDetail.ReFinanceId) {
this.msg.ClientIdStr = this.GetDetail.ReFinanceId this.msg.ClientIdStr = this.GetDetail.ReFinanceId
}else if(this.GetDetail&&this.GetDetail.DepositCustomerId){ } else if (this.GetDetail && this.GetDetail.DepositCustomerId) {
this.msg.ClientIdStr = this.GetDetail.DepositCustomerId this.msg.ClientIdStr = this.GetDetail.DepositCustomerId
} }
this.GetFinanceDepositPageList(); this.GetFinanceDepositPageList();
...@@ -91,41 +97,46 @@ ...@@ -91,41 +97,46 @@
deep: true, deep: true,
immediate: true, immediate: true,
} }
},created(){ },
created() {
},mounted(){ },
mounted() {
}, },
methods:{ methods: {
goPrestorageManagement(){ goPrestorageManagement() {
this.$router.push( this.$router.push({
{ name: 'prestoreList', name: 'prestoreList',
query:{ query: {
// ClientIdStr:this.msg.ClientIdStr, // ClientIdStr:this.msg.ClientIdStr,
blank:'y',tab:'客户预存管理' blank: 'y',
} tab: '客户预存管理'
} }
) })
}, },
goDetail(id){ goDetail(id) {
this.$router.push( this.$router.push({
{ name: 'FinancialDocumentsDetail', name: 'FinancialDocumentsDetail',
query:{"id":id,blank:'y',tab:'单据详情'} query: {
"id": id,
blank: 'y',
tab: '单据详情'
} }
) })
}, },
// 客户存储余额列表 // 客户存储余额列表
GetFinanceDepositPageList(){ GetFinanceDepositPageList() {
this.apipost('Financial_post_GetFinanceDepositPageList', this.apipost('Financial_post_GetFinanceDepositPageList',
this.msg,res=>{ this.msg, res => {
this.loading = false this.loading = false
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res.data.data.pageData) this.DataList = res.data.data.pageData;
this.DataList = res.data.data.pageData; }
} })
})
}, },
} }
} }
</script>
</script>
src/components/FinancialModule/domestic/OPsalesCommissionUser.vue
View file @ 2f307dee
<style> <style>
.CM_look { .CM_look {
padding: 4px !important; padding: 4px !important;
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;
} }
.domesticCommissionUser .opUl li input{
height: 34px !important; .domesticCommissionUser .opUl li input {
} height: 34px !important;
.domesticCommissionUser .singeRowTable tr td { }
padding: 8px 5px;
} .domesticCommissionUser .singeRowTable tr td {
padding: 8px 5px;
}
.domesticCommissionUser .hoverSpan span:hover {
cursor: pointer;
text-decoration: underline;
color: red;
}
.domesticCommissionUser .hoverSpan span:hover {
cursor: pointer;
text-decoration: underline;
color: red;
}
</style> </style>
<template> <template>
<div class="flexOne domesticCommissionUser"> <div class="flexOne domesticCommissionUser">
<div> <div>
<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 v-for="(item,index) in PeriodsList" :key="item.index" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<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>
<li> <li>
<em>出团公司</em> <em>出团公司</em>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'> <el-select v-model="msg.OutBranchId" 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>
<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>
<em>部门</em> <em>部门</em>
<el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'> <el-select v-model="msg.RB_Department_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 departMentList" :key="item.index" :label="item.DepartmentName" <el-option v-for="(item,index) in departMentList" :key="item.index" :label="item.DepartmentName"
:value="item.DepartmentID"></el-option> :value="item.DepartmentID"></el-option>
</el-select> </el-select>
</li> </li>
</ul> </ul>
</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">
<tr> <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>
<tr v-for="item in dataList"> <tr v-for="item in dataList">
<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>{{item.PeopleCount}}</td> <td>{{item.PeopleCount}}</td>
<td>{{item.CommissionMoney}}</td> <td>{{item.CommissionMoney}}</td>
<td>{{item.Periods}}</td> <td>{{item.Periods}}</td>
<td> <td>
<el-tooltip class="item" effect="dark" content="查看" placement="top"> <el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('OPsalesCommissiondetails',item)" <el-button type="primary" class="CM_look" @click="goUrl('OPsalesCommissiondetails',item)"
icon="iconfont icon-chakan" circle></el-button> icon="iconfont icon-chakan" circle></el-button>
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
<tr v-if="dataList.length==0"> <tr v-if="dataList.length==0">
<td style="text-align:center" colspan="10">暂无数据</td> <td style="text-align:center" colspan="10">暂无数据</td>
</tr> </tr>
</table> </table>
<!-- 分页 --> <!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex" <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> </el-pagination>
</div> </div>
</template> </template>
<script> <script>
import moment from "moment" import moment from "moment"
export default { export default {
data() { data() {
return { return {
Month: moment().format("YYYY-MM"), Month: moment().format("YYYY-MM"),
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
PeriodId: 0, PeriodId: 0,
UserId: -1, UserId: -1,
RB_Branch_Id: -1, RB_Branch_Id: -1,
RB_Department_Id: -1, RB_Department_Id: -1,
OutBranchId:-1, OutBranchId: -1,
},
loading: false,
//数据源
dataList: [],
total: 0,
disabled: true,
PeriodsList: [],
BranchList: [],
searchList: [],
departMentList:[],
}
}, },
mounted() { loading: false,
let userInfo = this.getLocalStorage(); //数据源
let ActionMenuCode = userInfo.ActionMenuCode; dataList: [],
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限 total: 0,
this.disabled = false; disabled: true,
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1 PeriodsList: [],
}else{ BranchList: [],
this.disabled = true; searchList: [],
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId) departMentList: [],
}
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限
this.disabled = false;
this.msg.UserId = this.$route.query.UserId ? Number(this.$route.query.UserId) : -1
} else {
this.disabled = true;
this.msg.UserId = this.$route.query.UserId ? Number(this.$route.query.UserId) : Number(userInfo.EmployeeId)
}
this.msg.PeriodId = this.$route.query.PeriodId ? Number(this.$route.query.PeriodId) : 0
this.getList();
this.getqishilist()
this.getCompanyList() //获取公司
this.getEmployee() //人员
this.getDerpartMent() //部门
},
methods: {
getDerpartMent() {
//获取部门
this.apipost(
"admin_get_DepartmentGetList",
this.getDepartmentMsg,
res => {
if (res.data.resultCode == 1) {
this.departMentList = res.data.data;
} else {}
},
err => {}
);
},
getEmployee() { //所有人员下拉
let employeeMsg = {
RB_Group_id: "0",
RB_Branch_id: "-1",
departmentId: "0",
IsLeave: "-1"
}
this.apipost(
"app_get_company_employee",
employeeMsg,
res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
} }
this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0 },
console.log(this.msg.PeriodId,'====') err => {}
this.getList(); );
this.getqishilist() },
this.getCompanyList()//获取公司 //初始化公司
this.getEmployee()//人员 getCompanyList() {
this.getDerpartMent()//部门 let userInfo = this.getLocalStorage();
}, var RB_Group_id = userInfo.RB_Group_id;
methods: { let msg = {
getDerpartMent() { Status: 0,
//获取部门 is_show: 0,
this.apipost( RB_Group_Id: RB_Group_id
"admin_get_DepartmentGetList", };
this.getDepartmentMsg, this.apipost(
res => { "admin_get_BranchGetList",
if (res.data.resultCode == 1) { msg,
this.departMentList = res.data.data; res => {
} else { } if (res.data.resultCode == 1) {
}, this.BranchList = res.data.data;
err => { }
);
},
getEmployee() {//所有人员下拉
let employeeMsg = {
RB_Group_id: "0",
RB_Branch_id: "-1",
departmentId: "0",
IsLeave: "-1"
}
this.apipost(
"app_get_company_employee",
employeeMsg,
res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
}
},
err => { }
);
},
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage();
var RB_Group_id = userInfo.RB_Group_id;
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
};
this.apipost(
"admin_get_BranchGetList",
msg,
res => {
if (res.data.resultCode == 1) {
this.BranchList = res.data.data;
} }
}, },
err => { } err => {}
); );
}, },
getqishilist() { getqishilist() {
this.apipost( this.apipost(
"opcommission_GetGNOPCommissionPeriodsList", "opcommission_GetGNOPCommissionPeriodsList", {},
{}, res => {
res => { if (res.data.resultCode == 1) {
if (res.data.resultCode == 1) { this.PeriodsList = res.data.data;
this.PeriodsList = res.data.data; if (!this.$route.query.PeriodId && this.PeriodsList && this.PeriodsList.length > 0) {
if (!this.$route.query.PeriodId&&this.PeriodsList && this.PeriodsList.length > 0) { this.msg.PeriodId = Number(this.PeriodsList[0].Id)
this.msg.PeriodId = Number(this.PeriodsList[0].Id) }
}
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
null null
); );
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
goUrl(path, item) { goUrl(path, item) {
this.$router.push({ this.$router.push({
path: path, path: path,
query: { query: {
PeriodId: this.msg.PeriodId, PeriodId: this.msg.PeriodId,
UserId:item.UserId, UserId: item.UserId,
RB_Branch_Id:item.RB_Branch_Id, RB_Branch_Id: item.RB_Branch_Id,
RB_Department_Id:item.RB_Department_Id, RB_Department_Id: item.RB_Department_Id,
blank: 'y', blank: 'y',
tab: '国内提现详情' tab: '国内提现详情'
} }
}); });
}, },
//获取数据 //获取数据
getList() { getList() {
this.loading = true; this.loading = true;
this.apipost( this.apipost(
"opcommission_GetGNOPCommissionDetailsListForUser", "opcommission_GetGNOPCommissionDetailsListForUser",
this.msg, this.msg,
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
null null
); );
}, },
}
} }
}
</script> </script>
src/components/SalesModule/enrollTotal.vue
View file @ 2f307dee
...@@ -617,8 +617,7 @@ ...@@ -617,8 +617,7 @@
<span style="color: red;">{{ item.unionRemark }}</span> <span style="color: red;">{{ item.unionRemark }}</span>
</div> </div>
<div v-if="item.flightName||item.backFlightName"> <div v-if="item.flightName||item.backFlightName">
联运信息：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}2 联运信息：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}
<span v-if="item.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span> <span v-if="item.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【暂定】</span>
</span> </span>
<template v-if="item.flightName"> <template v-if="item.flightName">
......
src/components/Ticketing/TicketTransport.vue
View file @ 2f307dee
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
} }
.DT_rightList .DT_Table { .DT_rightList .DT_Table {
width: 1600px; width: 1700px;
border-collapse: collapse; border-collapse: collapse;
} }
...@@ -119,6 +119,9 @@ ...@@ -119,6 +119,9 @@
<th width="120"> <th width="120">
确认状态 确认状态
</th> </th>
<th width="120">
适用旅客
</th>
</tr> </tr>
</thead> </thead>
<template v-if="UnionList&&UnionList.length>0"> <template v-if="UnionList&&UnionList.length>0">
...@@ -198,6 +201,9 @@ ...@@ -198,6 +201,9 @@
<el-option :key="1" :value="1" label="确认"></el-option> <el-option :key="1" :value="1" label="确认"></el-option>
</el-select> </el-select>
</td> </td>
<td rowspan="2">
{{item.GuestNameInfo}}
</td>
</tr> </tr>
<tr> <tr>
<td>返程</td> <td>返程</td>
...@@ -231,7 +237,7 @@ ...@@ -231,7 +237,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="14" style="text-align:left;font-weight:bold;color:red;"> <td colspan="15" style="text-align:left;font-weight:bold;color:red;">
&nbsp;订单备注:{{item.Remarks}} <br /> &nbsp;订单备注:{{item.Remarks}} <br />
&nbsp;联运备注:{{item.UnionRemark}} &nbsp;联运备注:{{item.UnionRemark}}
</td> </td>
...@@ -240,7 +246,7 @@ ...@@ -240,7 +246,7 @@
</template> </template>
<tbody v-else> <tbody v-else>
<tr> <tr>
<td colspan="14"> <td colspan="15">
暂无配置联运信息 暂无配置联运信息
</td> </td>
</tr> </tr>
...@@ -321,7 +327,6 @@ ...@@ -321,7 +327,6 @@
}, },
res => { res => {
this.loading = false; this.loading = false;
console.log("res", res.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var array = res.data.data; var array = res.data.data;
if (array != null && array.length > 0) { if (array != null && array.length > 0) {
...@@ -404,6 +409,11 @@ ...@@ -404,6 +409,11 @@
item.FlightList = []; item.FlightList = [];
item.BackFlightList = []; item.BackFlightList = [];
}); });
if (this.UnionList && this.UnionList.length > 0) {
this.UnionList.forEach(item => {
item.GuestIds = "";
});
}
let msg = { let msg = {
SaveData: this.UnionList, SaveData: this.UnionList,
TCID: this.TCID TCID: this.TCID
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 2f307dee
...@@ -1011,7 +1011,6 @@ ...@@ -1011,7 +1011,6 @@
<el-dropdown-item v-else @click.native="goToOpenTravel('TravelManager6',item.ID,0)"> <el-dropdown-item v-else @click.native="goToOpenTravel('TravelManager6',item.ID,0)">
{{$t('Operation.Op_xilieModyfi')}} {{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="item.TeamType!=3" <el-dropdown-item v-if="item.TeamType!=3"
@click.native="goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM)"> @click.native="goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM)">
{{$t('Operation.Op_dangtuanModify')}} {{$t('Operation.Op_dangtuanModify')}}
...@@ -1027,9 +1026,17 @@ ...@@ -1027,9 +1026,17 @@
style="background:#67c23a; border-color:#67c23a"> style="background:#67c23a; border-color:#67c23a">
{{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}} {{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}}
</el-button> </el-button>
<el-button v-if="item.LineID==14||item.LineID==118" @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">推送消息 <template v-if="item.LineID==14||item.LineID==118">
</el-button> <el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">推送消息
</el-button>
<el-button v-else @click.native='PushMessage(item)' type="primary"
style="background:red !important; ">已推送
</el-button>
</template>
<el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C"> <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
{{$t('Operation.Op_remark')}} {{$t('Operation.Op_remark')}}
</el-button> </el-button>
...@@ -1534,6 +1541,7 @@ ...@@ -1534,6 +1541,7 @@
this.apipost("travel_post_PushTravelPriceToQYWork", pMsg, res => { this.apipost("travel_post_PushTravelPriceToQYWork", pMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.getControlList();
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/administrative/CommissionDetail.vue
View file @ 2f307dee
<template> <template>
<div class="commissionDetails commissionDetails-box"> <div class="commissionDetails commissionDetails-box">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<input type="button" class="normalBtn" value="导出" @click="exportExcel"> <input type="button" class="normalBtn" value="导出" @click="exportExcel">
</li> </li>
</ul> </ul>
</div> </div>
<div v-if="isReady" v-loading='loading'> <div v-if="isReady" v-loading='loading'>
<el-table <el-table ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%">
ref="multipleTable" <el-table-column prop="bName" label="公司"></el-table-column>
:data="dataList" <el-table-column prop="departmentName" label="部门"></el-table-column>
tooltip-effect="dark" <el-table-column label="姓名">
style="width: 100%" <template slot-scope="scope">
> <div v-if="scope.row.leaveStr && scope.row.leaveStr != ''">{{scope.row.createByStr}}<span
<el-table-column prop="bName" label="公司"></el-table-column> style="color:red;display:inline-block">({{scope.row.leaveStr}})</span></div>
<el-table-column prop="departmentName" label="部门"></el-table-column> <div v-else>{{scope.row.createByStr}}</div>
<el-table-column </template>
label="姓名"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="提成金额">
<div v-if="scope.row.leaveStr && scope.row.leaveStr != ''">{{scope.row.createByStr}}<span style="color:red;display:inline-block">({{scope.row.leaveStr}})</span></div> <template slot-scope="scope">
<div v-else>{{scope.row.createByStr}}</div> <span>{{scope.row.commissionMoney.toFixed(2)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="额外奖励">
label="提成金额"> <template slot-scope="scope">
<template slot-scope="scope"> <span>{{scope.row.otherMoney.toFixed(2)}}</span>
<span>{{scope.row.commissionMoney.toFixed(2)}}</span> </template>
</template> </el-table-column>
</el-table-column> <el-table-column label="额外扣除">
<el-table-column <template slot-scope="scope">
label="额外奖励"> <span>{{scope.row.backMoney.toFixed(2)}}</span>
<template slot-scope="scope"> </template>
<span>{{scope.row.otherMoney.toFixed(2)}}</span> </el-table-column>
</template> <el-table-column label="应发提成">
</el-table-column> <template slot-scope="scope">
<el-table-column <span
label="额外扣除"> style='color:red'>{{(scope.row.otherMoney+scope.row.commissionMoney-scope.row.backMoney).toFixed(2)}}</span>
<template slot-scope="scope"> </template>
<span>{{scope.row.backMoney.toFixed(2)}}</span> </el-table-column>
</template> <el-table-column label="收客人数">
</el-table-column> <template slot-scope="scope">
<el-table-column <span style='color:blue'>{{scope.row.peopleCount}}人</span>
label="应发提成"> </template>
<template slot-scope="scope"> </el-table-column>
<span style='color:red'>{{(scope.row.otherMoney+scope.row.commissionMoney-scope.row.backMoney).toFixed(2)}}</span> <el-table-column label="单签证人数">
</template> <template slot-scope="scope">
</el-table-column> <span style='color:orange'>{{scope.row.visaPeopleCount}}人</span>
<el-table-column </template>
label="收客人数"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="期数">
<span style='color:blue'>{{scope.row.peopleCount}}人</span> <template slot-scope="scope">
</template> <div v-if="scope.row.periods != stringPerons"
</el-table-column> style='height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -5px;;padding-left: 10px;'>
<el-table-column {{scope.row.periods}}</div>
label="单签证人数"> <template v-else>{{scope.row.periods}}</template>
<template slot-scope="scope"> </template>
<span style='color:orange'>{{scope.row.visaPeopleCount}}人</span> </el-table-column>
</template> <el-table-column label="销售留言">
</el-table-column> <template slot-scope="scope">
<el-table-column <div v-if="scope.row.remark" class="outDiv">
label="期数"> <div class="toolDiv">
<template slot-scope="scope"> <div class="triangle_border_up">
<div v-if="scope.row.periods != stringPerons" style='height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -5px;;padding-left: 10px;'>{{scope.row.periods}}</div> </div>{{scope.row.remark}}
<template v-else>{{scope.row.periods}}</template> </div>{{scope.row.remark}}
</template> </div>
</el-table-column> <template v-else>''</template>
<el-table-column </template>
label="销售留言"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作">
<div v-if="scope.row.remark" class="outDiv"> <template slot-scope="scope">
<div class="toolDiv"> <el-button type="primary" size='mini' icon="el-icon-view" circle @click="getInfo(scope.row)"></el-button>
<div class="triangle_border_up"> </template>
</div>{{scope.row.remark}}</div>{{scope.row.remark}}</div> </el-table-column>
<template v-else>''</template> </el-table>
</template> <!-- <div style="padding-bottom:15px">
</el-table-column>
<el-table-column
label="操作">
<template slot-scope="scope">
<el-button type="primary" size='mini' icon="el-icon-view" circle @click="getInfo(scope.row)"></el-button>
</template>
</el-table-column>
</el-table>
<!-- <div style="padding-bottom:15px">
<el-pagination background <el-pagination background
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> </el-pagination>
</div> --> </div> -->
<!-- <!--
<v-table is-horizontal-resize column-width-drag <v-table is-horizontal-resize column-width-drag
style="width:100%" :columns="columns" :table-data="dataList" style="width:100%" :columns="columns" :table-data="dataList"
:filter-method="filterMethod" :total="total" :pageSize="msg.pageSize" :filter-method="filterMethod" :total="total" :pageSize="msg.pageSize"
...@@ -96,374 +87,377 @@ ...@@ -96,374 +87,377 @@
:multiple-sort="multipleSort" :is-loading="loading" sort-always :multiple-sort="multipleSort" :is-loading="loading" sort-always
@sort-change="sortChange" @on-custom-comp="customCompFunc"></v-table> @sort-change="sortChange" @on-custom-comp="customCompFunc"></v-table>
--> -->
</div> </div>
<div style="height:20px;"> </div> <div style="height:20px;"> </div>
</div> </div>
</template> </template>
<script> <script>
import Vue from 'vue' import Vue from 'vue'
import XLSX from 'xlsx' import XLSX from 'xlsx'
var FileSaver = require('file-saver') var FileSaver = require('file-saver')
export default { export default {
data() { data() {
return { return {
activeName: "first", activeName: "first",
commonName: "姓名", commonName: "姓名",
loading: false, loading: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
ParentId: 0, ParentId: 0,
OrderStr: "RB_Branch_Id asc", OrderStr: "RB_Branch_Id asc",
BName: -1, BName: -1,
RB_Branch_Id: -1, RB_Branch_Id: -1,
Periods: '' Periods: ''
}, },
total: 0, total: 0,
currentPage: 1, currentPage: 1,
columns: [], columns: [],
remoteLoading: false, remoteLoading: false,
total: 0, total: 0,
dataList: [], dataList: [],
isReady: false, isReady: false,
multipleSort: false, multipleSort: false,
loading: true, loading: true,
CompanyList: [], CompanyList: [],
dataListTwo: [], dataListTwo: [],
stringPerons: '', stringPerons: '',
userInfo: {}, userInfo: {},
companyID: '', companyID: '',
disabledCPSelect: false disabledCPSelect: false
}; };
}, },
methods: { methods: {
exportExcel() { exportExcel() {
const defaultCellStyle = { const defaultCellStyle = {
'!cols': [{ '!cols': [{
wpx: 60 wpx: 60
}, { }, {
wpx: 200 wpx: 200
}, { }, {
wpx: 60 wpx: 60
}, { }, {
wpx: 150 wpx: 150
}, { }, {
wpx: 60 wpx: 60
}] }]
}; };
const wopts = { const wopts = {
bookType: 'xlsx', bookType: 'xlsx',
bookSST: false, bookSST: false,
type: 'binary', type: 'binary',
defaultCellStyle: defaultCellStyle, defaultCellStyle: defaultCellStyle,
showGridLines: true showGridLines: true
}; };
const wb = { const wb = {
SheetNames: ['提成统计'], SheetNames: ['提成统计'],
Sheets: {}, Sheets: {},
Props: {} Props: {}
}; };
let data = [] let data = []
this.dataList.forEach(x => { this.dataList.forEach(x => {
let obj = { let obj = {
'公司': x.bName, '公司': x.bName,
'部门': x.departmentName, '部门': x.departmentName,
'员工': x.createByStr, '员工': x.createByStr,
'提成金额': x.commissionMoney.toFixed(2), '提成金额': x.commissionMoney.toFixed(2),
'额外奖励': x.otherMoney.toFixed(2), '额外奖励': x.otherMoney.toFixed(2),
'额外扣除': x.backMoney.toFixed(2), '额外扣除': x.backMoney.toFixed(2),
'应发提成': x.sumMoney.toFixed(2), '应发提成': x.sumMoney.toFixed(2),
'收客数': x.peopleCount, '收客数': x.peopleCount,
'单签证人数': x.visaPeopleCount, '单签证人数': x.visaPeopleCount,
'所属期数': x.periods '所属期数': x.periods
} }
data.push(obj) data.push(obj)
}) })
wb.Sheets['提成统计'] = XLSX.utils.json_to_sheet(data) wb.Sheets['提成统计'] = XLSX.utils.json_to_sheet(data)
//创建二进制对象写入转换好的字节流 //创建二进制对象写入转换好的字节流
let tmpDown = new Blob([this.s2ab(XLSX.write(wb, wopts))], { let tmpDown = new Blob([this.s2ab(XLSX.write(wb, wopts))], {
type: "application/octet-stream" type: "application/octet-stream"
}) })
FileSaver.saveAs(tmpDown, "提成统计.xls"); FileSaver.saveAs(tmpDown, "提成统计.xls");
}, },
s2ab(s) { s2ab(s) {
if (typeof ArrayBuffer !== 'undefined') { if (typeof ArrayBuffer !== 'undefined') {
var buf = new ArrayBuffer(s.length); var buf = new ArrayBuffer(s.length);
var view = new Uint8Array(buf); var view = new Uint8Array(buf);
for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
return buf; return buf;
} else { } else {
var buf = new Array(s.length); var buf = new Array(s.length);
for (var i = 0; i != s.length; ++i) buf[i] = s.charCodeAt(i) & 0xFF; for (var i = 0; i != s.length; ++i) buf[i] = s.charCodeAt(i) & 0xFF;
return buf; return buf;
} }
}, },
filterMethod(filters) { filterMethod(filters) {
let data = JSON.parse(JSON.stringify(this.dataListTwo)) let data = JSON.parse(JSON.stringify(this.dataListTwo))
let dataListTwo = JSON.parse(JSON.stringify(this.dataListTwo)) let dataListTwo = JSON.parse(JSON.stringify(this.dataListTwo))
if (filters.bName != '' && filters.bName != '__all__') { if (filters.bName != '' && filters.bName != '__all__') {
data = data.filter(item => item.bName.indexOf(filters.bName) != -1); data = data.filter(item => item.bName.indexOf(filters.bName) != -1);
} }
if (filters.departmentName != '') { if (filters.departmentName != '') {
data = data.filter(item => item.departmentName.indexOf(filters.departmentName) != -1); data = data.filter(item => item.departmentName.indexOf(filters.departmentName) != -1);
} }
if (filters.createByStr != '') { if (filters.createByStr != '') {
data = data.filter(item => item.createByStr.indexOf(filters.createByStr) != -1); data = data.filter(item => item.createByStr.indexOf(filters.createByStr) != -1);
} }
if ((filters.bName === '' || filters.bName === '__all__') && filters.departmentName === '' && filters.createByStr === '') { if ((filters.bName === '' || filters.bName === '__all__') && filters.departmentName === '' && filters
data = dataListTwo .createByStr === '') {
} data = dataListTwo
this.dataList = data }
}, this.dataList = data
customCompFunc(params) { },
if (params.type === "see") { customCompFunc(params) {
this.getInfo(params.data) if (params.type === "see") {
} this.getInfo(params.data)
}, }
getCompanyList() { },
//获取公司列表 getCompanyList() {
this.apipost( //获取公司列表
"admin_get_BranchGetList", this.apipost(
this.getCompanyMsg, "admin_get_BranchGetList",
res => { this.getCompanyMsg,
if (res.data.resultCode == 1) { res => {
let data = res.data.data; if (res.data.resultCode == 1) {
data.forEach(x => { let data = res.data.data;
x.disabled = false; data.forEach(x => {
}); x.disabled = false;
if (this.userInfo.RB_Branch_id != 0) {
this.CompanyList = data.filter(x => {
if (x.BName == this.userInfo.BranchName) {
return x
} else
return false
})
} else {
this.CompanyList = data;
}
this.initColums();
} else {}
},
err => {}
);
},
initColums() {
this.isReady = false;
let that = this;
let companyList = [];
this.CompanyList.forEach(x => {
let item = {};
item.label = x.BName;
item.value = x.BName;
companyList.push(item);
}); });
console.log(companyList,'-------') if (this.userInfo.RB_Branch_id != 0) {
let company = {} this.CompanyList = data.filter(x => {
if (this.disabledCPSelect) { if (x.BName == this.userInfo.BranchName) {
company = { return x
field: "bName", } else
title: "公司", return false
width: 40, })
titleAlign: "left",
columnAlign: "left",
isResize: true,
};
} else {
company = {
field: "bName",
title: "公司",
width: 40,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: "",
filterMultiple: false,
filters: companyList,
type: "select"
};
}
this.isReady = true;
},
sortChange(param) {
if (param.sumMoney == '') {
if (param.BName != '') {
this.msg.OrderStr = 'RB_Branch_Id ' + param.bName
}
if (param.commissionMoney != '') {
this.msg.OrderStr = 'CommissionMoney ' + param.commissionMoney
}
if (param.peopleCount != '') {
this.msg.OrderStr = 'PeopleCount ' + param.peopleCount
}
if (param.backMoney != '') {
this.msg.OrderStr = 'BackMoney ' + param.backMoney
}
if (param.otherMoney != '') {
this.msg.OrderStr = 'OtherMoney ' + param.otherMoney
}
this.getList();
} else { } else {
let d = JSON.parse(JSON.stringify(this.dataList)) this.CompanyList = data;
this.dataList = this.orderBy(d, ["sumMoney"], param.sumMoney).results;
} }
this.initColums();
} else {}
}, },
handleCurrentChange(val) { err => {}
this.msg.pageIndex = val; );
this.getList(); },
}, initColums() {
getList() { this.isReady = false;
this.loading = true; let that = this;
if (this.userInfo.RB_Branch_id != 0) { let companyList = [];
this.msg.RB_Branch_Id = this.userInfo.RB_Branch_id this.CompanyList.forEach(x => {
} let item = {};
item.label = x.BName;
item.value = x.BName;
companyList.push(item);
});
let company = {}
if (this.disabledCPSelect) {
company = {
field: "bName",
title: "公司",
width: 40,
titleAlign: "left",
columnAlign: "left",
isResize: true,
};
} else {
company = {
field: "bName",
title: "公司",
width: 40,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: "",
filterMultiple: false,
filters: companyList,
type: "select"
};
}
this.isReady = true;
},
sortChange(param) {
if (param.sumMoney == '') {
if (param.BName != '') {
this.msg.OrderStr = 'RB_Branch_Id ' + param.bName
}
if (param.commissionMoney != '') {
this.msg.OrderStr = 'CommissionMoney ' + param.commissionMoney
}
if (param.peopleCount != '') {
this.msg.OrderStr = 'PeopleCount ' + param.peopleCount
}
if (param.backMoney != '') {
this.msg.OrderStr = 'BackMoney ' + param.backMoney
}
if (param.otherMoney != '') {
this.msg.OrderStr = 'OtherMoney ' + param.otherMoney
}
this.getList();
} else {
let d = JSON.parse(JSON.stringify(this.dataList))
this.dataList = this.orderBy(d, ["sumMoney"], param.sumMoney).results;
}
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList() {
this.loading = true;
if (this.userInfo.RB_Branch_id != 0) {
this.msg.RB_Branch_Id = this.userInfo.RB_Branch_id
}
this.apipost( this.apipost(
"sellcommission_GetDetailsList", "sellcommission_GetDetailsList",
this.msg, this.msg,
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList.forEach(x => { this.dataList.forEach(x => {
x.sumMoney = x.commissionMoney + x.otherMoney - x.backMoney x.sumMoney = x.commissionMoney + x.otherMoney - x.backMoney
}) })
this.dataListTwo = JSON.parse(JSON.stringify(this.dataList)) this.dataListTwo = JSON.parse(JSON.stringify(this.dataList))
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
},
null
);
},
//切换排序
handleClick(tab, event) {
if (this.activeName == "first") {
// this.commonName='姓名'
this.msg.OrderStr = "UserId";
} else {
// this.commonName='公司名'
this.msg.OrderStr = "RB_Branch_Id";
}
this.getList();
}, },
//跳转 null
getInfo(item) { );
var dateStr = item.periods; },
var year = dateStr.substring(0, 4); //切换排序
var month = dateStr.substring(4, 6); handleClick(tab, event) {
if (this.activeName == "first") {
// this.commonName='姓名'
this.msg.OrderStr = "UserId";
} else {
// this.commonName='公司名'
this.msg.OrderStr = "RB_Branch_Id";
}
this.getList();
},
//跳转
getInfo(item) {
var dateStr = item.periods;
var year = dateStr.substring(0, 4);
var month = dateStr.substring(4, 6);
var nextMonthFirstDay = new Date(year, month, 1); var nextMonthFirstDay = new Date(year, month, 1);
var oneDay = 1000 * 60 * 60 * 24; var oneDay = 1000 * 60 * 60 * 24;
var entDay = new Date(nextMonthFirstDay - oneDay).Format("yyyy-MM-dd"); var entDay = new Date(nextMonthFirstDay - oneDay).Format("yyyy-MM-dd");
var startDay = year + "-" + month + "-" + "01"; var startDay = year + "-" + month + "-" + "01";
var userId = item.userId; var userId = item.userId;
this.$router.push({ this.$router.push({
path: "enrollTotal", path: "enrollTotal",
query: { query: {
EmployeeId: userId, EmployeeId: userId,
starTime: startDay, starTime: startDay,
endTime: entDay, endTime: entDay,
blank: 'y' blank: 'y'
}
});
}
},
mounted() {
this.msg.pageSize = 10000; //不分页
this.msg.ParentId = this.$route.query.ParentId;
if (this.$route.query.companyID) {
this.companyID = this.$route.query.companyID;
this.msg.RB_Branch_Id = this.$route.query.companyID;
this.msg.Periods = this.$route.query.periods;
this.disabledCPSelect = true
} }
let dt = new Date() });
this.stringPerons = (dt.getMonth() == 0 ? (dt.getFullYear() - 1) : dt.getFullYear()) + '' + (dt.getMonth().toString().length < 2 ? '0' : '') + (dt.getMonth() == 0 ? 12 : dt.getMonth());
this.userInfo = this.getLocalStorage();
this.getList();
this.getCompanyList();
},
created() {
Vue.component('commission-table-operation', {
template: `<div style='border-bottom: 1px solid #e5e5e5;border-left: 1px solid #e5e5e5;width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;box-sizing:border-box'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
see() {
let params = {
type: 'see',
data: this.rowData
};
this.$emit('on-custom-comp', params);
}
}
})
} }
},
mounted() {
this.msg.pageSize = 10000; //不分页
this.msg.ParentId = this.$route.query.ParentId;
if (this.$route.query.companyID) {
this.companyID = this.$route.query.companyID;
this.msg.RB_Branch_Id = this.$route.query.companyID;
this.msg.Periods = this.$route.query.periods;
this.disabledCPSelect = true
}
let dt = new Date()
this.stringPerons = (dt.getMonth() == 0 ? (dt.getFullYear() - 1) : dt.getFullYear()) + '' + (dt.getMonth()
.toString().length < 2 ? '0' : '') + (dt.getMonth() == 0 ? 12 : dt.getMonth());
this.userInfo = this.getLocalStorage();
this.getList();
this.getCompanyList();
},
created() {
Vue.component('commission-table-operation', {
template: `<div style='border-bottom: 1px solid #e5e5e5;border-left: 1px solid #e5e5e5;width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;box-sizing:border-box'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
see() {
let params = {
type: 'see',
data: this.rowData
};
this.$emit('on-custom-comp', params);
}
}
})
}
}; };
</script>
<style> </script>
<style>
.commissionDetails .triangle_border_up { .commissionDetails .triangle_border_up {
width: 0; width: 0;
height: 0; height: 0;
border-width: 0 5px 5px; border-width: 0 5px 5px;
border-style: solid; border-style: solid;
border-color: transparent transparent #303133; border-color: transparent transparent #303133;
/*透明 透明 灰*/ /*透明 透明 灰*/
position: absolute; position: absolute;
top: -5px; top: -5px;
} }
.commissionDetails .v-table-body-cell:hover .outDiv .toolDiv { .commissionDetails .v-table-body-cell:hover .outDiv .toolDiv {
display: block; display: block;
} }
.commissionDetails .v-table-body-cell { .commissionDetails .v-table-body-cell {
overflow: initial; overflow: initial;
cursor: pointer; cursor: pointer;
} }
.commissionDetails .toolDiv { .commissionDetails .toolDiv {
position: absolute; position: absolute;
top: 25px; top: 25px;
background: #303133; background: #303133;
color: #fff; color: #fff;
z-index: 20000; z-index: 20000;
padding: 4px 15px; padding: 4px 15px;
max-width: 220px; max-width: 220px;
white-space: normal; white-space: normal;
border-radius: 4px; border-radius: 4px;
word-wrap: break-word; word-wrap: break-word;
display: none; display: none;
} }
.commissionDetails .outDiv { .commissionDetails .outDiv {
position: relative; position: relative;
} }
.commissionDetails-box .el-button.is-circle { .commissionDetails-box .el-button.is-circle {
padding: 5px !important; padding: 5px !important;
} }
.commissionDetails-box .v-table-body-cell span { .commissionDetails-box .v-table-body-cell span {
display: block; display: block;
width: 100%; width: 100%;
} }
</style>
</style>
src/components/dmc/manager/dmcTotalTable.vue
View file @ 2f307dee
...@@ -193,7 +193,6 @@ ...@@ -193,7 +193,6 @@
{{outItem.NewCombinationNum}} {{outItem.NewCombinationNum}}
</td> </td>
<td style="position: relative"> <td style="position: relative">
{{item.OutBranchName}} {{item.OutBranchName}}
<div v-if="item.IsSetOut&&item.IsSetOut==1" style="color:red;font-weight:bold;"> <div v-if="item.IsSetOut&&item.IsSetOut==1" style="color:red;font-weight:bold;">
(取消发团) (取消发团)
...@@ -250,6 +249,9 @@ ...@@ -250,6 +249,9 @@
<td> <td>
<div class="link"> <div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}<br />({{item.TCID}})</p> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}<br />({{item.TCID}})</p>
<div v-if="item.IsSetOut&&item.IsSetOut==1" style="color:red;font-weight:bold;">
(取消发团)
</div>
</div> </div>
</td> </td>
<td style="color: #47BF8C;white-space: nowrap;"> <td style="color: #47BF8C;white-space: nowrap;">
...@@ -334,7 +336,8 @@ ...@@ -334,7 +336,8 @@
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrl([131,14, 90].includes(item.LineId) ? 'roomReservationsDetails' : 'roomReservationsDetailsNew',item,outItem,'订房详情')"> <div class="fz16 fbold linkspan"
@click="goUrl([131,14, 90].includes(item.LineId) ? 'roomReservationsDetails' : 'roomReservationsDetailsNew',item,outItem,'订房详情')">
<span style="color: #4BCA81;" v-if="item.HotelResult==1">√</span> <span style="color: #4BCA81;" v-if="item.HotelResult==1">√</span>
<span class="colorE95252" v-else>{{item.HotelResult=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.HotelResult=='-1'?"x":"O"}}</span>
</div> </div>
...@@ -703,7 +706,7 @@ ...@@ -703,7 +706,7 @@
}, },
methods: { methods: {
showDialog(ConfigId, OfferId) { showDialog(ConfigId, OfferId) {
if(!OfferId) { if (!OfferId) {
return return
} }
this.dialog = { this.dialog = {
...@@ -820,7 +823,9 @@ ...@@ -820,7 +823,9 @@
}, err => {}) }, err => {})
}, },
getLineList() { getLineList() {
this.apipost("line_post_GetList", {LineDirection: 2}, res => {// this.apipost("line_post_GetList", {
LineDirection: 2
}, res => { //
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data; this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = [] this.queryCommonData.PlaceList = []
...@@ -1234,7 +1239,7 @@ ...@@ -1234,7 +1239,7 @@
} }
var userInfo = this.getLocalStorage(); var userInfo = this.getLocalStorage();
if (userInfo.RB_Group_id == this.QjGroupId()) { if (userInfo.RB_Group_id == this.QjGroupId()) {
// this.msg.LineId = 14; // this.msg.LineId = 14;
} }
this.getLineList(); this.getLineList();
......
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