Skip to content

S
SuperMan
Commit b7103bd8 authored by zhengke's avatar zhengke
Browse files
Options

no message

parents ff7e65d3 ebd84904
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 838 additions and 198 deletions
src/assets/utils/tripUtils.js
View file @ b7103bd8
......@@ -381,7 +381,6 @@ var tripUtils = {
CityId: "0",
CityName: "",
ScenicImg: "",
ImaArray: [],
Rank: 0,
//景点名称
CouponsName: "",
......
src/components/DomesticModule/OrderToday.vue
View file @ b7103bd8
......@@ -562,7 +562,7 @@ export default {
},
jiesuan(){
if(!this.TermDate){
return this.$message.error('请选择结算日期');
return this.$message.error('请选择结算日期') ;
}
this.apipost('Domestic_Ticket_post_CheckBiLL',{TermDate:this.TermDate,sDate:this.msg.sDate,eDate:this.msg.eDate},r=>{
if(r.data.resultCode==1){
......
src/components/DomesticModule/SettlementOrder.vue
View file @ b7103bd8
......@@ -57,6 +57,7 @@
<div class="_content">
<table class="_content_tab singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading = 'loading'>
<tr>
<th>机票类别</th>
<th>期数</th>
<th>应收金额</th>
<th>成本</th>
......@@ -65,9 +66,11 @@
<th>实付</th>
<th>待收金额</th>
<th>实际利润</th>
<th>操作人</th>
<th>操作</th>
</tr>
<tr v-for="(item,index) in dataList">
<td>{{item.IsInter==0?"国内机票":"国际机票"}}</td>
<td>{{item.Term}}</td>
<td>¥{{item.Money}}</td>
<td>¥{{item.Cost}}</td>
......@@ -109,17 +112,18 @@
<span v-if="item.Status!=0" :class="Math.abs(item.RealProfit)>0?'_color_red':''">¥{{Math.abs(item.RealProfit)}}</span>
<span v-else>-</span>
</td>
<td>{{item.EmName}}<br/>{{item.UpdateDate}}</td>
<td>
<el-tooltip class="item" effect="dark" content="详情" placement="top">
<el-button type="danger" class="_bth_bg_gr" @click="goUrl('OrderDetails',item.Term)" circle>详</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="收款" placement="top">
<el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="收款" placement="top">
<el-button type="primary" class="_bth_bg_bl" @click="goUrlT(item,1)" circle>收</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="付款" placement="top">
<el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="付款" placement="top">
<el-button type="danger" class="_bth_bg_bgr" @click="goUrlT(item,2)" circle>付</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="确认" placement="top">
<el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="确认" placement="top">
<el-button v-if="item.Status==0" type="danger" class="_bth_bg_bl" @click="queren(item)" circle>确</el-button>
</el-tooltip>
</td>
......@@ -157,6 +161,7 @@ export default {
dataList:[],
noData:false,
total:0,
emID:0,
currentPage:1,
loading:true,
transactionDate:[],
......@@ -173,6 +178,7 @@ export default {
mounted(){
this.getList();
let userInfo = this.getLocalStorage();
this.emID=userInfo.EmployeeId;
this.RB_Branch_Id = userInfo.RB_Branch_id;
},
methods:{
......
src/components/FinancialModule/JumpReport.vue
View file @ b7103bd8
......@@ -92,6 +92,17 @@
._TCIDAndTCNUMList{
display: flex;
}
.JumpDivTitleOne{
margin-left:20px;
font-size:14px;
}
.JumpDivTitleTwo{
margin:10px 0 0 20px;
font-size:14px;
}
.JumpSpan{
margin:0 20px;
}
</style>
<template >
......@@ -157,7 +168,7 @@
<template>
<el-col :span="4">
<el-form-item label="费用类型：">
<el-select filterable v-model='msg.CostTypeID' >
<el-select filterable v-model='msg.CostTypeID'>
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
......@@ -292,9 +303,11 @@
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
</span> -->
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">导出</button>
<!-- <button class="normalBtn" @click="method5()">导出</button> -->
</li>
</ul>
<div class="JumpDivTitleOne">应收金额：{{SumYingShou}} <span class="JumpSpan">实收金额：{{SumShiShou}}</span> 待收金额：{{SumDaiShou}}</div>
<div class="JumpDivTitleTwo">应付金额：{{SumYingFu}} <span class="JumpSpan">实付金额：{{SumShiFu}}</span> 待付金额：{{SumDaiFu}}</div>
</div>
<div class="_fnDm_content" v-loading='loading'>
<v-table
......@@ -699,6 +712,7 @@ export default {
eMoney:'',
CurrencyId:'0',
CostTypeID:'',
CostTypeIDs:'',
Conditon:'',
TCID:'',
TradeWay:'0',
......@@ -763,6 +777,12 @@ export default {
isCkedAll: false,
currentPage:1,
total:0,
SumYingShou:0,
SumShiShou:0,
SumDaiShou:0,
SumYingFu:0,
SumShiFu:0,
SumDaiFu:0,
ChineseStr:'',
mathNumber:'',
DepartIDs:'',
......@@ -813,6 +833,25 @@ export default {
if(this.$route.query.Type){
this.msg.Type = this.$route.query.Type+'';
}
if(this.$route.query.year && this.$route.query.month)
{
this.msg.sTradeDate=this.$route.query.year+"-"+this.$route.query.month+"-01";
var d1=new Date( this.msg.sTradeDate);
var d2=new Date(d1);
d2.setMonth(d2.getMonth()+1);
d2.setDate(d2.getDate()-1);
var month = d2.getMonth()+1;
var day = d2.getDate();
this.msg.eTradeDate= d2.getFullYear()+'-'+month+'-'+day;
this.transactionDate[0]=this.msg.sTradeDate;
this.transactionDate[1]= this.msg.eTradeDate;
}
if(this.$route.query.BranchId){
this.msg.RB_Branch_Id=parseInt(this.$route.query.BranchId);
}
if(this.$route.query.CostIds){
this.msg.CostTypeID=parseInt(this.$route.query.CostIds);
}
},components: {
"my-Bill": myBill,
"my-RVB-Bill":myrbvBill,
......@@ -889,7 +928,7 @@ export default {
if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
if(!this.msg.TemplateId)this.msg.TemplateId=0;
if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
if(this.msg.RB_Branch_Id=='undefined')this.msg.RB_Branch_Id=-1;
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.TCID)this.msg.TCID=0;
......@@ -902,8 +941,14 @@ export default {
this.loading= true;
this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
if(res.data.resultCode == 1) {
let data = res.data.data.pageData;
let data = res.data.data.pageData.list;
this.total = res.data.data.count;
this.SumYingShou=res.data.data.pageData.SumYingShou;
this.SumShiShou=res.data.data.pageData.SumShiShou;
this.SumDaiShou=res.data.data.pageData.SumDaiShou;
this.SumYingFu=res.data.data.pageData.SumYingFu;
this.SumShiFu=res.data.data.pageData.SumShiFu;
this.SumDaiFu=res.data.data.pageData.SumDaiFu;
if(this.total==0){
this.DataList=[];
}else{
......
src/components/FinancialModule/RecPayQuery.vue
View file @ b7103bd8
......@@ -902,7 +902,7 @@ export default {
this.loading= true;
this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
if(res.data.resultCode == 1) {
let data = res.data.data.pageData;
let data = res.data.data.pageData.list;
this.total = res.data.data.count;
if(this.total==0){
this.DataList=[];
......
src/components/FinancialModule/ReportForm/YearReport.vue
View file @ b7103bd8
......@@ -793,7 +793,7 @@ export default {
if (field === "RemarkValue") return this.priceFormat(rowData.RemarkValue);
if (field === "NRemarkValue") return this.priceFormat(rowData.NRemarkValue);
},
priceFormat(value) {
priceFormat(value) {
if (value == null) {
return 0.0;
}
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ b7103bd8
......@@ -521,7 +521,7 @@
</div>
<div class="_submit">
<div class="chosenNextBox">
<div v-if='resultCode==11019'>
<div v-if='resultCode==11019 || ((EmployeeId===755 || EmployeeId===400) && (msg.RB_Branch_Id&& msg.RB_Branch_Id!=0))'>
<label>下一步：<span class="red">{{msg.AuditDescription}}</span></label>
<el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote reserve-keyword placeholder="请选择下一步审批人" :remote-method="remoteMethod" :loading="loadingPeople">
<el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
......@@ -652,6 +652,7 @@ export default {
timer:'',
leaderType:1,
resultCode:null,
EmployeeId:0
}
},methods:{
deleteRow(i,obj){
......@@ -1254,6 +1255,7 @@ export default {
},mounted(){
let userInfo = this.getLocalStorage();
this.department = userInfo.DepartName;
this.EmployeeId=userInfo.EmployeeId;
this.emplyeeName=userInfo.emName;
this.DepartIDs = this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ b7103bd8
......@@ -442,7 +442,7 @@
</div>
<div class="_submit">
<div class="chosenNextBox">
<div v-if='resultCode==11019'>
<div v-if='resultCode==11019 || ((EmployeeId===755 || EmployeeId===400) && (msg.RB_Branch_Id&& msg.RB_Branch_Id!=0))'>
<label>下一步：<span class="red">{{msg.AuditDescription}}</span></label>
<el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote reserve-keyword placeholder="请选择下一步审批人" :remote-method="remoteMethod" :loading="loadingPeople">
<el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
......
src/components/LeaderManagement/leaderManagement.vue
View file @ b7103bd8
......@@ -289,7 +289,7 @@
</li>
<li>
<span>
<em>电话</em>
<em>境外电话</em>
<el-input v-model="msg.SpareTel" clearable></el-input>
</span>
</li>
......@@ -505,7 +505,7 @@
<el-form-item :label="$t('pub.mbPhoneNum')" prop="MobilePhone" class="other_input">
<el-input type="text" v-model="addMsg.MobilePhone" :placeholder="$t('admin.admin_phPhone')" class="w210"></el-input>
</el-form-item>
<el-form-item label="电话" prop="SpareTel" class="other_input">
<el-form-item label="境外电话" prop="SpareTel" class="other_input">
<el-input type="text" v-model="addMsg.SpareTel" :placeholder="$t('admin.admin_SpareTel')" class="w210"></el-input>
</el-form-item>
<el-form-item :label="$t('system.table_Passport')" v-if="addMsg.LeaderGuidClass==0" prop="Passport" class="other_input">
......
src/components/SalesModule/SalesFinancialDetail.vue
View file @ b7103bd8
......@@ -367,7 +367,7 @@ export default {
this.loading = true;
this.apipost('Financial_post_GetALLPageList', this.msg, res=>{
if (res.data.resultCode == 1) {
let data = res.data.data.pageData;
let data = res.data.data.pageData.list;
if (type===1) {
this.allMoney = 0;
this.shiMoney = 0;
......@@ -432,7 +432,7 @@ export default {
},
}, mounted() {
this.userId = this.getLocalStorage().EmployeeId;
let obj = JSON.parse(this.$route.query.item)
let obj = this.$route.query.item ? JSON.parse(this.$route.query.item) : ''
this.item = obj
this.orderId = this.msg.OrderID = obj.orderId ? obj.orderId : obj.OrderId
this.tcnum = obj.tcnum ? obj.tcnum : obj.TCNUM
......
src/components/SalesModule/enrollTotal.vue
View file @ b7103bd8
......@@ -89,7 +89,7 @@
</p>
</div>
</el-col>
<el-col :span="5" class="groupTourOrder_count_col">
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_blue">
<i class="iconfont icon-baomingrenshu"></i>
......@@ -103,7 +103,7 @@
</p>
</div>
</el-col>
<el-col :span="5" class="groupTourOrder_count_col">
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_yellow">
<i class="iconfont icon-baomingrenshu"></i>
......@@ -129,7 +129,7 @@
</p>
</div>
</el-col>
<el-col :span="5" class="groupTourOrder_count_col">
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
......@@ -143,6 +143,17 @@
</p>
</div>
</el-col>
<el-col :span="3" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>累计提成</span>
</div>
<p>
<span>提成金额：{{countData.SumCommissionMoney}};</span>
</p>
</div>
</el-col>
</el-row>
</div>
<!-- 表格 -->
......
src/components/SalesModule/groupTourOrder.vue
View file @ b7103bd8
......@@ -1325,7 +1325,7 @@
</p>
</div>
</el-col>
<el-col :span="5" class="groupTourOrder_count_col">
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_blue">
<i class="iconfont icon-baomingrenshu"></i>
......@@ -1339,7 +1339,7 @@
</p>
</div>
</el-col>
<el-col :span="5" class="groupTourOrder_count_col">
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_yellow">
<i class="iconfont icon-baomingrenshu"></i>
......@@ -1353,6 +1353,7 @@
</p>
</div>
</el-col>
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
......@@ -1365,7 +1366,7 @@
</p>
</div>
</el-col>
<el-col :span="5" class="groupTourOrder_count_col">
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
......@@ -1379,6 +1380,17 @@
</p>
</div>
</el-col>
<el-col :span="3" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>累计提成</span>
</div>
<p>
<span>提成金额：{{countData.SumCommissionMoney}};</span>
</p>
</div>
</el-col>
</el-row>
</div>
<!-- 表格 -->
......@@ -1529,7 +1541,7 @@
icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
<el-button v-if="item.isHaveFinance=='1'||item.orderState=='1'" type="primary"
<el-button v-if="item.Status=='1'&&item.isHaveFinance=='1'||item.orderState=='1'" type="primary"
style='background:green; border-color:green' icon="iconfont icon-bianji-smal"
@click='getRemarks(item)'></el-button>
</el-tooltip>
......@@ -1930,7 +1942,8 @@
DueinMoney: 0,
PreferPrice: 0,
InteriorNum: 0,
B2BNum: 0
B2BNum: 0,
SumCommissionMoney:0
},
// 订单转团
transferData: {
......@@ -2382,6 +2395,7 @@
this.showID = data
},
getRemarks (obj) {
console.log(obj,'ssss');
this.isShowLayerRemarks = true
this.isShowLayer = false
this.$refs['addMsg'].resetFields()
......
src/components/Ticketing/IndividualTicketOrder.vue
View file @ b7103bd8
......@@ -46,6 +46,7 @@
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr class="title_tr">
<th>单号</th>
<th>机票编码</th>
<th>客户信息</th>
<th>客人数量</th>
<th>单价</th>
......@@ -63,35 +64,38 @@
</tr>
<tbody v-for="(item,index) in dataList" :key="index">
<tr>
<td>{{item.AirProductId}} </td>
<td>{{item.Id}} </td>
<td>{{item.Id}} </td><!-- 机票编码 -->
<td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p>
<!-- <p class="fz12">123456</p> -->
</td>
<td>{{item.GuestNum}}</td>
<td>{{item.GuestNum}}/{{item.SeatNum}}/{{item.FreightSpace}}</td>
<td class="fz12">{{item.TC_Price}}</td>
<td class="fz12">{{item.Unit_Price}}</td>
<td style="color:#FF9C00">{{item.PreferPrice}}</td>
<td style="color:#FF9C00">{{item.Income}}</td>
<td style="color:#E95252">{{item.PreferPrice}}</td>
<td style="color:#E95252">{{item.Income}}</td>
<td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td>
<td>
<el-tag v-if="item.Status==1" type="success">正常</el-tag>
<el-tag v-if="item.Status==2">取消</el-tag>
<span v-if="item.Status==1">正常</span>
<span v-if="item.Status==2">取消</span>
<span v-if="item.Status==3">待付款</span>
</td>
</tr>
<tr style="height:20px">
<td colspan="15" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<span v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span>
<el-popover
<el-popover
placement="right"
width="1000"
trigger="click">
<el-table :data="item.GuestList">
<el-table-column property="Id" label="订单ID"></el-table-column>
<el-table-column property="Id" label="排号"></el-table-column>
<el-table-column property="Name" label="姓名"></el-table-column>
<el-table-column property="EName" label="英文姓名"></el-table-column>
<el-table-column property="Sex" label="性别">
<template slot-scope="scope">
<span v-if="scope.row.Sex=='1'">男</span>
......@@ -112,11 +116,11 @@
</template>
</el-table-column>
</el-table>
<span style="float:right" class="RL-remarkTitle" slot="reference">
<i style="font-size:12px;color:#e95252" class="iconfont icon-gengduo"></i>
<span slot="reference">
<span style="cursor:pointer" v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span>
</span>
</el-popover>
</el-popover>
</span>
<span class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span>
......@@ -138,13 +142,24 @@
<div>
<div>收款单据：</div>
<div>
<span style="cursor: default;">暂无数据</span>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">{{fina.PayMoney}}</span>
<span v-if="item.FinanceList==0">
暂无数据
</span>
</span>
</div>
</div>
<div>
<div>付款单据：</div>
<div>
<span style="cursor: default;">暂无数据</span>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">{{fina.PayMoney}}</span>
<span v-if="item.RefundFinanceList==0">
暂无数据
</span>
</span>
</div>
</div>
</td>
......@@ -158,6 +173,7 @@
</template>
<script>
import moment from 'moment'
export default {
data() {
return {
......@@ -166,11 +182,11 @@ export default {
pageSize: 10,
AirTicketId: 0,
AirOrderId: 0,
Status: 1,
StartTime: "",
Status: 0,
StartTime: moment().format("YYYY-MM-DD"),
EndTime: ""
},
status: [{ title: "正常", num: 1 }, { title: "取消", num: 2 }],
status: [{ title: "全部", num: 0 },{ title: "待付款", num: 3 },{ title: "正常", num: 1 }, { title: "取消", num: 2 }],
dataList:[],
loading:false,
total:0,
......@@ -195,7 +211,7 @@ export default {
res => {
this.loading=false;
if (res.data.resultCode == 1) {
// console.log(res);
console.log(res);
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
} else {
......@@ -220,8 +236,13 @@ export default {
</script>
<style scoped>
@import "../../assets/css/newTravelManager.css";
.tickets_green {
color: #008000;
text-decoration: underline;
margin-right: 6px;
}
.title_tr th{
width:10%;
width:9%;
}
.color_red_order {
color: #e95252 !important;
......@@ -301,7 +322,7 @@ export default {
}
.groupTourOrderSearchTable tr td {
padding: 10px;
padding: 8px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
......
src/components/Ticketing/individualTicket.vue
View file @ b7103bd8
......@@ -507,7 +507,7 @@
TicketType: 2, //定金类型(1定，2定等)
LineId: 0, //线路编号
IsPayOrder:0,
FlyState: 1,
FlyState: 0,
CreateBy: 0, //操作人
},
//员工列表
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ b7103bd8
......@@ -625,7 +625,7 @@
</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)" style="display:none">结团
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">结团
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)" style="display:none">正常
</el-dropdown-item>
......
src/components/administrative/CommissionDetail.vue
View file @ b7103bd8
......@@ -54,7 +54,8 @@ export default {
isReady: false,
multipleSort: false,
loading: true,
CompanyList:[]
CompanyList:[],
stringPerons:''
};
},
methods: {
......@@ -69,6 +70,9 @@ export default {
'部门':x.departmentName,
'员工':x.createByStr,
'提成金额':x.commissionMoney.toFixed(2),
'额外奖励':x.otherMoney.toFixed(2),
'额外扣除':x.backMoney.toFixed(2),
'应发提成':x.sumMoney.toFixed(2),
'所属期数':x.periods
}
data.push(obj)
......@@ -170,7 +174,43 @@ export default {
width: 80,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span style='color:red'>${rowData.commissionMoney.toFixed(2)}</span>`
return `<span>${rowData.commissionMoney.toFixed(2)}</span>`
}
};
let otherMoney = {
field: "otherMoney",
title: "额外奖励",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.otherMoney.toFixed(2)}</span>`
}
};
let backMoney = {
field: "backMoney",
title: "额外扣除",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.backMoney.toFixed(2)}</span>`
}
};
let sumMoney = {
title: "应发提成",
field: "sumMoney",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span style='color:red'>${(rowData.otherMoney+rowData.commissionMoney-rowData.backMoney).toFixed(2)}</span>`
}
};
let peopleCount = {
......@@ -205,7 +245,13 @@ export default {
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80
width: 80,
formatter: function(rowData, rowIndex, pagingIndex, field) {
if(rowData.periods!=that.stringPerons)
return `<div style='height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -10px;padding-left: 10px;'>${rowData.periods}</div>`
else
return rowData.periods
}
};
let remark = {
field: "remark",
......@@ -231,6 +277,9 @@ export default {
this.columns.push(department);
this.columns.push(userName);
this.columns.push(commissionMoney);
this.columns.push(otherMoney);
this.columns.push(backMoney);
this.columns.push(sumMoney);
this.columns.push(peopleCount);
this.columns.push(visaPeopleCount);
this.columns.push(periods);
......@@ -239,23 +288,29 @@ export default {
this.isReady = true;
},
sortChange(param) {
// if (param.Royalty != "") {
// this.msg.OrderBy = `Royalty ${param.Royalty}`;
// } else if (param.Initialbalance != "") {
// this.msg.OrderBy = `Initialbalance ${param.Initialbalance}`;
// }
// this.getList();
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
console.log(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.tableData = this.orderBy(d, ["incomeVal"], param.income).results;
this.getList();
}else{
let d=JSON.parse(JSON.stringify(this.dataList))
this.dataList = this.orderBy(d, ["sumMoney"], param.sumMoney).results;
}
this.getList();
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
......@@ -271,7 +326,9 @@ export default {
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
console.log(this.dataList, "dataList");
this.dataList.forEach(x=>{
x.sumMoney=x.commissionMoney+x.otherMoney-x.backMoney
})
} else {
this.Error(res.data.message);
}
......@@ -317,6 +374,9 @@ export default {
mounted() {
this.msg.pageSize = 10000; //不分页
this.msg.ParentId = this.$route.query.ParentId;
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());
console.log(this.stringPerons)
this.getList();
this.getCompanyList();
},
......@@ -348,4 +408,8 @@ export default {
<style>
.commissionDetails-box .el-button.is-circle{padding: 5px !important;}
.commissionDetails-box .v-table-body-cell span {
display: block;
width: 100%;
}
</style>
src/components/busManagement/BusApportionManagement.vue
View file @ b7103bd8
......@@ -52,14 +52,14 @@
.exportCompany{
width:450px;
}
._addUpload_box{
.BusApportionManagement ._addUpload_box{
display: block;
margin-top: 15px;
}
._addUpload_box img{
.BusApportionManagement ._addUpload_box img{
width: 100%;
}
._addUpload_box>div{
.BusApportionManagement ._addUpload_box>div{
float: left;
width:138px;
height:92px;
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ b7103bd8
......@@ -299,16 +299,32 @@
this.FeatureData.IsSave = true;
this.submitText = "保存中";
//团队配置
var basicData = this.PostConfig;
var basicData ={};
basicData.PriceList = this.PostPrice;
//配置编号
basicData.ID = this.ConfigId;
basicData.LineId=this.PostConfig.LineId;
basicData.LineteamId=this.PostConfig.LineteamId;
basicData.Title=this.PostConfig.Title;
basicData.OpRemark=this.PostConfig.OpRemark;
basicData.ProductRecommend=this.PostConfig.ProductRecommend;
basicData.VideoStr=this.PostConfig.VideoStr;
basicData.PDFAlias=this.PostConfig.PDFAlias;
basicData.ImgCover=this.PostConfig.ImgCover;
basicData.PriceIsDirect=this.PostConfig.PriceIsDirect;
basicData.IsDirect=this.PostConfig.IsDirect;
basicData.RemoveChild=this.PostConfig.RemoveChild;
basicData.TeamType=this.PostConfig.TeamType;
basicData.DayNum = (this.PostDaysTrip && this.PostDaysTrip.DayNum!="")?this.PostDaysTrip.DayNum:0;
basicData.NightNum = (this.PostDaysTrip && this.PostDaysTrip.NightNum!="")?this.PostDaysTrip.NightNum:0;
basicData.StartCityId = (this.PostDaysTrip && this.PostDaysTrip.StartCityId!="")?this.PostDaysTrip.StartCityId:0;
basicData.ReturnArriveCityId = (this.PostDaysTrip && this.PostDaysTrip.ReturnArriveCityId!="")?this.PostDaysTrip.ReturnArriveCityId:0;
basicData.SelfpayingList=this.PostConfig.SelfpayingList;
basicData.ShopList=this.PostConfig.ShopList;
basicData.DayNum = this.PostDaysTrip.DayNum;
basicData.NightNum = this.PostDaysTrip.NightNum;
basicData.StartCityId = this.PostDaysTrip.StartCityId;
basicData.ReturnArriveCityId = this.PostDaysTrip.ReturnArriveCityId;
basicData.DinnerList = this.PostDaysTrip.DinnerList;
basicData.FreedomList = this.PostDaysTrip.FreedomList;
basicData.HotelList = this.PostDaysTrip.HotelList;
......@@ -359,7 +375,6 @@
} else {
basicData.TeamType = 0;
}
this.apipost(
"travel_post_SetTravelConfigInfo",
basicData,
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ b7103bd8
......@@ -637,56 +637,56 @@
</div>
<div class="clearfix">
<div class="clearfix">
<div class="leftSetInfo">
<span class="TPbaseSet" style="width:62px;"></span>
<span class="TPsecondTitle" style="width:66px;">op对外备注</span>
</div>
<div class="TPright" style="float:left;margin-left: 0">
<el-form-item>
<div class="TPright" style="float:left;">
<el-form-item style="margin-top:-20px;">
<el-input v-model="priceData.OPRemark" type="textarea" :autosize="{minRows: 3, maxRows: 3 }"
resize="none" class="w660" placeholder="op对外备注"></el-input>
resize="none" class="w760" placeholder="op对外备注"></el-input>
</el-form-item>
<el-form-item v-if="!flagWangYue">
<el-form-item>
<div>
<span class="TCSwitchtitle">订单操作</span>
<span class="TCswitch">
<el-switch v-model="priceData.IsOrder" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">关闭后，业务人员将不能操作订单</div>
</span>
<el-switch v-model="priceData.IsOrder" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">关闭后，业务人员将不能操作订单</div>
</span>
</div>
</el-form-item>
<el-form-item v-if="!flagWangYue">
<el-form-item>
<div>
<span class="TCSwitchtitle">同行在线预订</span>
<span class="TCswitch">
<el-switch v-model="priceData.IsB2B" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">产品将会直接推送到B2B站点</div>
</span>
<el-switch v-model="priceData.IsB2B" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">产品将会直接推送到B2B站点</div>
</span>
</div>
</el-form-item>
</div>
<div class="TPright" style="float:left;" v-if="!flagWangYue">
<div class="TPright" style="float:left;">
<el-form-item>
<div>
<span class="TCSwitchtitle">报名候补</span>
<span class="TCswitch">
<el-switch v-model="priceData.IsSubstitution" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">关闭后不可超收人数</div>
</span>
<el-switch v-model="priceData.IsSubstitution" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">关闭后不可超收人数</div>
</span>
</div>
</el-form-item>
<el-form-item>
<div>
<span class="TCSwitchtitle">直客在线预订</span>
<span class="TCswitch">
<el-switch v-model="priceData.IsB2C" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">产品将会直接推送到B2C站点</div>
</span>
<el-switch v-model="priceData.IsB2C" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">产品将会直接推送到B2C站点</div>
</span>
</div>
</el-form-item>
</div>
......@@ -773,7 +773,7 @@
priceShowCount: 6,//团期展示条数
flagWangYue:false,
userID:null,
dijiebaojiaShow:true,
dijiebaojiaShow:false,
queryPriceListLoading:true,
queryPriceList:[],
OfferTotalMoney:0,
......
src/plug/index.js
View file @ b7103bd8
......@@ -116,7 +116,6 @@ export default {
let domainUrl = '';
let locationName = window.location.hostname;
domainUrl = "http://127.0.0.1"; //214主域名
if (locationName.indexOf('oytour')!==-1) {
domainUrl = "https://reborn.oytour.com";
}else if (locationName.indexOf('viitto')!==-1) {
......@@ -291,6 +290,80 @@ export default {
}
}, faildCall)
},
Vue.prototype.JueryPost=function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") {
msg = {}
}
var apiurl = this.domainManager().PostUrl;
var timestamp = (new Date()).valueOf();
this.apiurl = apiurl;
if (this.$route.path.toLowerCase() == "/signature") {
this.$router.push({
path: '/signature'
})
} else {
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
this.$router.push({
path: '/login'
})
}
}
var token = "";
var key = "";
if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey;
}
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var postData = {
"msg": msg,
"cmd": cmd,
"timestamp": timestamp,
"token": token,
"sign": md5Str
}
$.ajax({
url: apiurl,
type: "POST",
data: msg,
datatype: "jsonP",
success: function (res) {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
this.$router.push({
path: '/login'
});
} else if (res.resultCode == 10005) {
this.$router.go(-1);
} else {
successCall(res);
}
},
faildCall
});
this.$http.post(apiurl, postData, {
headers: {
'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path
}
})
.then(res => {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
this.$router.push({
path: '/login'
});
} else if (res.resultCode == 10005) {
this.$router.go(-1);
} else {
successCall(res);
}
}, faildCall)
},
Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") {
msg = {}
......
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