Skip to content

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

页面修改

parent 99084eea
Show whitespace changes
Inline Side-by-side
Showing with 1553 additions and 1520 deletions
index.html
View file @ e6bb6d93
......@@ -25,7 +25,6 @@
return _load
},
set: function set(v) {
//console.log(v.toString()),
eval("_load = " + v.toString().replace("maps.google.cn", "www.google.cn"))
}
});
......
src/components/Hotel/singleProduct/components/ListCar.vue
View file @ e6bb6d93
......@@ -198,7 +198,6 @@
crmOrderObj: {
handler: function (val, oldVal) {
this.crmOrderObj = val
console.log(this.crmOrderObj)
if(this.crmOrderObj){
this.parameters.LureEmpId = val.LureEmpId//引流id
this.parameters.CRMGuestId = val.CRMGuestId //客人ID
......
src/components/SalesVisa/VisaProductAddOrder.vue
View file @ e6bb6d93
......@@ -712,8 +712,6 @@
}, err => {})
},
saveVisa() { // 保存
console.log(this.addMsg,'===')
// return
this.$refs['addMsg'].validate((valid) => {
if (valid) {
this.apipost('dmc_get_visa_SetVisaOrder', this.addMsg, res => {
......
src/components/SingleAirTicket/components/TicketOrder.vue
View file @ e6bb6d93
<style scoped>
.TC_leftSearch>div{
.TC_leftSearch>div {
padding: 5px 0;
}
.groupTourOrderByTuan_ico{
.groupTourOrderByTuan_ico {
margin-left: 5px;
}
.groupTourOrderByTuan_ico>i{
.groupTourOrderByTuan_ico>i {
display: inline-block;
margin: 0 5px 0 0;
width: 8px;
......@@ -13,6 +15,7 @@
border-radius: 2px;
vertical-align: middle;
}
.HotelWorkList .has-gutter tr th,
.el-table th.is-leaf {
background-color: #EAEAEA !important;
......@@ -39,13 +42,14 @@
.HotelWorkList .HworkInput .el-input {
width: 210px;
}
/deep/.query-box li span>em{
/deep/.query-box li span>em {
min-width: 60px;
}
</style>
</style>
<template>
<template>
<div class="HotelWorkList" @click="showWarningSearch=false">
<div class="query-box HotelWorkInput" style="border-bottom: none;">
<ul>
......@@ -63,9 +67,7 @@
<em>业务员</em>
<el-select filterable v-model='msg.EnterID' class="w200">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
<el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
......@@ -76,9 +78,7 @@
<em>引流人</em>
<el-select filterable v-model='msg.CreateBy' class="w200">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
<el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
......@@ -89,10 +89,7 @@
<em>订单状态</em>
<el-select v-model='msg.OrderStatus' class="w200">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in OrderStatusList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
<el-option v-for='item in OrderStatusList' :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
......@@ -101,10 +98,7 @@
<span>
<em>收款状态</em>
<el-select v-model='msg.Q_IsCollect' class="w200">
<el-option v-for='item in QIsCollectList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
<el-option v-for='item in QIsCollectList' :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
......@@ -112,7 +106,8 @@
<li>
<span><em>{{$t('OrderList.search.orderNum')}}</em>
<el-input clearable type="" v-model="msg.OrderId" :placeholder="$t('OrderList.search.orderNum')" class="w200"/>
<el-input clearable type="" v-model="msg.OrderId" :placeholder="$t('OrderList.search.orderNum')"
class="w200" />
</span>
</li>
<!-- <li>
......@@ -122,19 +117,14 @@
</li> -->
<li>
<span><em>客人姓名</em>
<el-input clearable v-model="msg.GuestName" placeholder="客人姓名" class="w200"/>
<el-input clearable v-model="msg.GuestName" placeholder="客人姓名" class="w200" />
</span>
</li>
<li>
<span>
<em>报名时间</em>
<el-date-picker
style="height: 34px;"
value-format="yyyy-MM-dd"
v-model="DatelistBM"
type="daterange"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
<el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistBM" type="daterange"
:range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDatesBM">
</el-date-picker>
</span>
......@@ -142,21 +132,16 @@
<li>
<span>
<em>出发时间</em>
<el-date-picker
style="height: 34px;"
value-format="yyyy-MM-dd"
v-model="DatelistUse"
type="daterange"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
<el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistUse" type="daterange"
:range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDatesUse">
</el-date-picker>
</span>
</li>
<li>
<span>
<em @click.stop="showWarningSearch=true"
style="margin-top: 10px;cursor: pointer;"> 高级查询 <i class="el-icon-caret-bottom"></i></em>
<em @click.stop="showWarningSearch=true" style="margin-top: 10px;cursor: pointer;"> 高级查询 <i
class="el-icon-caret-bottom"></i></em>
<el-popover width="300" v-model="showWarningSearch" trigger="click">
<div>
<div class="TC_queryTitle">机票高级查询</div>
......@@ -167,9 +152,7 @@
<span>出票状态</span>
<el-select v-model='msg.TicketStatus' class="w150">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in ticketingStatusList'
:label='item.Name'
:value='item.Id'
<el-option v-for='item in ticketingStatusList' :label='item.Name' :value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
......@@ -177,23 +160,16 @@
<div>
<span>出签状态</span>
<el-select v-model='msg.VisaStatus' class="w150">
<el-option v-for='item in VisaList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
<el-option v-for='item in VisaList' :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</div>
<div>
<span>完结时间</span>
<el-date-picker
style="height: 34px;width: 210px;"
value-format="yyyy-MM-dd"
v-model="Datelist"
type="daterange"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDates">
<el-date-picker style="height: 34px;width: 210px;" value-format="yyyy-MM-dd" v-model="Datelist"
type="daterange" :range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')"
@change="getDates">
</el-date-picker>
</div>
<div>
......@@ -214,7 +190,8 @@
</li>
<li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click.stop="msg.pageIndex=1,currentPage=1,GetList()" />
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
@click.stop="msg.pageIndex=1,currentPage=1,GetList()" />
</li>
</ul>
</div>
......@@ -279,9 +256,12 @@
<span>{{$t('fnc.cwdjshuoming')}}</span>
</div>
<p>
<p><span class="groupTourOrderByTuan_ico"><i style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
<p><span class="groupTourOrderByTuan_ico"><i
style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i
style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i
style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</p>
</div>
</el-col>
......@@ -293,19 +273,23 @@
<span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</div> -->
<OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList>
<OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()">
</OrderList>
<div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div>
<el-pagination v-if="OrderList&&OrderList.length>0" background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
<el-pagination v-if="OrderList&&OrderList.length>0" background @current-change="handleCurrentChange"
:current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
</div>
</template>
<script>
</template>
<script>
import OrderList from './OrderList.vue';
export default {
props:['pagesTitle','dataObj'],
components: { OrderList },
props: ['pagesTitle', 'dataObj'],
components: {
OrderList
},
data() {
return {
showWarningSearch: false,
......@@ -337,7 +321,7 @@
OrderList: [],
//默认高度
tableHeight: 0,
msg:{
msg: {
pageIndex: 1,
pageSize: 15,
OrderId: "", //订单id
......@@ -346,7 +330,7 @@
StartCityName: "", //出发城市
EndCityName: "", //到达城市
EnterID: 0, //业务员id
CreateBy: 0,//引流人员
CreateBy: 0, //引流人员
TicketStatus: 0, //出票状态
VisaStatus: "0", //出签状态
OrderStatus: 0, //订单状态
......@@ -354,59 +338,99 @@
StartTime: "",
EndTime: "",
IsMyOrder: "1", //我的订单
FinishSTime: "",//完结开始时间
FinishETime: "",//完结结束时间
DepartSTime: "",//出发开始
DepartETime: "",//出发结束
FinishSTime: "", //完结开始时间
FinishETime: "", //完结结束时间
DepartSTime: "", //出发开始
DepartETime: "", //出发结束
},
total: 0,
currentPage: 1,
OrderStatusType:[
{Name: this.$t('OrderList.orderStatus.apply'),ID:'1'},
{Name: this.$t('OrderList.orderStatus.check'),ID:'2'},
{Name: this.$t('OrderList.orderStatus.cancel'),ID:'3'},
{Name: this.$t('OrderList.orderStatus.sun'),ID:'4'},
OrderStatusType: [{
Name: this.$t('OrderList.orderStatus.apply'),
ID: '1'
},
{
Name: this.$t('OrderList.orderStatus.check'),
ID: '2'
},
{
Name: this.$t('OrderList.orderStatus.cancel'),
ID: '3'
},
{
Name: this.$t('OrderList.orderStatus.sun'),
ID: '4'
},
],
OrderStateType:[
{Name: '接机',ID:'1'},
{Name: '送机',ID:'2'},
{Name: '包车',ID:'3'},
OrderStateType: [{
Name: '接机',
ID: '1'
},
{
Name: '送机',
ID: '2'
},
{
Name: '包车',
ID: '3'
},
],
orderType:[
{Name: this.$t('OrderList.orderType.tour'),ID:'1'},
{Name: this.$t('OrderList.orderType.guest'),ID:'2'},
orderType: [{
Name: this.$t('OrderList.orderType.tour'),
ID: '1'
},
{
Name: this.$t('OrderList.orderType.guest'),
ID: '2'
},
],
Datelist:'',
DatelistUse:'',
Datelist: '',
DatelistUse: '',
DatelistBM: [],
Title:'',
EmployeeList:[],
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
Title: '',
EmployeeList: [],
employeeMsg: { // 员工
GroupId: '',
BranchId: -1,
DepartmentId: 0,
PostId: 0,
IsLeave: 0,
},
OrderStatusList: [],
QIsCollectList: [
{ Name: "不限", Id: "0" },
{ Name: "已收齐", Id: "1" },
{ Name: "未收齐", Id: "2" },
QIsCollectList: [{
Name: "不限",
Id: "0"
},
{
Name: "已收齐",
Id: "1"
},
{
Name: "未收齐",
Id: "2"
},
],
ticketingStatusList: [],
VisaList: [
{ Name: "不限", Id: "0" },
{ Name: "未出签", Id: "1" },
{ Name: "已出签", Id: "2" },
VisaList: [{
Name: "不限",
Id: "0"
},
{
Name: "未出签",
Id: "1"
},
{
Name: "已出签",
Id: "2"
},
],
};
},
watch: {
pagesTitle(val,oldval){
pagesTitle(val, oldval) {
this.Title = val
},
dataObj:{
dataObj: {
handler(val, oldVal) {
this.msg.OrderType = val.tab
this.msg.OrderId = val.OrderId
......@@ -438,34 +462,37 @@
},
getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
getDatesBM(){
if(this.DatelistBM){
getDatesBM() {
if (this.DatelistBM) {
this.msg.StartTime = this.DatelistBM[0]
this.msg.EndTime = this.DatelistBM[1]
}if(!this.DatelistBM){
}
if (!this.DatelistBM) {
this.msg.StartTime = ''
this.msg.EndTime = ''
}
},
getDatesUse(){
if(this.DatelistUse){
getDatesUse() {
if (this.DatelistUse) {
this.msg.DepartSTime = this.DatelistUse[0]
this.msg.DepartETime = this.DatelistUse[1]
}if(!this.DatelistUse){
}
if (!this.DatelistUse) {
this.msg.DepartSTime = ''
this.msg.DepartETime = ''
}
},
getDates(){
if(this.Datelist){
getDates() {
if (this.Datelist) {
this.msg.FinishSTime = this.Datelist[0]
this.msg.FinishETime = this.Datelist[1]
}if(!this.Datelist){
}
if (!this.Datelist) {
this.msg.FinishSTime = ''
this.msg.FinishETime = ''
}
......@@ -481,24 +508,24 @@
d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d);
return d.toLocaleDateString().match(/\d+/g).join('-')
},
getyMDOne(){
getyMDOne() {
let myDate = new Date()
let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????)
let myMonth = myDate.getMonth()+ 1;//获取当前月份(0-11,8代表1月)
let myYear = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
let myMonth = myDate.getMonth() + 1; //获取当前月份(0-11,8代表1月)
let myToday = myDate.getDate(); //获取当前日(1-31)
myMonth = myMonth > 9 ? myMonth : '0'+ myMonth
myToday = myToday > 9 ? myToday : '0'+ myToday
let nowDate = myYear +'-'+ myMonth +'-01'
myMonth = myMonth > 9 ? myMonth : '0' + myMonth
myToday = myToday > 9 ? myToday : '0' + myToday
let nowDate = myYear + '-' + myMonth + '-01'
return nowDate
},
getyMDTwo(){
getyMDTwo() {
let myDate = new Date()
let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????)
let myMonth = myDate.getMonth()+ 1;//获取当前月份(0-11,8代表1月)
let myYear = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
let myMonth = myDate.getMonth() + 1; //获取当前月份(0-11,8代表1月)
let myToday = myDate.getDate(); //获取当前日(1-31)
myMonth = myMonth > 9 ? myMonth : '0'+ myMonth
myToday = myToday > 9 ? myToday : '0'+ myToday
let nowDate = myYear +'-'+ myMonth +'-'+ myToday
myMonth = myMonth > 9 ? myMonth : '0' + myMonth
myToday = myToday > 9 ? myToday : '0' + myToday
let nowDate = myYear + '-' + myMonth + '-' + myToday
return nowDate
},
//获取酒店订单列表
......@@ -506,17 +533,16 @@
this.loading = true
let url = "/api/Order/GetGuestOrderStatisticsPageList"
// 销售 OP
if(this.pagesTitle=='销售'){
if (this.pagesTitle == '销售') {
this.msg.IsMyOrder = '1'
}else{
} else {
this.msg.IsMyOrder = '0'
}
this.crmapipost(url, this.msg,
res => {
if (res.data.resultCode == 1) {
// console.log(res.data,'-----')
let data = res.data.data.Data.pageData
let addList = function(arr) {
let addList = function (arr) {
arr.forEach((item) => {
item.More = "";
item.actuallyReceived = false;
......@@ -524,16 +550,14 @@
item.selectedType = "";
item.checkList = [];
item.MultipleChoiceList = [];
item.MoreList = [
{
item.MoreList = [{
Name: "取消订单",
Id: "1",
show:
item.OrderStatus != 2 &&
show: item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6
? true
: false,
item.OrderStatus != 6 ?
true :
false,
},
{
Name: "订单转交",
......@@ -543,53 +567,48 @@
{
Name: "修改订单金额",
Id: "3",
show:
item.OrderStatus != 2 &&
show: item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
(item.TicketStatus == 1 || item.VisaStatus == 1)
? true
: false,
(item.TicketStatus == 1 || item.VisaStatus == 1) ?
true :
false,
},
{
Name: "修改出票状态",
Id: "4",
show:
item.OrderStatus != 2 &&
show: item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
item.TicketStatus < 3
? true
: false,
item.TicketStatus < 3 ?
true :
false,
},
{
Name: "修改出签状态",
Id: "5",
show:
item.OrderStatus != 2 &&
show: item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
item.VisaStatus == 1
? true
: false,
item.VisaStatus == 1 ?
true :
false,
},
{
Name: "订单收损",
Id: "8",
show:
item.OrderStatus != 2 &&
item.OrderStatus != 6
? true
: false,
show: item.OrderStatus != 2 &&
item.OrderStatus != 6 ?
true :
false,
},
{
Name: "收损完结",
Id: "9",
show:
(item.OrderStatus == 3 || item.OrderStatus == 4) &&
item.DueinMoney == 0
? true
: false,
show: (item.OrderStatus == 3 || item.OrderStatus == 4) &&
item.DueinMoney == 0 ?
true :
false,
},
{
Name: '订单完结',
......@@ -605,7 +624,7 @@
{
Name: "修改日期",
Id: "10",
show: item.OrderType&&item.OrderType.indexOf(1) != -1?true:false,
show: item.OrderType && item.OrderType.indexOf(1) != -1 ? true : false,
}
];
});
......@@ -640,12 +659,14 @@
this.OrderList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count;
this.TotalMsg = res.data.data.StatModel
}else {
} else {
this.Error(res.data.message);
}
this.loading = false
},
err => {this.loading = false}
err => {
this.loading = false
}
);
},
handleCurrentChange(val) {
......@@ -664,21 +685,21 @@
},
},
created() {
if(this.$route.query.OrderId){
this.msg.OrderId=this.$route.query.OrderId
if (this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId
}
let userInfo=this.getLocalStorage();
let userInfo = this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID
// this.msg.EnterID = userInfo.EmployeeId;
},
mounted() {
this.Title = this.pagesTitle
if(this.Title!='销售'){
if (this.Title != '销售') {
this.getEmployee()
}
this.msg.StartTime = this.getBeforeDate(31, new Date())
this.msg.EndTime = this.$calendarUtils.formatDate(new Date(), "YYYY-MM-dd", 0)
this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
this.DatelistBM = [new Date(this.msg.StartTime), new Date()]
this.GetOrderStatusEnumList()
this.GetTicketStatusEnumList()
this.Datelist = this.getyMDOne()
......@@ -693,8 +714,8 @@
},
};
</script>
</script>
<style>
<style>
</style>
</style>
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ e6bb6d93
......@@ -75,7 +75,7 @@
<td width="80" class="txtRightCost">线路</td>
<td>
<el-select style="width:100%" v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList(postConfig.LineId,1)" filterable>
@change="changeLine()" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
......@@ -124,7 +124,7 @@
<tr>
<td width="80" class="txtRightCost">出团公司</td>
<td>
<el-select class=" multiple_input" v-model="postConfig.OutBranchId" filterable>
<el-select class="multiple_input" v-model="postConfig.OutBranchId" filterable>
<el-option v-for='item in companyList' :key="item.id" :label="item.bName" :value="item.id">
</el-option>
</el-select>
......@@ -136,7 +136,7 @@
</td>
<td width="80" class="txtRightCost">出团类型</td>
<td>
<el-select class=" multiple_input" v-model="postConfig.TeamType" filterable>
<el-select class="multiple_input" v-model="postConfig.TeamType" filterable>
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
......@@ -1113,8 +1113,9 @@
<tr>
<td class="CP_ComTitle2">附件</td>
<td colspan="13">
<el-upload v-if="!teamPrice.ContractArray || !teamPrice.ContractArray.length" class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
:http-request="uploadFileBtn" :show-file-list="false" action="">
<el-upload v-if="!teamPrice.ContractArray || !teamPrice.ContractArray.length" class="upload-demo"
style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
:show-file-list="false" action="">
<el-button size="small" type="primary">报价单附件</el-button>
</el-upload>
<template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
......@@ -1475,6 +1476,18 @@
// this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
return totalMoney;
},
//线路切换
changeLine() {
this.getLineTeamList(this.postConfig.LineId, 1);
//欧洲线(2)和韩国线(5)默认小包团(1)
if (this.postConfig.LineId == 2 || this.postConfig.LineId == 5) {
this.postConfig.TeamType = 1;
}
else
{
this.postConfig.TeamType=0;
}
},
//获取系列列表
getLineTeamList(lineId, isClear) {
if (isClear && isClear == 1) {
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ e6bb6d93
......@@ -423,7 +423,6 @@
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
let userInfo = this.getLocalStorage();
// console.log('userInfo', userInfo)
this.queryData.CreateBy = userInfo.EmployeeId
let msg = {
GroupId: userInfo.RB_Group_id,
......
src/components/TravelManager/TravelTeam/editTeamInfo.vue
View file @ e6bb6d93
......@@ -728,9 +728,7 @@
that.selectFilghtList.push(x);
});
that.selectFilghtList.forEach(y => {
if (y.AirticketId == that.editForm.TicketId) {
console.log("1111");
y.IsSelected = true;
y.BindNum = that.editForm.TicketNum;
that.TicketMsg = y.AlName + "/" + y.FlightDate;
......@@ -832,7 +830,6 @@
if (tempObj.TravelTeamPartnerList && tempObj.TravelTeamPartnerList.length > 0) {
this.friendList = tempObj.TravelTeamPartnerList;
}
console.log('flightList>>>', this.addMsg.flightList)
} else {
this.Error(res.data.message);
}
......
src/components/TravelManager/TravelTeam/travelPayList.vue
View file @ e6bb6d93
......@@ -165,7 +165,6 @@
},
},
mounted() {
console.log('mounted', this.$route)
this.queryMsg.TCID = this.$route.query.id
this.getTravelTeamList();
},
......
src/components/myOrdersAllType/components/OrderList.vue
View file @ e6bb6d93
<template>
<el-table
border
ref="multipleTable"
:data="OrderList"
style="width: 100%"
:default-sort = "{prop: 'Money', order: 'null'}"
<template>
<el-table border ref="multipleTable" :data="OrderList" style="width: 100%"
:default-sort="{prop: 'Money', order: 'null'}"
:sort-by="['Money','Income','PreferTipAmount','PlatformTax','Refund','CostMoney','DueInMoney']">
<el-table-column
width="200"
prop="CreateTimeStr"
label="订单Id"
show-overflow-tooltip>
<el-table-column width="200" prop="CreateTimeStr" label="订单Id" show-overflow-tooltip>
<template slot-scope="scope">
<div>
<p class="cursor-pointer c059FF6 fz18 row-c" @click="goDetails(scope.row)"><el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag><span>{{scope.row.OrderId}}</span> </p>
<p class="cursor-pointer c059FF6 fz18 row-c" @click="goDetails(scope.row)">
<el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag>
<span>{{scope.row.OrderId}}</span>
</p>
<p>{{scope.row.CreateTimeStr}}</p>
</div>
</template>
</el-table-column>
<el-table-column
width="200"
prop="CreateTimeStr"
label="团号"
show-overflow-tooltip>
<el-table-column width="200" prop="CreateTimeStr" label="团号" show-overflow-tooltip>
<template slot-scope="scope">
<div>
<p class=" fz14"
:class="{'cursor-pointer c059FF6':scope.row.OrderType==2}"
<p class=" fz14" :class="{'cursor-pointer c059FF6':scope.row.OrderType==2}"
@click="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}</p>
<p>出发日期：{{scope.row.StartDate}}</p>
</div>
</template>
</el-table-column>
<el-table-column
label="客人"
show-overflow-tooltip>
<el-table-column label="客人" show-overflow-tooltip>
<template slot-scope="scope">
<span :class="{'colorblue font-color-link':pagesTitle!='详情'}" @click="pagesTitle!='详情'?openNameDetails(scope.row):''">
<span :class="{'colorblue font-color-link':pagesTitle!='详情'}"
@click="pagesTitle!='详情'?openNameDetails(scope.row):''">
{{scope.row.GuestName}}
</span>
</template>
</el-table-column>
<el-table-column
prop="SaleName"
label="销售"
show-overflow-tooltip>
<el-table-column prop="SaleName" label="销售" show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="LureEmpName"
label="引流"
show-overflow-tooltip>
<el-table-column prop="LureEmpName" label="引流" show-overflow-tooltip>
</el-table-column>
<el-table-column
label="商品名称"
show-overflow-tooltip>
<el-table-column label="商品名称" show-overflow-tooltip>
<template slot-scope="scope">
<div style="max-width: 100px;overflow: hidden;text-overflow: ellipsis">{{scope.row.Name}}</div>
</template>
</el-table-column>
<el-table-column
label="商品详情"
show-overflow-tooltip>
<el-table-column label="商品详情" show-overflow-tooltip>
<template slot-scope="scope">
<div style="max-width: 100px;overflow: hidden;text-overflow: ellipsis">{{scope.row.Description}}</div>
</template>
</el-table-column>
<el-table-column
sortable
prop="Money"
label="总金额"
show-overflow-tooltip min-width="100">
<el-table-column sortable prop="Money" label="总金额" show-overflow-tooltip min-width="100">
<template slot-scope="scope">
{{scope.row.Money}}&ensp;({{scope.row.CurrencyName}})
</template>
</el-table-column>
<el-table-column
sortable
prop="Income"
label="实收"
show-overflow-tooltip>
<el-table-column sortable prop="Income" label="实收" show-overflow-tooltip>
</el-table-column>
<el-table-column
sortable
prop="PreferTipAmount"
label="人头小费"
show-overflow-tooltip min-width="101">
<el-table-column sortable prop="PreferTipAmount" label="人头小费" show-overflow-tooltip min-width="101">
</el-table-column>
<el-table-column
sortable
prop="PlatformTax"
label="手续费"
show-overflow-tooltip min-width="100">
<el-table-column sortable prop="PlatformTax" label="手续费" show-overflow-tooltip min-width="100">
</el-table-column>
<el-table-column
sortable
prop="Refund"
label="退款"
show-overflow-tooltip>
<el-table-column sortable prop="Refund" label="退款" show-overflow-tooltip>
</el-table-column>
<el-table-column
sortable
prop="CostMoney"
label="成本"
show-overflow-tooltip>
<el-table-column sortable prop="CostMoney" label="成本" show-overflow-tooltip>
</el-table-column>
<el-table-column
sortable
prop="DueInMoney"
label="待收"
show-overflow-tooltip>
<el-table-column sortable prop="DueInMoney" label="待收" show-overflow-tooltip>
<template slot-scope="scope">
<span :class="{'red':scope.row.DueInMoney>0}">{{scope.row.DueInMoney}}</span>
</template>
</el-table-column>
<el-table-column
sortable
prop="DiscountsMoney"
label="优惠"
show-overflow-tooltip>
<el-table-column sortable prop="DiscountsMoney" label="优惠" show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="StateName"
label="状态"
show-overflow-tooltip>
<el-table-column prop="StateName" label="状态" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{scope.row.StateName}}</span>
</template>
......@@ -137,17 +80,19 @@
</template>
</el-table-column> -->
</el-table>
</template>
<script>
</template>
<script>
import offset from '../../public/offset.vue';
export default {
components: { offset },
props: ["OrderList","pagesTitle"],
components: {
offset
},
props: ["OrderList", "pagesTitle"],
data() {
return {
S_CheckBranchOrder: false,
S_CheckAllOrder: false,
queryObj:null,
queryObj: null,
cdState: false,
copyId: 0,
loading0: false,
......@@ -166,7 +111,7 @@
msg: {
OrderId: "",
LossMoney: 0,
State: '',//状态 1确认 2已邮寄 3设置自提 4收损
State: '', //状态 1确认 2已邮寄 3设置自提 4收损
SelffetchAddress: ''
},
msgParameter: {
......@@ -174,18 +119,18 @@
OrderId: 0,
Money: 0.0,
Remark: '',
MailingState: '1',//邮寄状态 1自取 2邮寄
MailingAddress: '',//MailingState =2 填写邮寄
UseDate:'',//门票日期
Name:'',
EName:'',
Sex: '1',//1男2女
MailingState: '1', //邮寄状态 1自取 2邮寄
MailingAddress: '', //MailingState =2 填写邮寄
UseDate: '', //门票日期
Name: '',
EName: '',
Sex: '1', //1男2女
Birthday: '',
Mobile:'',
CouponsId:'',//景点id
DetailList:[],
Mobile: '',
CouponsId: '', //景点id
DetailList: [],
},
rules2:{
rules2: {
Name: [{
required: true,
message: '请输入中文名',
......@@ -196,8 +141,11 @@
message: '请输入英文名',
trigger: 'blur'
}],
Mobile: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
Mobile: [{
required: true,
message: "请输入联系电话",
trigger: "blur"
},
{
pattern: this.$commonUtils.Regex.el_ISphone,
message: "请输入正确的电话"
......@@ -211,41 +159,46 @@
},
outerVisible: false,
rules: {
State: [
{
State: [{
required: true,
message: "请选择订单状态",
trigger: "change"
}
],
SelffetchAddress: [
{
}],
SelffetchAddress: [{
required: true,
message: "请输入自提地址",
trigger: "blur"
}
],
LossMoney: [
{
}],
LossMoney: [{
required: true,
message: "请输入收损金额",
trigger: "blur"
}
]
}]
},
cancelOrderDialog: false,
cancelRemark: "",
cancelOrderId:0,
cancelOrderId: 0,
uploadOrderId: 0,
loading: false,
fileList:[],
fileList: [],
GuestFile: '',
ChangeOrderDialog: false,
OrderStatusType:[
{Name: this.$t('OrderList.orderStatus.apply'),ID:'1'},
{Name: this.$t('OrderList.orderStatus.check'),ID:'2'},
{Name: this.$t('OrderList.orderStatus.cancel'),ID:'3'},
{Name: this.$t('OrderList.orderStatus.sun'),ID:'4'},
OrderStatusType: [{
Name: this.$t('OrderList.orderStatus.apply'),
ID: '1'
},
{
Name: this.$t('OrderList.orderStatus.check'),
ID: '2'
},
{
Name: this.$t('OrderList.orderStatus.cancel'),
ID: '3'
},
{
Name: this.$t('OrderList.orderStatus.sun'),
ID: '4'
},
],
items: null,
typeState: '',
......@@ -253,21 +206,21 @@
};
},
watch: {
pagesTitle(val,oldval){
pagesTitle(val, oldval) {
this.Title = val
},
OrderList:{
handler(val, oldVal){
OrderList: {
handler(val, oldVal) {
}
}
},
methods: {
goTuanDetails(row){
goTuanDetails(row) {
let name = ''
if(row.IsOneDayOrder==1){
if (row.IsOneDayOrder == 1) {
name = 'groupTourOrderByTuanOne'
}else{
} else {
name = 'groupTourOrderByTuan'
}
this.$router.push({
......@@ -279,8 +232,7 @@
}
});
},
goDetails(row){
console.log(this.pagesTitle,this.S_CheckBranchOrder,this.S_CheckAllOrder)
goDetails(row) {
let data = [{
path: "",
OrderId: row.OrderId,
......@@ -291,54 +243,50 @@
if (row.OrderType == 1) {
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) {
data[0].path = 'myCustomerOrderAllType'
}else{
} else {
data[0].path = 'customerOrderAllType'
}
href = url+'automaticLogin?token='+this.getLocalStorage().token+'&data=' + JSON.stringify(data)
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href);
}else{
} else {
let name = ''
if (row.OrderType == 6) {
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) {
name = 'VisaProductEditOrder'
}else{
} else {
name = 'VisaProductEditOrderOP'
}
this.$router.push({
name: name,
});
}else if (row.OrderType == 2) {//跟团 一日游
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
if(row.TravelType==1){
} else if (row.OrderType == 2) { //跟团 一日游
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) {
if (row.TravelType == 1) {
name = 'groupTourOrder'
}else{
} else {
name = 'groupTourOrderOne'
}
}else{
} else {
name = 'enrollTotal'
}
}
else if (row.OrderType == 3) {//酒店
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
} else if (row.OrderType == 3) { //酒店
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) {
name = 'singleProductHotelOrder'
}else{
} else {
name = 'singleProductHotelOrderOP'
}
}
else if (row.OrderType == 4) {//门票
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
} else if (row.OrderType == 4) { //门票
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) {
name = 'SingleticketOrderList'
}else{
} else {
name = 'SingleticketOrderListOP'
}
}
else if (row.OrderType == 5) {//包车
this.GetAdminCarOrderPageList(row,url,href,data)
}
else if (row.OrderType == 7) {//jalan酒店
} else if (row.OrderType == 5) { //包车
this.GetAdminCarOrderPageList(row, url, href, data)
} else if (row.OrderType == 7) { //jalan酒店
this.$message.info('jalan酒店暂不支持查看')
// if(this.pagesTitle=='销售'){
// name = 'CharterOrderList'
......@@ -346,7 +294,7 @@
// name = 'CharterOrderListOP'
// }
}
if(name){
if (name) {
this.$router.push({
name: name,
query: {
......@@ -358,7 +306,7 @@
}
},
GetAdminCarOrderPageList(row,url,href,data){
GetAdminCarOrderPageList(row, url, href, data) {
let msg = {
pageIndex: 1,
pageSize: 5,
......@@ -373,28 +321,28 @@
OrderSTime: '',
OrderETime: '',
ProductName: '',
Mobile: '',//电话
Mobile: '', //电话
IsSelectSale: 1,
EnterID: 0,//业务员
EnterID: 0, //业务员
}
let name
this.apipost('CarSingle_post_GetAdminCarOrderPageList', msg, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData
let OrderType
if(pageData&&pageData.length>0){
if (pageData && pageData.length > 0) {
OrderType = pageData[0].OrderType
}
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) {
name = 'CharterOrderList'
}else{
} else {
name = 'CharterOrderListOP'
}
this.$router.push({
name: name,
query: {
OrderId: row.OrderId,
OrderType: OrderType?OrderType:4,
OrderType: OrderType ? OrderType : 4,
blank: "y",
}
});
......@@ -408,75 +356,94 @@
let ActionMenuCode = userInfo.ActionMenuCode;
this.userInfo = this.getLocalStorage();
// 判断是否销售
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 ){
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1) {
this.S_CheckBranchOrder = true
}if (ActionMenuCode.indexOf('S_CheckAllOrder') != -1 ){
}
if (ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
this.S_CheckAllOrder = true
}
}
};
</script>
<style scoped>
</script>
<style scoped>
.row {
display: flex;
}
.row-c {
display: flex;
align-items: center;
}
.column {
display: flex;
flex-direction: column;
}
.column-jac {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.column-ac {
display: flex;
flex-direction: column;
align-items: center;
}
.wrap {
flex-wrap: wrap;
}
.justify-sb {
justify-content: space-between;
}
.justify-c {
justify-content: center;
}
.justify-e {
justify-content: flex-end;
align-items: flex-end;
}
.flex-g {
flex-grow: 1;
}
.flex-s {
flex-shrink: 0;
}
.align-c {
align-items: center;
}
.cblack {
color: black;
}
.cf {
color: #ffffff;
}
.c9e {
color: #9e9e9e;
}
.c20C997 {
color: #20c997;
}
.c02C854 {
color: #02c854;
}
.cff9800 {
color: #ff9800;
}
......@@ -484,170 +451,223 @@
.cF1416C {
color: #f1416c;
}
.cF57A98 {
color: #f57a98;
}
.c04C8C8 {
color: #04c8c8;
}
.c059FF6 {
color: #059ff6;
}
.c3FC4FF {
color: #3fc4ff;
}
.fz10 {
font-size: 10px;
}
.fz11 {
font-size: 11px;
}
.fz12 {
font-size: 12px;
}
.fz13 {
font-size: 13px;
}
.fz14 {
font-size: 14px;
}
.fz15 {
font-size: 15px;
}
.fz16 {
font-size: 16px;
}
.fz17 {
font-size: 17px;
}
.fz18 {
font-size: 18px;
}
.fbold {
font-weight: bold;
}
.ml {
margin-left: 10px;
}
.mr {
margin-right: 10px;
}
.mt {
margin-top: 10px;
}
.mt20 {
margin-top: 20px;
}
.mb {
margin-bottom: 10px;
}
.mb20 {
margin-bottom: 20px;
}
.mx {
margin-left: 10px;
margin-right: 10px;
}
.mx5 {
margin-left: 5px;
margin-right: 5px;
}
.mb5 {
margin-bottom: 5px;
}
.py {
padding: 15px 0;
}
.py5 {
padding: 5px 0;
}
.px5 {
padding: 0 5px;
}
.px15 {
padding: 0 15px;
}
.pa15 {
padding: 15px;
}
.py20 {
padding: 20px 0;
}
.pb5 {
padding: 0 0 5px 0;
}
.pa {
padding: 10px 20px;
}
.pa20 {
padding: 20px;
}
.pt20 {
padding: 20px 0;
}
.borderD {
border-bottom: 1px dashed #dddddd;
}
.bgf {
background: #ffffff;
}
.bgf5 {
background: #f5f5f5;
}
.bgE8F5E9 {
background: #e8f5e9;
}
.bgD9F3FF {
background: #d9f3ff;
}
.bgFAEAED {
background: #faeaed;
}
.bj {
background: #ffffff;
}
.bjFFF3E0 {
background: #FFF3E0;
}
.radius5 {
border-radius: 5px;
}
.cursor-pointer {
cursor: pointer;
}
.relative {
position: relative;
}
.absolute {
position: absolute;
}
.left0 {
left: 0;
}
.right0 {
right: 0;
}
.top0 {
top: 0;
}
.bottom0 {
bottom: 0;
}
.left20 {
left: 020px;
}
.right20 {
right: 20px;
}
.top20 {
top: 20px;
}
.bottom20 {
bottom: 20px;
}
.text-center {
text-align: center;
}
</style>
</style>
src/components/newTravelmanager/TravelGroupControl/TravelPriceFlightList.vue
View file @ e6bb6d93
......@@ -353,7 +353,6 @@
},
//保存航班信息
savePriceFlight(item) {
console.log('保存航班信息', item)
if(!/([0|1][0-9])|(2[0|1|2|3]):[0|1|2|3|4|5][0-9]/.test(item.DepartureTime)) {
this.$message.error('起飞时间格式不对, 格式如02:06, 23:00')
return
......
src/components/orderCommon/order-form.vue
View file @ e6bb6d93
......@@ -10,9 +10,11 @@
border-top: 3px solid #38425d;
background-color: #ffffff;
padding: 10px 10px 0;
width: 100%;padding:20px 20px 10px 80px;
width: 100%;
padding: 20px 20px 10px 80px;
}
.title {
.title {
border-left: 3px solid #e95252;
text-indent: 15px;
height: 16px;
......@@ -21,7 +23,8 @@
margin-bottom: 20px;
line-height: 14px;
color: #000;
}
}
</style>
<template>
<div class="commonOrderForm">
......@@ -160,8 +163,7 @@
</el-col>
<el-col :span="4">
<el-form-item :label="$t('salesModule.TeamPrice')" prop="TC_Price">
<el-input v-if="addMsg.GroupType != 4" v-model="addMsg.TC_Price"
:disabled="pagesTitle=='跟团游产品'?false:true"
<el-input v-if="addMsg.GroupType != 4" v-model="addMsg.TC_Price" :disabled="pagesTitle=='跟团游产品'?false:true"
@input="getTotalPrice()">
</el-input>
<el-input v-else v-model="SingleDMCPricex" :disabled="true" @input="getTotalPrice()"></el-input>
......@@ -262,10 +264,15 @@
</template>
<template v-if="pagesTitle=='当地游产品'">
<el-col :span="4">
<p v-if='priceObj.IsSupportChildren==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">{{$t('salesModule.NoSupplier')}}!</p>
<el-form-item v-if='priceObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'" :label="$t('salesModule.ChildNum')" prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童人数");' @change="getNumGuest"></el-input>
<p v-if='priceObj.IsSupportChildren==2'
style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
{{$t('salesModule.NoSupplier')}}!</p>
<el-form-item v-if='priceObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'"
:label="$t('salesModule.ChildNum')" prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNum' :disabled="addMsg.GroupType==='4'"
@keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童人数");'
@change="getNumGuest"></el-input>
</el-form-item>
</el-col>
</template>
......@@ -407,7 +414,8 @@
<el-form-item :label="$t('salesModule.ScenicRefund')">
<el-select filterable multiple class="multiple_input" v-model="addMsg.ScenicRefundArr"
:placeholder="$t('pub.pleaseSel')" @change="ScenicRefundMethods">
<el-option v-for="(item,index) in ScenicRefundList" :label="item.ScenicName" :value="item.Id" :key="index">
<el-option v-for="(item,index) in ScenicRefundList" :label="item.ScenicName" :value="item.Id"
:key="index">
</el-option>
</el-select>
</el-form-item>
......@@ -496,8 +504,8 @@
//团期编号，订单编号(新增传0),下单人选择的公司
props: [
'showCity',
'PTCID',//团期编号(必须传),
'POrderId',//订单编号(新增传0)
'PTCID', //团期编号(必须传),
'POrderId', //订单编号(新增传0)
'PBranchId', //销售公司/联运公司
'PProductType', //产品类型(1-常规团，2-包机团)
'productObj',
......@@ -1048,7 +1056,7 @@
},
(res) => {
if (res.data.resultCode == 1) {
this.minPrice = res.data.data&&res.data.data.LowDeposit;
this.minPrice = res.data.data && res.data.data.LowDeposit;
}
},
);
......@@ -1068,7 +1076,7 @@
},
//计算少价金额
getTypePrice() {
if(this.pagesTitle=='当地游产品'){
if (this.pagesTitle == '当地游产品') {
this.addMsg.ContactName = ''
this.addMsg.ContactMobile = ''
}
......@@ -1405,7 +1413,7 @@
qz: "",
qzf: "",
}
if(this.pagesTitle=='当地游产品'){
if (this.pagesTitle == '当地游产品') {
this.addMsg.GroupType = "1"
}
this.clientSourceList = [];
......@@ -1518,9 +1526,9 @@
this.addMsg.IsChildrenTour = this.priceObj.IsSupportChildren;
this.addMsg.IsBirdDiscount = this.priceObj.IsBirdDiscount;
let url
if(this.PProductType==1){
if (this.PProductType == 1) {
url = 'sellorder_post_SetOrderInfo_02'
}else if(this.PProductType==2){
} else if (this.PProductType == 2) {
url = 'sellorder_post_SetTravelTeamOrderForB2B' //团下单接口sellorder_post_SetOrderInfoForB2B
}
this.apipost(url,
......@@ -1675,11 +1683,10 @@
"sellorder_get_GetSellClientTypeEnumList", {},
(res) => {
if (res.data.resultCode == 1) {
if(this.showCity) {
if (this.showCity) {
this.customerTypeList = res.data.data;
} else {
this.customerTypeList = res.data.data.filter(item => item.Id < 3);
console.log('this.customerTypeList', this.customerTypeList)
}
}
},
......@@ -1807,8 +1814,8 @@
this.getTradeWay();
},
watch: {
productObj:{
handler(oldValue, newVal){
productObj: {
handler(oldValue, newVal) {
this.clearMsg();
this.getTravelPirceInfo()
this.addMsg.DepartureCityId = oldValue.StartCityID
......@@ -1816,7 +1823,7 @@
this.addMsg.GoCityTime = this.starTime = oldValue.StartCityTime;
this.addMsg.BackCityTime = this.endTime = oldValue.BackCityTime;
this.priceObj = JSON.parse(JSON.stringify(oldValue))
if(this.pagesTitle=='当地游产品'){
if (this.pagesTitle == '当地游产品') {
let str = ''
if (oldValue.OtherPrice > 0) {
str += '杂费' + oldValue.OtherPrice + '/人;'
......@@ -1844,4 +1851,5 @@
}
}
};
</script>
src/components/platformModule/menuManagement.vue
View file @ e6bb6d93
......@@ -363,14 +363,10 @@
this.addMsg.menutype = updateList.MenuType?updateList.MenuType:1
this.addMsg.MenuStatus = updateList.MenuStatus.toString()
let style = JSON.parse(updateList.MenuStyle)
// this.addMsg.MenuStyleIcon = style.icon
console.log(updateList.MenuType,'----')
this.addMsg.MenuStyleIcon = style.icon
this.addMsg.MenuStyleColor = style.color
this.currentUpdateIndex = index
}, err => {})
this.getChildMenu();
if (this.addMsg.MenuStyle && this.addMsg.MenuStyle != "") {
let style = JSON.parse(this.DataList[index].MenuStyle)
......
src/components/scenicSpot/scenicSpotPackagePrice.vue
View file @ e6bb6d93
......@@ -786,7 +786,7 @@ export default {
}
},
e=>{
console.log(e.message)
}
);
},
......
src/pubComponents/buyGroup.vue
View file @ e6bb6d93
......@@ -1374,7 +1374,6 @@
},
// 计算价格
getTotalPrice(t) {
console.log('getTotalPrice', this.addObj)
if (t === 3) {
if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
this.$message.error("请输入正确的价格！");
......@@ -1525,18 +1524,6 @@
dandijie =
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
console.log('this.addObj.OtherPrice', this.addObj.OtherPrice, (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)),this.addObj.VisaPrice,(Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)),(Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum) -
Number(this.addMsg.VisaNum)))
this.addMsg.PreferPrice =
dandijie +
lianyun +
......@@ -1689,12 +1676,10 @@
},
saveOrder() {
this.addMsg.TCID = this.addObj.TCID
console.log('saveOrder', this.addMsg)
this.$emit('change', this.addMsg)
},
// todo 购买的产品信息，需要从外部传入
goBuy(obj) {
console.log('goBuy', obj)
if(!obj) return
this.isUpdateSharePeople = false;
this.isShowLayer = true;
......
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