Skip to content

S
SuperMan
Commit 16c77812 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 40f8e48a 8845512b
Hide whitespace changes
Inline Side-by-side
Showing with 334 additions and 330 deletions
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue
View file @ 16c77812
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<td>{{item.OrderProfit}}</td> <td>{{item.OrderProfit}}</td>
<td>{{item.YCommission}}</td> <td>{{item.YCommission}}</td>
<td>{{item.Commission}}</td> <td>{{item.Commission}}</td>
<td>{{item.LimitCommission>0?item.LimitCommission:'-'}}</td> <td>{{item.LimitCommission != 0?item.LimitCommission:'-'}}</td>
<td>{{item.CommissionRate}}%</td> <td>{{item.CommissionRate}}%</td>
<td @click="GenerateScale(item)"> <td @click="GenerateScale(item)">
<span <span
......
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue
View file @ 16c77812
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
:class="item.WageReId?'cursor-p':''">{{item.WageType==1?'新员工比例':item.WageType==2?'上季度定档':'-'}}</span> :class="item.WageReId?'cursor-p':''">{{item.WageType==1?'新员工比例':item.WageType==2?'上季度定档':'-'}}</span>
</td> </td>
<td>{{item.Commission}}</td> <td>{{item.Commission}}</td>
<td>{{item.LimitCommission>0?item.LimitCommission:'-'}}</td> <td>{{item.LimitCommission != 0?item.LimitCommission:'-'}}</td>
<td>{{item.CommissionRate}}%</td> <td>{{item.CommissionRate}}%</td>
<td>{{item.EmName!='微途'?item.BonusMoney:'-'}}</td> <td>{{item.EmName!='微途'?item.BonusMoney:'-'}}</td>
<td>{{item.EmName!='微途'?item.BonusRate+'%':'-'}}</td> <td>{{item.EmName!='微途'?item.BonusRate+'%':'-'}}</td>
......
src/components/busManagement/tripBusOrder.vue
View file @ 16c77812
...@@ -26,12 +26,14 @@ ...@@ -26,12 +26,14 @@
<el-date-picker v-model='msg.EndTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.EndTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span> </span>
</li> </li>
<!-- <li><span><em>确认状态</em></span> <li><span><em>状态</em></span>
<el-select v-model='msg.QSureState'> <el-select v-model='msg.OfferState' clearable>
<el-option label='已确认' value='1' key='1'></el-option> <el-option label='等待报价' value='2' key='2'></el-option>
<el-option label='未确认' value='2' key='2'></el-option> <el-option label='已报价' value='3' key='3'></el-option>
<el-option label='确认报价' value='4' key='4'></el-option>
<el-option label='取消报价' value='5' key='5'></el-option>
</el-select> </el-select>
</li> --> </li>
<li> <li>
<input type="button" class="normalBtn" value="查询" @click="getList(); resetPageIndex()" /> <input type="button" class="normalBtn" value="查询" @click="getList(); resetPageIndex()" />
</li> </li>
...@@ -107,11 +109,11 @@ ...@@ -107,11 +109,11 @@
<td> <td>
<div class="link" style="display: flex; <div class="link" style="display: flex;
flex-flow: wrap; width: 135px;justify-content: space-around;"> flex-flow: wrap; width: 135px;justify-content: space-around;">
<el-button size="mini" v-if="item.OfferState == 2" @click="SetTripBusPrice(item, 1)" <el-button size="mini" v-if="item.OfferState == 2" @click="SetTripBusPrice(item, 1)" type="primary">报价
type="primary">报价</el-button> </el-button>
<el-button size="mini" @click="SetTripBusPrice(item, 2)" type="primary">详情</el-button> <el-button size="mini" @click="SetTripBusPrice(item, 2)" type="primary">详情</el-button>
<!-- <el-button style="margin-top: 10px;" size="mini" @click="driver(item.Id)" <el-button v-if="item.OfferState==4" style="margin-top: 10px;" size="mini" @click="driver(item.Id)"
type="primary">添加司机车牌号</el-button> --> type="primary">添加司机车牌号</el-button>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -318,358 +320,360 @@ ...@@ -318,358 +320,360 @@
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
drivermsg: { drivermsg: {
Id: '', Id: '',
DriverInfo: "", DriverInfo: "",
BusNo: "" BusNo: ""
},
dialogVisible: false,
labelPosition: 'right',
userInfo: {}, //用户信息
loading: false,
currentPage: 1,
total: 0,
DataList: [], //数据列表
msg: {
pageIndex: 1,
pageSize: 12,
UseCompName: "", //订车公司
UseName: "", //订车人
TeamName: "", //团体名称
StartTime: "", //开始时间
EndTime: "", //结束时间
OfferState: "", //报价状态
},
boxHeight: 0,
offsetwidth: 0,
dialogTitle: "提交报价",
isShowPrice: false, //是否显示报价信息
//提交信息
postMsg: {
Id: 0,
UseCompName: "",
UseName: "",
PickUpInfo: "",
GoFlightInfo: "",
BackFlightInfo: "",
PeopleNum: 0,
UseDayNum: 0,
StartDate: "",
BusType: 0,
BusTypeName: "",
GuideInfo: "",
DriverInfo: "",
BusNo: "",
Remark: "",
AttentionInfo: "",
PayType: 0,
IsSure: 0,
SureTime: "",
SureId: 0,
TeamName: "",
CurrencyId: 0,
DiscountPrice: 0,
TotalPrice: 0,
CustomerId: 0,
OfferDate: "",
OfferBy: 0,
OfferState: 0,
OfferStateName: "",
ShouPeiFee: 0,
CancelRemark: "",
details: [],
CustomerName: "",
},
subUnitPrice: 0,
subStopBusPrice: 0,
subRoomPrice: 0,
priceType: 1,
}
},
components: {
},
methods: {
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
}, },
dialogVisible: false, resetPageIndex() {
labelPosition: 'right', this.msg.pageIndex = 1;
userInfo: {}, //用户信息 this.currentPage = 1;
loading: false,
currentPage: 1,
total: 0,
DataList: [], //数据列表
msg: {
pageIndex: 1,
pageSize: 12,
UseCompName: "", //订车公司
UseName: "", //订车人
TeamName: "", //团体名称
StartTime: "", //开始时间
EndTime: "", //结束时间
QSureState: "", //确认状态
}, },
boxHeight: 0, getList() {
offsetwidth: 0, this.loading = true
dialogTitle: "提交报价", this.apipost('tripbus_GetErpTripBusPage', this.msg, res => {
isShowPrice: false, //是否显示报价信息 this.loading = false;
//提交信息 if (res.data.resultCode == 1) {
postMsg: { this.total = res.data.data.count;
Id: 0, this.DataList = res.data.data.pageData;
UseCompName: "", this.$forceUpdate();
UseName: "", } else {
PickUpInfo: "", this.Error(res.data.message);
GoFlightInfo: "", }
BackFlightInfo: "", }, err => {})
PeopleNum: 0,
UseDayNum: 0,
StartDate: "",
BusType: 0,
BusTypeName: "",
GuideInfo: "",
DriverInfo: "",
BusNo: "",
Remark: "",
AttentionInfo: "",
PayType: 0,
IsSure: 0,
SureTime: "",
SureId: 0,
TeamName: "",
CurrencyId: 0,
DiscountPrice: 0,
TotalPrice: 0,
CustomerId: 0,
OfferDate: "",
OfferBy: 0,
OfferState: 0,
OfferStateName: "",
ShouPeiFee: 0,
CancelRemark: "",
details: [],
CustomerName: "",
}, },
subUnitPrice: 0, handleClose(done) {
subStopBusPrice: 0, this.$confirm('确认关闭？')
subRoomPrice: 0, .then(_ => {
priceType: 1, done();
} })
}, .catch(_ => {});
components: { },
// 司机确定
}, driverdetermine() {
methods: { this.apipost('tripbus_SetBusPriceInfo', this.drivermsg, res => {
handleCurrentChange(val) { if (res.data.resultCode == 1) {
this.msg.pageIndex = val; this.dialogVisible = false
this.getList(); this.$forceUpdate();
}, } else {
resetPageIndex() { this.Error(res.data.message);
this.msg.pageIndex = 1;
this.currentPage = 1;
},
getList() {
this.loading = true
this.apipost('tripbus_GetErpTripBusPage', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.DataList = res.data.data.pageData;
this.$forceUpdate();
} else {
this.Error(res.data.message);
}
}, err => { })
},
handleClose(done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
})
.catch(_ => { });
},
// 司机确定
driverdetermine() {
this.apipost('tripbus_SetBusPriceInfo', this.drivermsg, res => {
if (res.data.resultCode == 1) {
this.dialogVisible = false
this.$forceUpdate();
} else {
this.Error(res.data.message);
}
}, err => { })
},
// 添加司机车号
driver(id) {
this.drivermsg.Id = id
this.dialogVisible = true
},
//设置行程报价
SetTripBusPrice(item, type) {
this.priceType = type;
if (this.priceType == 1) {
this.dialogTitle = "提交报价";
} else {
this.dialogTitle = "报价详情";
}
this.isShowPrice = true;
this.apipost('tripbus_GetTripBusInfo', {
Id: item.Id
}, res => {
if (res.data.resultCode == 1) {
var tempData = res.data.data;
this.postMsg.Id = item.Id;
this.postMsg.UseCompName = tempData.UseCompName;
this.postMsg.UseName = tempData.UseName;
this.postMsg.PickUpInfo = tempData.PickUpInfo;
this.postMsg.GoFlightInfo = tempData.GoFlightInfo;
this.postMsg.BackFlightInfo = tempData.BackFlightInfo;
this.postMsg.PeopleNum = tempData.PeopleNum;
this.postMsg.UseDayNum = tempData.UseDayNum;
this.postMsg.StartDate = tempData.StartDate;
this.postMsg.BusType = tempData.BusType;
this.postMsg.BusTypeName = tempData.BusTypeName;
this.postMsg.GuideInfo = tempData.GuideInfo;
this.postMsg.DriverInfo = tempData.DriverInfo;
this.postMsg.BusNo = tempData.BusNo;
this.postMsg.Remark = tempData.Remark;
this.postMsg.AttentionInfo = tempData.AttentionInfo;
this.postMsg.PayType = tempData.PayType;
this.postMsg.IsSure = tempData.IsSure;
this.postMsg.TeamName = tempData.TeamName;
this.postMsg.CurrencyId = tempData.CurrencyId;
this.postMsg.DiscountPrice = tempData.DiscountPrice;
this.postMsg.TotalPrice = tempData.TotalPrice;
this.postMsg.CustomerId = tempData.CustomerId;
this.postMsg.OfferState = tempData.OfferState;
this.postMsg.OfferBy = tempData.OfferBy;
this.postMsg.OfferStateName = tempData.OfferStateName;
this.postMsg.ShouPeiFee = tempData.ShouPeiFee;
this.postMsg.CancelRemark = tempData.CancelRemark;
this.postMsg.CustomerName = tempData.CustomerName;
this.postMsg.CreateDate = tempData.CreateDate;
if (tempData.details && tempData.details.length > 0) {
this.postMsg.details = tempData.details;
} }
this.calcPrice(); }, err => {})
},
// 添加司机车号
driver(id) {
this.drivermsg.Id = id
this.dialogVisible = true
},
//设置行程报价
SetTripBusPrice(item, type) {
this.priceType = type;
if (this.priceType == 1) {
this.dialogTitle = "提交报价";
} else { } else {
this.Error(res.data.message); this.dialogTitle = "报价详情";
} }
}, err => { }) this.isShowPrice = true;
}, this.apipost('tripbus_GetTripBusInfo', {
//计算价格 Id: item.Id
calcPrice() { }, res => {
var tempUnitPrice = 0; if (res.data.resultCode == 1) {
var tempStopBusPrice = 0; var tempData = res.data.data;
var tempRoomPrice = 0; this.postMsg.Id = item.Id;
var tempTotalPrice = 0; this.postMsg.UseCompName = tempData.UseCompName;
if (this.postMsg && this.postMsg.details && this.postMsg.details.length > 0) { this.postMsg.UseName = tempData.UseName;
this.postMsg.details.forEach(item => { this.postMsg.PickUpInfo = tempData.PickUpInfo;
if (item.UnitPrice) { this.postMsg.GoFlightInfo = tempData.GoFlightInfo;
tempUnitPrice += Number(item.UnitPrice); this.postMsg.BackFlightInfo = tempData.BackFlightInfo;
tempTotalPrice += Number(item.UnitPrice); this.postMsg.PeopleNum = tempData.PeopleNum;
this.postMsg.UseDayNum = tempData.UseDayNum;
this.postMsg.StartDate = tempData.StartDate;
this.postMsg.BusType = tempData.BusType;
this.postMsg.BusTypeName = tempData.BusTypeName;
this.postMsg.GuideInfo = tempData.GuideInfo;
this.postMsg.DriverInfo = tempData.DriverInfo;
this.postMsg.BusNo = tempData.BusNo;
this.postMsg.Remark = tempData.Remark;
this.postMsg.AttentionInfo = tempData.AttentionInfo;
this.postMsg.PayType = tempData.PayType;
this.postMsg.IsSure = tempData.IsSure;
this.postMsg.TeamName = tempData.TeamName;
this.postMsg.CurrencyId = tempData.CurrencyId;
this.postMsg.DiscountPrice = tempData.DiscountPrice;
this.postMsg.TotalPrice = tempData.TotalPrice;
this.postMsg.CustomerId = tempData.CustomerId;
this.postMsg.OfferState = tempData.OfferState;
this.postMsg.OfferBy = tempData.OfferBy;
this.postMsg.OfferStateName = tempData.OfferStateName;
this.postMsg.ShouPeiFee = tempData.ShouPeiFee;
this.postMsg.CancelRemark = tempData.CancelRemark;
this.postMsg.CustomerName = tempData.CustomerName;
this.postMsg.CreateDate = tempData.CreateDate;
if (tempData.details && tempData.details.length > 0) {
this.postMsg.details = tempData.details;
}
this.calcPrice();
} else {
this.Error(res.data.message);
} }
if (item.StopBusPrice) { }, err => {})
tempStopBusPrice += Number(item.StopBusPrice); },
tempTotalPrice += Number(item.StopBusPrice); //计算价格
} calcPrice() {
if (item.RoomPrice) { var tempUnitPrice = 0;
tempRoomPrice += Number(item.RoomPrice); var tempStopBusPrice = 0;
tempTotalPrice += Number(item.RoomPrice); var tempRoomPrice = 0;
var tempTotalPrice = 0;
if (this.postMsg && this.postMsg.details && this.postMsg.details.length > 0) {
this.postMsg.details.forEach(item => {
if (item.UnitPrice) {
tempUnitPrice += Number(item.UnitPrice);
tempTotalPrice += Number(item.UnitPrice);
}
if (item.StopBusPrice) {
tempStopBusPrice += Number(item.StopBusPrice);
tempTotalPrice += Number(item.StopBusPrice);
}
if (item.RoomPrice) {
tempRoomPrice += Number(item.RoomPrice);
tempTotalPrice += Number(item.RoomPrice);
}
});
}
this.subUnitPrice = tempUnitPrice.toFixed(2);
this.subStopBusPrice = tempStopBusPrice.toFixed(2);
this.subRoomPrice = tempRoomPrice.toFixed(2);
if (this.postMsg.ShouPeiFee) {
tempTotalPrice += Number(this.postMsg.ShouPeiFee);
}
this.postMsg.TotalPrice = tempTotalPrice.toFixed(2);
},
//提交报价
submitTripBusOffer() {
this.apipost('tripbus_ErpSubmitTripBusOffer', this.postMsg, res => {
if (res.data.resultCode == 1) {
this.isShowPrice = false;
this.getList();
} else {
this.Error(res.data.message);
} }
}); }, err => {})
}
this.subUnitPrice = tempUnitPrice.toFixed(2);
this.subStopBusPrice = tempStopBusPrice.toFixed(2);
this.subRoomPrice = tempRoomPrice.toFixed(2);
if (this.postMsg.ShouPeiFee) {
tempTotalPrice += Number(this.postMsg.ShouPeiFee);
} }
this.postMsg.TotalPrice = tempTotalPrice.toFixed(2);
}, },
//提交报价 mounted() {
submitTripBusOffer() { this.userInfo = this.getLocalStorage();
this.apipost('tripbus_ErpSubmitTripBusOffer', this.postMsg, res => { let myDate = new Date();
if (res.data.resultCode == 1) { let nowDate =
this.isShowPrice = false; myDate.getFullYear() +
this.getList(); "-" +
} else { parseInt(myDate.getMonth() + 1) +
this.Error(res.data.message); "-" +
} myDate.getDate();
}, err => { }) this.msg.StartTime = nowDate;
} let width = window.innerWidth - 50;
}, let height = window.innerHeight - 65 - 210;
mounted() { this.boxHeight = height;
this.userInfo = this.getLocalStorage(); this.offsetwidth = width;
let myDate = new Date(); this.getList();
let nowDate = },
myDate.getFullYear() + }
"-" +
parseInt(myDate.getMonth() + 1) +
"-" +
myDate.getDate();
this.msg.StartTime = nowDate;
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 210;
this.boxHeight = height;
this.offsetwidth = width;
this.getList();
},
}
</script> </script>
<style> <style>
.splitTrCss td { .splitTrCss td {
background: #eee !important; background: #eee !important;
} }
.busIconStyle>span { .busIconStyle>span {
margin-right: 20px; margin-right: 20px;
font-weight: bold; font-weight: bold;
} }
.busStatisticsTalbe { .busStatisticsTalbe {
background: #ccc; background: #ccc;
} }
.busStatisticsTalbe tr th { .busStatisticsTalbe tr th {
background: #E6E6E6; background: #E6E6E6;
height: 40px; height: 40px;
font-size: 12px; font-size: 12px;
color: #333; color: #333;
} }
.busStatisticsTalbe tr { .busStatisticsTalbe tr {
background: #fff; background: #fff;
text-align: center; text-align: center;
height: 40px; height: 40px;
} }
.busStatisticsTalbe tr td { .busStatisticsTalbe tr td {
font-size: 12px; font-size: 12px;
} }
.busStatisticsTalbe tr td .pDateStyle { .busStatisticsTalbe tr td .pDateStyle {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
min-height: 24px; min-height: 24px;
line-height: 24px; line-height: 24px;
margin-top: 0; margin-top: 0;
box-sizing: content-box; box-sizing: content-box;
padding: 0 10px; padding: 0 10px;
} }
.busStatisticsTalbe tr td .pDateStyle:last-child { .busStatisticsTalbe tr td .pDateStyle:last-child {
border-bottom: none; border-bottom: none;
} }
.busStatisticsTalbe tr td .link p:hover { .busStatisticsTalbe tr td .link p:hover {
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.busStatisticsTalbe tr td .link span:hover { .busStatisticsTalbe tr td .link span:hover {
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.busStatistics_tripDetails { .busStatistics_tripDetails {
padding: 0; padding: 0;
box-shadow: 0px 1px 3px 0px #dedede; box-shadow: 0px 1px 3px 0px #dedede;
max-height: 400px; max-height: 400px;
overflow-y: auto; overflow-y: auto;
} }
.busStatistics_tripDetails .popper__arrow::after { .busStatistics_tripDetails .popper__arrow::after {
border-bottom-color: #ededed !important; border-bottom-color: #ededed !important;
} }
.busStatistics_tripDetails table { .busStatistics_tripDetails table {
padding: 10px 0 0 20px; padding: 10px 0 0 20px;
background-color: #ededed; background-color: #ededed;
border-collapse: collapse; border-collapse: collapse;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
font-size: 12px; font-size: 12px;
} }
.busStatistics_tripDetails table th { .busStatistics_tripDetails table th {
background-color: #ededed; background-color: #ededed;
padding: 5px; padding: 5px;
} }
.busStatistics_tripDetails table td { .busStatistics_tripDetails table td {
background-color: #ffffff; background-color: #ffffff;
padding: 9px 15px; padding: 9px 15px;
color: #333333; color: #333333;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
} }
.busStatistics_tripDetails table td._d_name { .busStatistics_tripDetails table td._d_name {
background-color: #ededed; background-color: #ededed;
} }
.busStatistics_tripDetails table ._color_666 { .busStatistics_tripDetails table ._color_666 {
color: #666666; color: #666666;
} }
.busStatistics_tripDetails table tr._color_666 th { .busStatistics_tripDetails table tr._color_666 th {
padding: 9px 15px; padding: 9px 15px;
} }
.Bus_HotelPop {
overflow: auto;
max-height: 350px;
}
.Bus_HotelPop {
overflow: auto;
max-height: 350px;
}
</style> </style>
<style scoped> <style scoped>
/deep/.el-form-item { /deep/.el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
.total {
display: flex;
width: 100%;
justify-content: center;
font-weight: bold;
margin-bottom: 20px;
margin-top: 10px;
}
.total { .flex {
display: flex; display: flex;
width: 100%; width: 100%;
justify-content: center; justify-content: space-between;
font-weight: bold; }
margin-bottom: 20px;
margin-top: 10px;
}
.flex {
display: flex;
width: 100%;
justify-content: space-between;
}
</style> </style>
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