Skip to content

S
SuperMan
Commit 5adbfc5d authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents 0cdc0ca1 ec06fe2c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1824 additions and 178 deletions
src/components/WebSet/WebSiteArea.vue
View file @ 5adbfc5d
......@@ -488,7 +488,9 @@ import uploadImg from '../../pubComponents/uploadImg'
}
},
addArea() {
console.log(this.areaInfo)
if(this.areaInfo) {
this.addMsg.DestinationList = this.addMsg.DestinationList?this.addMsg.DestinationList:[]
this.addMsg.DestinationList.push(this.areaInfo)
}
this.areaVisible = false
......
src/components/busManagement/BookAcar/components/BookAcarOrder.vue
View file @ 5adbfc5d
......@@ -141,7 +141,7 @@
<script>
import OrderList from './OrderList.vue';
export default {
props:['pagesTitle','type'],
props:['pagesTitle','type','OrderId'],
components: { OrderList },
data() {
return {
......@@ -210,6 +210,10 @@
this.msg.OrderType = val
this.GetList()
},
OrderId(val,oldval){
this.msg.OrderId = val
this.GetList()
},
},
methods: {
getEmployee() { //员工
......
src/components/busManagement/tripBusOrder.vue
View file @ 5adbfc5d
......@@ -5,12 +5,23 @@
<li><span><em>状态</em></span>
<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='3' key='3'></el-option>
<el-option label='确认报价' value='4' key='4'></el-option>
<el-option label='取消报价' value='5' key='5'></el-option>
<el-option label='待确认' value='1' key='1'></el-option>
<el-option label='已确认' value='2' key='2'></el-option>
<el-option label='已取消' value='3' key='3'></el-option>
</el-select>
</li>
<li>
<span>
<em>订单编号</em>
<el-input v-model='msg.OrderNo' class="w200"></el-input>
</span>
</li>
<li>
<span>
<em>订单流水号</em>
<el-input v-model='msg.OrderId' class="w200"></el-input>
</span>
</li>
<li>
<span>
<em>订车公司</em>
......@@ -45,7 +56,7 @@
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList(); resetPageIndex()" />
<button class="hollowFixedBtn" type="primary" @click="goUrl">
<button v-if="pagesTitle=='销售'" class="hollowFixedBtn" type="primary" @click="goUrl(0)">
添加
</button>
</li>
......@@ -58,86 +69,7 @@
<span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</div>
</template>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"
:style="{ height: boxHeight + 'px' }">
<table border="0" cellspacing="1" cellpadding="0" class="busStatisticsTalbe" v-loading='loading'>
<tr>
<th class="w100">订单ID</th>
<th width="130">订车公司</th>
<th width="110">订车人</th>
<th width="110">团体名称</th>
<th width="110">开始日期</th>
<th width="110">行程天数</th>
<th width="110">人数</th>
<th width="110">用车类型</th>
<th width="110">总价</th>
<th width="110">申请人</th>
<th width="130">下单时间</th>
<th width="110">报价状态</th>
<!-- <th width="110">确认状态</th> -->
<th>操作</th>
</tr>
<tbody v-for="(item, index) in DataList" :key="index">
<tr>
<td>
{{ item.Id }}
</td>
<td>
{{ item.UseCompName }}
</td>
<td>
{{ item.UseName }}
</td>
<td>
{{ item.TeamName }}
</td>
<td>
{{ item.StartDate }}
</td>
<td>
{{ item.UseDayNum }}
</td>
<td>
{{ item.PeopleNum }}
</td>
<td>
{{ item.BusTypeName }}
</td>
<td>
{{ item.TotalPrice }}
</td>
<td>
{{ item.CustomerName }}
</td>
<td>
{{ item.CreateDate }}
</td>
<td>
{{ item.OfferStateName }}
</td>
<!-- <td>
<template v-if="item.SureId == 0">
<span style="color:red">待确认</span>
</template>
<template v-else>
<span style="color:red">已确认</span><br />
<span style="color:red">确认人:{{ item.SureByName }}</span><br />
<span style="color:red">确认时间:{{ item.SureTime }}</span>
</template>
</td> -->
<td>
<div class="link" style="display: flex;flex-flow: nowrap;">
<button class="normalBtn" type="primary" @click="clickCancel(item)">取消用车</button>
<button class="hollowFixedBtn" type="primary" @click="goUrl(item.Id)">编辑</button>
<button class="hollowFixedBtn" type="primary" @click="SetTripBusPrice(item, 2)">详情</button>
<button class="normalBtn" type="primary" v-if="item.OfferState == 1 && item.Status == 0" @click="SetTripBusPrice(item, 1)">报价</button>
<button class="normalBtn" type="primary" v-if="item.OfferState==4" @click="driver(item.Id)">添加司机车牌号</button>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<OrderList :pagesTitle="Title" :OrderList="DataList" v-loading="loading" @success="getList()"> </OrderList>
<!-- 详情 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
......@@ -375,8 +307,9 @@
</template>
<script>
import OrderList from './BookAcar/components/tripBusOrderList.vue';
export default {
props:['pagesTitle'],
props:['pagesTitle','OrderId'],
data() {
return {
Title: '',
......@@ -406,6 +339,8 @@
StartTime: "", //开始时间
EndTime: "", //结束时间
OfferState: "-1", //报价状态
OrderNo: '',
OrderId: '',
},
boxHeight: 0,
offsetwidth: 0,
......@@ -455,12 +390,15 @@
}
},
components: {
OrderList
},
watch: {
pagesTitle(val,oldval){
this.Title = val
}
},
OrderId(val,oldval){
this.msg.OrderId = val
},
},
methods: {
clickCancel(item){
......@@ -494,7 +432,7 @@
this.$router.push({
name: 'CharterAddEditVehicle',
query: {
Id: Id,
Id: Id?Id:0,
blank: "y",
tab: text
}
......@@ -519,11 +457,26 @@
},
getList() {
this.loading = true
// tripbus_GetErpTripBusPage
this.apipost('tripbus_GetTripBusPage', this.msg, res => {
let url
// 销售 OP
if(this.pagesTitle=='销售'){
url = "tripbus_GetSellTripBusPage"
}else{
url = "tripbus_GetErpTripBusPage"
}
this.apipost(url, this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
res.data.data.pageData.forEach(x=>{
x.Money = 0
x.totalMoney = 0
x.DetailList.forEach(y=>{
y.Money = y.UnitPrice+y.StopBusPrice+y.RoomPrice
x.Money +=y.Money
})
x.totalMoney += x.Money
})
this.DataList = res.data.data.pageData;
this.$forceUpdate();
} else {
......@@ -653,14 +606,12 @@
this.Title = this.pagesTitle
this.userInfo = this.getLocalStorage();
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
"-" +
parseInt(myDate.getMonth() + 1) +
"-" +
myDate.getDate();
let nowDate = myDate.getFullYear() +"-" + parseInt(myDate.getMonth() + 1)+"-" +myDate.getDate();
let today = new Date(myDate.getFullYear(), parseInt(myDate.getMonth()), myDate.getDate()+2)
let nowDate2 = this.$calendarUtils.formatDate(myDate.getFullYear(), parseInt(myDate.getMonth()) + 1, myDate.getDate()+28)
this.msg.StartTime = nowDate;
this.DataList=[nowDate]
this.msg.EndTime = nowDate2;
this.Datelist = [nowDate,nowDate2]
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 300;
this.boxHeight = height;
......
src/components/scenicSpot/Singleticket/SingleticketList.vue
View file @ 5adbfc5d
......@@ -33,7 +33,11 @@
display: flex;
justify-content: space-between;
}
.card-centent h6 {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.list-left h6,
.card-centent h6 {
font-size: 16px;
......
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