Skip to content

S
SuperMan
Commit 09e2abe5 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents de919381 303dfc7e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 475 additions and 455 deletions
src/components/FinancialModule/ReportForm/AirTicketLoss.vue
View file @ 09e2abe5
......@@ -30,7 +30,8 @@
</div>
</div>
<div v-if="LossIncomeList&&LossIncomeList.length>0" style="font-size: 14px;color: red;margin-bottom: 3px;text-align: right;">
注: 韩国线与日本自由行是统计团队亏损，其他线路为机票损失
<!-- 注: 韩国线与日本自由行是统计团队亏损，其他线路为机票损失 -->
注: 以下为团队航班目的地统计
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
......@@ -120,6 +121,20 @@ export default {
goToDetail(item){
if(item.Value!='损失占比'){
if(item.IsTravel==1){
if(item.LossType==-1){
this.$router.push({
name: 'TeamRevenueReport',
query: {
StartTime:item.StartTime,
EndTime:item.EndTime,
LineId:item.LineId,
IsSelectTravelLoss:2,
AirLossId:item.AirLossId,
blank: "y",
}
});
}
else{
this.$router.push({
name: 'TeamRevenueReport',
query: {
......@@ -132,6 +147,7 @@ export default {
}
});
}
}
else{
this.$router.push({
name: 'AirTicketLossDetail',
......
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ 09e2abe5
......@@ -67,13 +67,14 @@
<button class="normalBtn page_EasyReport_search" style="left: 900px;" @click="getData(2)">{{$t('pub.searchBtn')}}</button>
</el-col>
</el-row>
<el-row >
<!-- <el-row >
<el-col :span="6" v-for="(month, index) in monthList" :key="index">
<el-form-item :label="`${month.name}：`">
<el-input v-model="month.value" @change="MonthIndex = month.id" type="number"></el-input>
</el-form-item>
</el-col>
</el-row>
-->
</el-form>
<div class="page_EasyReport_export">
<button class="normalBtn " @click="exportExcel">导出EXCEL</button>
......@@ -1067,7 +1068,7 @@ export default {
endDate=that.year+"-"+column.end
}
if(rowIndex<18){
if(rowIndex<19){
// if(BranchId == 1245){
// that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
// }
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 09e2abe5
......@@ -515,6 +515,7 @@ tr._item_list td:last-child {
<el-option value="21" label="日本手配费收入"></el-option>
<el-option value="22" label="车行收入"></el-option>
<el-option value="23" label="欧洲单团分润收入"></el-option>
<el-option value="24" label="欧洲损失分摊"></el-option>
</el-select>
<el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150" v-if="isShowGrounding==false">
<el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
......@@ -764,6 +765,7 @@ Vue.component("TCIDJump", {
<span style="cursor: pointer" v-if="rowData.DataType===16">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===22" @click="goCarUrl('CarDealerOrderOP',rowData.TCID,rowData)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===23" @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===24" @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
</div>
`,
......@@ -912,6 +914,7 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===21" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===22" @click="goCarUrl('CarDealerOrderOP',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===23" @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===24" @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
</div>`,
props: {
rowData: {
......@@ -1887,6 +1890,16 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "LossApportionment",
formatter: this.moneyFormat,
title: "损失分摊",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "ShiJiLiRun",
formatter: this.moneyFormat,
......@@ -2249,9 +2262,6 @@ export default {
if(this.$route.query.LtIdStr){
this.msg.LtIdStr=this.$route.query.LtIdStr
}
if(this.$route.query.IsSelectTravelLoss){
this.msg.IsSelectTravelLoss=this.$route.query.IsSelectTravelLoss
}
if(this.msg.endDate!=""){
this.productionDate[0]=this.msg.startDate;
this.productionDate[1]=this.msg.endDate;
......@@ -2260,6 +2270,13 @@ export default {
if(this.msg.LineId>0){
this.msg.DataType="1";
}
if(this.$route.query.IsSelectTravelLoss){
this.msg.IsSelectTravelLoss=this.$route.query.IsSelectTravelLoss;
this.msg.LossId = this.$route.query.AirLossId;
if(this.msg.IsSelectTravelLoss==2){
this.msg.DataType="-1";
}
}
if(this.msg.LineId==-1){
// 其余都是不限
this.msg.DataType="-1";
......@@ -2331,6 +2348,9 @@ export default {
if(this.msg.LineId==-20){
this.msg.DataType="23";
}
if(this.msg.LineId==-24){
this.msg.DataType="24";
}
let userInfo = this.getLocalStorage();
if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_TicketTeamRevenueReport,')!=-1){
this.isShowType = false;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 09e2abe5
......@@ -1050,21 +1050,22 @@
<el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订房推送
</el-button>
<el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" placement="top">
<el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" placement="top">
<div slot="content">
<div v-html="TipsContent(item,1)"></div>
</div>
<el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送
<div v-html="TipsContent(item,1)"></div>
</div>
<el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送订房
</el-button>
</el-tooltip>
<el-tooltip v-else-if="item.IsPush==2" class="item" effect="dark" :content="item.HotelPushDate" placement="top">
<el-tooltip v-else-if="item.IsPush==2" class="item" effect="dark" :content="item.HotelPushDate"
placement="top">
<div slot="content">
<div v-html="TipsContent(item,1)"></div>
</div>
<el-button @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">重新推送
</el-button>
</el-tooltip>
<div v-html="TipsContent(item,1)"></div>
</div>
<el-button @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">推送订房
</el-button>
</el-tooltip>
</template>
<template v-if="item.LineID==14||item.LineID==118">
......@@ -1072,22 +1073,23 @@
style="background:#00C6FF; border-color:#00C6FF;">订车推送
</el-button>
<!-- content="点击取消推送" -->
<el-tooltip v-else-if="item.CarIsPush==1" class="item" effect="dark" :content="item.CarPushDate" placement="top">
<el-tooltip v-else-if="item.CarIsPush==1" class="item" effect="dark" :content="item.CarPushDate"
placement="top">
<div slot="content">
<div v-html="TipsContent(item,2)"></div>
</div>
<div v-html="TipsContent(item,2)"></div>
</div>
<el-button @click.native='PushBusMessage(item)' type="primary" style="background:red !important;">
已推送
已推送订车
</el-button>
</el-tooltip>
<el-tooltip v-else-if="item.CarIsPush==2" class="item" effect="dark" placement="top">
<el-tooltip v-else-if="item.CarIsPush==2" class="item" effect="dark" placement="top">
<div slot="content">
<div v-html="TipsContent(item,2)"></div>
</div>
<el-button @click.native='PushBusMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">重新推送
</el-button>
</el-tooltip>
<div v-html="TipsContent(item,2)"></div>
</div>
<el-button @click.native='PushBusMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订车推送
</el-button>
</el-tooltip>
</template>
<el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
{{$t('Operation.Op_remark')}}
......@@ -1696,34 +1698,23 @@
}
});
},
TipsContent(item,type){
let resultStr='';
let dateStr='';
if(type==2){
if(item.CarIsPush==1){
resultStr+= '点击取消推送'+"<br/>"+''
dateStr ='推送时间：';
}
else if(item.CarIsPush==2){
resultStr+= '点击重新推送'+"<br/>"
dateStr ='取消时间：';
}
if(item.CarPushDate){
resultStr+= dateStr+ item.CarPushDate+"<br/>"
//提示信息(type=1酒店推送,type=2订车推送)
TipsContent(item, type) {
let resultStr = '';
//订车推送
if (type == 2) {
if (item.CarIsPush == 1) {
resultStr += '已推送订车，推送时间:' + item.CarPushDate + '<br/>点击可取消用车';
} else if (item.CarIsPush == 2) {
resultStr += '已取消订车，取消时间:' + item.CarPushDate + '<br/>点击可重新推送用车';
}
} else if(type==1){
if(item.IsPush==1){
dateStr ='推送时间：';
resultStr+= '点击取消推送'+"<br/>"
}
else if(item.IsPush==2){
dateStr ='取消时间：';
resultStr+= '点击重新推送'+"<br/>"
}
if(item.HotelPushDate){
resultStr+= dateStr+ item.HotelPushDate+"<br/>"
}
//订房推送
else if (type == 1) {
if (item.IsPush == 1) {
resultStr = '已推送订房，推送时间：' + item.HotelPushDate + '<br/> 点击可取消订房';
} else if (item.IsPush == 2) {
resultStr = '已取消订房推送，取消时间：' + item.HotelPushDate + '<br/>点击可重新推送订房';
}
}
return resultStr;
......@@ -1738,32 +1729,31 @@
if (item.IsPush == 1) {
cmdStr = "travel_post_CancelPushTravelPriceToQYWork"; //取消推送
tipMessage = "【取消】推送";
} let that = this;
that.$confirm('是否确认操作酒店推送', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.queryCommonData.loading = true;
this.apipost(cmdStr, pMsg, res => {
if (res.data.resultCode == 1) {
this.Success(tipMessage + '成功!');
this.getControlList();
} else {
this.Error(tipMessage + '失败!');
}
});
}).catch(() => {
}
let that = this;
that.$confirm('是否确认操作酒店推送', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.queryCommonData.loading = true;
this.apipost(cmdStr, pMsg, res => {
if (res.data.resultCode == 1) {
this.Success(tipMessage + '成功!');
this.getControlList();
} else {
this.Error(tipMessage + '失败!');
}
});
}).catch(() => {
});
},
//订车推送
PushBusMessage(item) {
var pMsg = {
TCID: item.TCID
};
};
var tipMessage = "订车推送消息";
var cmdStr = "travel_post_PushTravelBusToQYWork"; //推送消息
if (item.CarIsPush == 1) {
......@@ -1771,24 +1761,21 @@
tipMessage = "订车【取消】推送";
}
let that = this;
that.$confirm('是否确认操作订车推送', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.queryCommonData.loading = true;
this.apipost(cmdStr, pMsg, res => {
if (res.data.resultCode == 1) {
this.Success(tipMessage + '成功!');
this.getControlList();
} else {
this.Error(tipMessage + '失败!');
}
});
}).catch(() => {
that.$confirm('是否确认操作订车推送', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.queryCommonData.loading = true;
this.apipost(cmdStr, pMsg, res => {
if (res.data.resultCode == 1) {
this.Success(tipMessage + '成功!');
this.getControlList();
} else {
this.Error(tipMessage + '失败!');
}
});
}).catch(() => {});
},
showDialog(ConfigId, OfferId) {
this.dialog = {
......
src/components/index.vue
View file @ 09e2abe5
......@@ -2075,7 +2075,7 @@
let day = changedate.getDate()
let days = day > 9 ? day : '0' + Month
let DepartETime = Year + '-' + Months + '-' + days
console.log("ddddddd", DepartETime);
console.log("Index_GetChangeThePrice", DepartETime);
let msg = {
pageIndex: 1,
pagesize: 5,
......
src/components/myOrdersAllType/components/OrderList.vue
View file @ 09e2abe5
......@@ -1097,8 +1097,7 @@
});
},
// 单据详情
openDetails(FrID) {
console.log(FrID);
openDetails(FrID) {
let query = {
id: FrID,
blank: "y",
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 09e2abe5
......@@ -16,8 +16,7 @@
<template v-for="item in TypeArray">
<div class="TFslide"
:class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
@click="clickFeature(item)" :key="item.subCode"
>
@click="clickFeature(item)" :key="item.subCode">
<!--v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)"-->
<img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div>
......@@ -411,8 +410,8 @@
this.dialogPptistVisible = false
},
handleMessage(event, targetOrigin) {
console.log("event", event);
console.log("event.data", event.data);
console.log("handleMessage_event", event);
console.log("handleMessage_event.data", event.data);
if (this.isPostMessage) return
if (event.data && event.data.data && !event.data.data) return
if (event && event.data) {
......@@ -464,7 +463,6 @@
}
},
getHtml: function (postData, SaveType, TeamType) {
console.log("postData", postData);
var FeatureData = {
B2BRemark: postData.B2BRemark,
ConfigId: postData.ConfigId,
......@@ -521,7 +519,6 @@
}
FeatureData.FeatureHtml = newHtml;
} catch (err) {}
console.log("Api_FeatureData", FeatureData);
this.apipost("travel_post_SetFeature", FeatureData, res => {
try {
this.$refs.newFeature.setReadOnly(false)
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 09e2abe5
......@@ -85,7 +85,7 @@
</div>
<TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
:subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
<div id="fiveAnchor">
<!--常规团-->
<TravelPrice v-show="PostConfig.TeamType==0" @saveMsg="SaveData(1)" ref="TravelPrice" @headCallBack="getPrice"
......
src/components/newTravelmanager/TravelGroupControl/TravelNotice.vue
View file @ 09e2abe5
......@@ -186,9 +186,6 @@
</div>
</template>
<script>
import {
quillEditor
} from "vue-quill-editor";
import * as Quill from "quill"; //引入编辑器
import MyEdit from "../../EditTemplate.vue";
//quill编辑器的字体
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 09e2abe5
......@@ -357,7 +357,7 @@
<div>
<div class="TravelPrice clearfix" :class="{'foldHeight':isFold==1}">
<span class="TMTitle">
<i></i>{{$t('sm.tuanqishezhi')}}
<i></i>{{$t('sm.tuanqishezhi')}}
</span>
<span class="foldList" @click="fold" v-if="isFold==''">{{$t('sm.djzd')}}</span>
<span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
......@@ -654,7 +654,8 @@
</el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
<el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName" :disabled="CurrentUserInfo.RB_Group_id==2">
<el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName"
:disabled="CurrentUserInfo.RB_Group_id==2">
<el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
</el-option>
......@@ -1236,9 +1237,7 @@
message: res.data.message
});
}
},
err => {}
);
});
},
//销售公司改变方法
ChangeSaleBranch(item) {
......@@ -1406,7 +1405,6 @@
});
this.returnPriceList = array;
},
initCalendar: function (cur) {
var newDays = this.$calendarUtils.createCalendar(cur);
this.currentDay = newDays.CurrentDay;
......@@ -1526,8 +1524,7 @@
message: res.data.message
});
}
},
err => {}
}
);
},
validateForm() {
......@@ -1729,9 +1726,7 @@
this.companyList = res.data.data;
this.getstandardCurrencyName()
}
},
err => {}
);
});
},
//选中航班选择框
getSelect(item) {
......@@ -1912,10 +1907,12 @@
},
//关闭弹窗方法
closeHotelDialog() {
console.log("xxxx")
this.outerVisible = false;
},
//保存完成初始化
initStatus() {
console.log("yyyy")
this.isSaved = true;
this.btnText = '保存';
this.btnTongBu = "同步酒店";
......@@ -1934,9 +1931,7 @@
if (res.data.resultCode == 1) {
item.HotelList = res.data.data;
}
},
err => {}
);
});
}
},
//获取少价信息
......@@ -1947,14 +1942,12 @@
LineTeamId: this.PostConfig.LineteamId
}
this.apipost("sell_get_GetNewTCIDLessprice", msg, res => {
if (res.data.resultCode == 1) {
this.lessPriceData = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
if (res.data.resultCode == 1) {
this.lessPriceData = res.data.data;
} else {
this.Error(res.data.message);
}
});
},
//删除占用的酒店库存信息
DeleteStock(item) {
......@@ -1966,15 +1959,13 @@
useTime: item.SubList[0].JourneyDate
};
that.apipost("hoteluse_post_DeleteHotelUse", delMsg, res => {
if (res.data.resultCode == 1) {
that.Success("操作成功!");
item.SubList[0].UseCount = 0;
} else {
that.Error(res.data.message);
}
},
err => {}
);
if (res.data.resultCode == 1) {
that.Success("操作成功!");
item.SubList[0].UseCount = 0;
} else {
that.Error(res.data.message);
}
});
});
},
//根据日期返回星期几
......@@ -1989,15 +1980,12 @@
//获取团队类型
getTeamList() {
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
if (res.data.resultCode == 1) {
this.TeamListArr = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
if (res.data.resultCode == 1) {
this.TeamListArr = res.data.data;
} else {
this.Error(res.data.message);
}
});
},
uploadFileBtn(file) { //上传
let newArr = [];
......@@ -2013,16 +2001,14 @@
//获取车辆列表
getBusList() {
this.apipost("bus_get_GetBusTypePriceList", {
IsHaveBusNum: 1
}, res => {
if (res.data.resultCode == 1) {
this.busPriceList = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
IsHaveBusNum: 1
}, res => {
if (res.data.resultCode == 1) {
this.busPriceList = res.data.data;
} else {
this.Error(res.data.message);
}
});
}
},
mounted() {
......
src/components/newTravelmanager/travelLineTrip/trifficTripThree.vue
View file @ 09e2abe5
......@@ -9,9 +9,7 @@
<div class="TDLeftPlan">
<span v-for="(subTraffic,subTrafficIndex) in trafficObj.SubTraffic">
<span v-if="subTrafficIndex==0">
<el-form-item
class="StartCity"
:rules="trifficTripRules.StartCityId">
<el-form-item class="StartCity" :rules="trifficTripRules.StartCityId">
<el-select :disabled="isOpenGroup" class="w120" placeholder="出发城市" filterable remote
v-model="subTraffic.StartCityId" reserve-keyword :remote-method="GetDepartList1"
@change="changeGetDepartList(subTraffic.StartCityId)">
......@@ -51,9 +49,10 @@
<!--增加交通计划-->
<span style="line-height: 38px;">
<span v-if="!isOpenGroup" class="addTrafficPlan" @click="addTrafficPlan(trafficObj)">+</span>
<!--减少交通计划-->
<span v-if="trafficObj!=null && trafficObj.SubTraffic!=null && trafficObj.SubTraffic.length>1&&!isOpenGroup"
class="addTrafficPlan" @click="minusTrafficPlan(trafficObj)">-</span>
<!--减少交通计划-->
<span
v-if="trafficObj!=null && trafficObj.SubTraffic!=null && trafficObj.SubTraffic.length>1&&!isOpenGroup"
class="addTrafficPlan" @click="minusTrafficPlan(trafficObj)">-</span>
</span>
</div>
</div>
......@@ -122,7 +121,6 @@
"QueryData",
"isOpenGroup",
"subTotalIndex",
"AllCityList", //所有的城市数据
"TimeTypeList",
"UseTypeArray",
"AirPickUp",
......@@ -255,7 +253,7 @@
if (val != 0) {
//获取当前选中的对象
let obj = {};
obj = that.AllCityList.find(item => {
obj = that.ArriveList1.find(item => {
return item.ID === val; //筛选出匹配数据
});
if (obj != undefined) {
......@@ -279,7 +277,7 @@
if (val != 0) {
//获取当前选中的对象
let obj = {};
obj = that.AllCityList.find(item => {
obj = that.DepartList1.find(item => {
return item.ID === val; //筛选出匹配数据
});
if (obj != undefined) {
......@@ -291,7 +289,6 @@
}
}
},
//接机送机点击切换
changeAirportType(t) {
if (t == this.trafficObj.AirportPickUp) {
......@@ -425,17 +422,21 @@
</script>
<style>
.addTrafficPlan{
.addTrafficPlan {
line-height: 20px;
}
.useTypeDiv .el-input .el-input__inner{
.useTypeDiv .el-input .el-input__inner {
height: 27px !important;
border-radius: 3px;
}
.StartCity .el-form-item__content{
.StartCity .el-form-item__content {
line-height: 35px;
}
.TCtraffic.flex .TDplanList.TDplanListTwo{
.TCtraffic.flex .TDplanList.TDplanListTwo {
padding-top: 0;
}
</style>
src/components/orderCommon/order-form2.vue
View file @ 09e2abe5
......@@ -1037,8 +1037,6 @@
if (res.data.resultCode == 1) {
this.couponList = res.data.data
}
}, (err) => {
console.log(err)
})
}
},
......
src/components/temp/operation.vue
View file @ 09e2abe5
......@@ -378,10 +378,12 @@
</template>
<div class="border-bottom" v-if="isVisa">
<p style="font-size: 16px;font-weight: bold;color: black;padding: 10px 0 0 0;"
v-if="item.BranchList[0].GradeRuleList.length>0">小包团{{!isBranchCompany?'、落地团':''}}以及单项提成</p>
v-if="item.BranchList&&item.BranchList.length>0&&item.BranchList[0].GradeRuleList&& item.BranchList[0].GradeRuleList && item.BranchList[0].GradeRuleList.length>0">
小包团{{!isBranchCompany?'、落地团':''}}以及单项提成</p>
<div class="ladder-form" style="margin-top: 3px;">
<div class="ladder-form-box">
<template v-if="item.BranchList[0].GradeRuleList.length>0">
<template
v-if="item.BranchList&&item.BranchList.length>0&&item.BranchList[0].GradeRuleList&&item.BranchList[0].GradeRuleList.length>0">
<div class="ladder-list" v-for="(s,indexs) in item.BranchList">
<div class="ladder-title">{{s.BranchName}}</div>
<div class="CommissionInfor">
......@@ -720,8 +722,10 @@
if (item.Id == 1) {
this.msg.Month = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime)
} else {
if(this.LastMonthTime==12) this.msg.Month = this.Year2 + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime)
else this.msg.Month = this.Year + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime)
if (this.LastMonthTime == 12) this.msg.Month = this.Year2 + '-' + (this.LastMonthTime >= 10 ? this
.LastMonthTime : '0' + this.LastMonthTime)
else this.msg.Month = this.Year + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this
.LastMonthTime)
}
this.getList()
},
......@@ -729,7 +733,7 @@
getList() {
this.loading = true
this.apipost("opcommission_GetOPExpectCommission", this.msg, res => {
this.loading=false;
this.loading = false;
if (res.data.resultCode == 1) {
this.OrderNum = 0
this.groupNum = 0
......@@ -894,9 +898,9 @@
}
let nowdays = new Date()
this.Year = new Date().getFullYear()
this.Year2 = new Date().getFullYear()-1
this.Year2 = new Date().getFullYear() - 1
this.LastMonthTime = new Date().getMonth()
this.LastMonthTime = this.LastMonthTime==0?12:this.LastMonthTime
this.LastMonthTime = this.LastMonthTime == 0 ? 12 : this.LastMonthTime
this.MonthTime = new Date().getMonth() + 1
this.msg.Month = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime)
this.MonthList[0].Name = this.MonthList[0].Name + '(' + this.LastMonthTime + '月)'
......@@ -904,7 +908,8 @@
this.commissionMsg.DepartSTime = this.getBeforeDate(93, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
var MonthDayNum = new Date(this.Year, this.MonthTime, 0).getDate(); //计算当月的天数
this.commissionMsg.DepartETime = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime) +
this.commissionMsg.DepartETime = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this
.MonthTime) +
'-' + (MonthDayNum > 10 ? MonthDayNum : '0' + MonthDayNum) //出发结束
this.iWorkbench()
this.GetOrderPageList()
......
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