Skip to content

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

样式修改

parent c04c6242
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 89 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 30c21471
......@@ -95,7 +95,14 @@
.TC_HotelPop table th {
text-align: center;
}
.TC_CarNum{
padding: 5px 10px;
background: #5151f5;
color:#fff;
font-size:12px;
display: inline-block;
border-radius: 5px;
}
</style>
<template>
<div class="TC_Content">
......@@ -398,7 +405,8 @@
<span v-if="item.Status==5" title="结团审核中" style="background: rgb(0 128 255);">审核中</span>
<span v-if="item.Status==1" title="销售">{{$t('visaT.sale')}}</span>
<span v-if="item.GroupRecommendType==1" title="精品">精</span>
<label style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">{{item.PriceTeamTypeName}}</label>
<label
style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">{{item.PriceTeamTypeName}}</label>
</div>
<div class="TCL-OutBranchName" title="销售公司">{{item.UnionBranchName}}</div>
<div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
......@@ -417,6 +425,11 @@
<span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span>
<span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
</div>
<div class="TC_TravelSalePlat clearfix">
<div class="TC_CarNum" v-if="item.IsUseCompanyBus==1&&item.BusPriceId">车牌号
<span style="display:inline-block;margin:0 5px;position:relative;top:-3px;">.</span>{{item.BusNumber}}
</div>
</div>
</div>
</div>
<div class="el-col" style="width:200px;">
......@@ -470,7 +483,7 @@
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
<span><template v-if="subItem.DIATA">({{subItem.DIATA}})</template>
<template v-else>({{subItem.dName}})</template></span>
<template v-else>({{subItem.dName}})</template></span>
{{subItem.DepartureName}}
{{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
<template v-if="subItem.ArrivalCityName">
......@@ -479,7 +492,7 @@
</span>
<span v-else>-</span>
{{subItem.ArrivalCityName}}
<template v-if="!subItem.DIATA">({{subItem.aName}})</template>
<template v-if="!subItem.DIATA">({{subItem.aName}})</template>
</template>
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
......@@ -548,7 +561,8 @@
<span>{{$t('salesModule.XSQW')}}</span>
<span class="TCL-greenType">{{item.SaleClearOrderHour}}{{$t('salesModule.Hour')}}</span>
</p>
<p v-if="(item.LineID==14 || item.LineID==90) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<p
v-if="(item.LineID==14 || item.LineID==90) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
......@@ -804,59 +818,6 @@
</template>
</div>
<div class="TC_SeatList">
<!-- <el-popover width="500" trigger="click" v-model="item.IsShowOffer">
<table>
<tr>
<td colspan="4" style="text-align:center;height:40px;">
报价单 {{item.Config_OfferId}}<template v-if="item.Config_OfferId>0">
<a style="cursor:pointer;color:red;text-decoration: underline;"
@click="gotoOffer(item)">查看报价单</a>
</template>
</td>
</tr>
<tr>
<td style="width:70px;text-align:center;">
日期:
</td>
<td colspan="2">
<el-date-picker class="w150" type="date" v-model="offerQMsg.QStartDate"
:picker-options="offerBeginDateBefore" value-format="yyyy-MM-dd" placeholder>
</el-date-picker>
<el-date-picker class="w150" type="date" v-model="offerQMsg.QEndDate"
:picker-options="offerBeginDateAfter" value-format="yyyy-MM-dd" placeholder>
</el-date-picker>
</td>
<td>
<input type="button" class="normalBtn" value="查询" @click="getOfferQuery(item.CreateBy)">
</td>
</tr>
</table>
<table class="singeRowTable" style="margin-top:20px;">
<tr v-for="oItem in offerDataList ">
<td>
<input type="checkbox" v-model="oItem.IsCheck" @click="clickOfferItem(oItem)" />
</td>
<td>
{{oItem.LineName}}<br />
{{oItem.LtName}}
</td>
<td>
{{oItem.CustomerName}}
</td>
<td>
{{oItem.CreateByName}}/{{oItem.CreateTimeStr}}
</td>
</tr>
<tr>
<td colspan="4" style="text-align:center;">
<input v-if="offerDataList.length>0" type="button" class="normalBtn" value="保存" @click="saveOffer(item)" />
<input type="button" class="normalBtn" value="关闭" @click="item.IsShowOffer=false,clearOfferMsg()" />
</td>
</tr>
</table>
<a slot="reference" title="报价单" @click="item.IsShowOffer=true,clearOfferMsg()"
style="cursor:pointer;color:rgb(71,191,140);text-decoration:underline;">报价单</a>
</el-popover> -->
<template v-if="item.Config_OfferId>0">
<a style="cursor:pointer;color:rgb(71,191,140);text-decoration: underline;"
@click="gotoOffer(item)">查看报价单</a>
......@@ -1000,7 +961,8 @@
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2,item.TravelEndAudit)">
{{$t('Operation.Op_jietuan')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1,item.TravelEndAudit)">{{$t('visaT.sale')}}
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1,item.TravelEndAudit)">
{{$t('visaT.sale')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
@click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">{{$t('Operation.Op_shouruDan')}}
......@@ -2202,37 +2164,37 @@
});
},
//结团/正常
OutGroup(TCID, Status,TravelEndAudit) {
OutGroup(TCID, Status, TravelEndAudit) {
let msg = {
TCID: TCID,
Status: Status
};
if(TravelEndAudit==1){
let that = this;
that.$confirm('此团线路已开启结团审批,一旦申请结团,不能再进行财务单据的操作,确定结团？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
that.setPriceStatus(msg)
}).catch(() => {
if (TravelEndAudit == 1) {
let that = this;
that.$confirm('此团线路已开启结团审批,一旦申请结团,不能再进行财务单据的操作,确定结团？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
that.setPriceStatus(msg)
}).catch(() => {
});
}else{
});
} else {
this.setPriceStatus(msg)
}
},
setPriceStatus(msg){
setPriceStatus(msg) {
this.apipost("travel_post_SetPriceStatus", msg, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getControlList();
this.queryCommonData.checkDialogAll = false;
this.queryCommonData.ckedplat = [];
} else {
this.Info(res.data.message);
}
});
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getControlList();
this.queryCommonData.checkDialogAll = false;
this.queryCommonData.ckedplat = [];
} else {
this.Info(res.data.message);
}
});
},
//分房表下载
exportExcel_singleRoom(item) {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 30c21471
......@@ -461,6 +461,21 @@
v-if="IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</template>
</div>
<div style="margin:0 0 20px 10px;height:34px;">
<div style="display:inline-block;height:34px;line-height:34px;">
<el-checkbox v-model="priceData.IsUseCompanyBus" :true-label="CheckedVaule"
:false-label="UnCheckedLessPrice" label="公司车辆">
</el-checkbox>
</div>
<template v-if="priceData.IsUseCompanyBus==1">
<el-select v-model="priceData.BusPriceId">
<el-option v-for="item in busPriceList" :key="item.Id" :label="item.BusNumber" :value="item.Id">
<span style="float: left">{{ item.AreaTypeName }} ({{item.BusTypeStr}})</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.BusNumber }}</span>
</el-option>
</el-select>
</template>
</div>
<el-form-item prop="B2BMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
......@@ -840,10 +855,12 @@
</el-form-item>
<el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">报价单地址</span>
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
:http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<el-button size="small" type="primary">上传</el-button>
</el-upload>
<a style="margin-left:20px;color:blue;" :href="priceData.PriceOfferUrl" v-if="priceData.PriceOfferUrl" target="_blank">预览</a>
<a style="margin-left:20px;color:blue;" :href="priceData.PriceOfferUrl"
v-if="priceData.PriceOfferUrl" target="_blank">预览</a>
</el-form-item>
</div>
</div>
......@@ -1153,8 +1170,9 @@
//少价规则
lessPriceVisible: false,
lessPriceData: [],
SupplierList:[],//供应商列表
TeamListArr:[],
SupplierList: [], //供应商列表
TeamListArr: [],
busPriceList: [], //车辆列表
};
},
methods: {
......@@ -1309,8 +1327,10 @@
ForeignPassportPrice: 0,
UseFlightType: this.CurrentUserInfo.UseFlightType,
SupplierId: 0, //供应商编号
PriceTeamType:1, //团队类型
PriceOfferUrl:'' //报价单地址
PriceTeamType: 1, //团队类型
PriceOfferUrl: '', //报价单地址
IsUseCompanyBus: 0, //是否使用公司车辆
BusPriceId: 0, //公司车辆编号
};
}
this.returnPriceList.push(objItem);
......@@ -1901,7 +1921,7 @@
}
},
//获取团队类型
getTeamList(){
getTeamList() {
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
if (res.data.resultCode == 1) {
this.TeamListArr = res.data.data;
......@@ -1919,8 +1939,20 @@
this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
this.priceData.PriceOfferUrl = this.domainManager().ViittoFileUrl + x.data.FilePath,
this.Success(this.$t('tips.scchenggong'))
this.Success(this.$t('tips.scchenggong'))
});
},
//获取车辆列表
getBusList() {
this.apipost("bus_get_GetBusTypePriceList", {}, res => {
if (res.data.resultCode == 1) {
this.busPriceList = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
}
},
mounted() {
......@@ -1931,6 +1963,7 @@
this.getCompanyList();
this.getTravelSupplier();
this.getTeamList();
this.getBusList();
},
watch: {
priceList: {
......
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