Skip to content

S
SuperMan
Commit 33b8a1ca authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

解决冲突

parents 7a60a7a6 2932cd09
Hide whitespace changes
Inline Side-by-side
Showing with 1089 additions and 179 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 33b8a1ca
......@@ -263,7 +263,8 @@
<p class="_tit">{{GetDetail.FinanceName}}</p>
<div class="_conten">
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7">
<my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
<!-- <my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill> -->
<new-Bill :ID="GetDetail.FrID"></new-Bill>
</template>
<template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
<my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
......@@ -1105,6 +1106,8 @@ import teamProductModule from "../commonPage/teamProductModule.vue";
import TicketFinace from "../commonPage/TicketFinace.vue";
import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
import TicketingModule from "../commonPage/TicketingModule.vue";
import newBill from "./FinancialSubmodule/NewBillModule.vue";
// import MsgBus from '../../assets/utils/msgBus.js';
export default {
data(){
......@@ -1237,6 +1240,7 @@ export default {
'SaleOrderModule':SaleOrderModule,
'TicketFinace':TicketFinace,
'my-HB-Bill':myhrBill,
'new-Bill':newBill
},methods:{
payMsgListShow: function (type, index) {
if(this.choiceMsg.Status==1){
......@@ -1784,7 +1788,6 @@ export default {
this.apipost('Financial_post_GetDetail',{ID:id,Type:2}, res => {
if(res.data.resultCode == 1) {
let data= res.data.data;
console.log(data,'datas');
data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2))
x.Money = x.Money.toFixed(2)
......@@ -1814,10 +1817,11 @@ export default {
this.isShowChoice = true;
}
//遍历默认不勾选
this.GetDetail.TradeDetailList.forEach(x=>{
x.isChecked = false;
})
console.log(this.GetDetail,'getdetails');
if(this.GetDetail.TradeDetailList&&this.GetDetail.TradeDetailList.length>0){
this.GetDetail.TradeDetailList.forEach(x=>{
x.isChecked = false;
})
}
// 拼接团号显示团信息
let str = '';
if(data.TCIDList.length>0){
......
src/components/FinancialModule/CapitalAllocationDetail.vue
View file @ 33b8a1ca
......@@ -668,7 +668,6 @@ export default {
x.comText = this.$t('fnc.xsfujian');
x.isShow = false;
});
console.log(this.GetDetail)
}else{
this.Error(res.data.message);
}
......
src/components/FinancialModule/FinancialSubmodule/NewBillModule.vue 0 → 100644
View file @ 33b8a1ca
<style>
.newBillModule .Co_oderleft{
float:left;
}
.newBillModule .Co_oderRight{
float:right;
}
.newBillModule .Ca_diaobo{
width:100%;
height:35px;
font-size:12px;
line-height: 35px;
padding:0 20px;
}
.newBillModule .Ca_Span{
display:block;
padding-left: 10px;
font-size:14px;
margin-bottom:20px;
color:#333333;
border-left:3px solid #E95252;
}
.newBillModule .Ca_leftOrder{
width:890px;
height:auto;
padding-top:5px;
background-color: #fff;
}
.newBillModule .Ca_title{
width:190px;
margin:auto;
font-size:16px;
margin-top:20px;
color:#333333;
text-align: center;
}
.newBillModule .Ca_t2{
width:100%;
font-size:14px;
text-align: center;
margin-bottom: -8px;
}
.collection_Table,.pay_Table{
width:96%;
margin:auto;
padding:0 20px;
font-size:14px;
}
.collection_Table th{
font-size:12px;
color:#BE525D;
}
.collection_Table td,.collection_Table th{
border: 1px solid #BE525D;
text-align: center;
height:44px;
padding:0 5px;
}
.pay_Table th{
font-size:12px;
color:#1273BC;
}
.pay_Table td,.pay_Table th{
border: 1px solid #1273BC;
text-align: center;
height:44px;
padding:0 5px;
}
.newBillModule .Ca_comLinediv{
width:96%;
min-height:80px;
margin:auto;
font-size:12px;
border-bottom: 1px dashed #BFBFBF;
}
.newBillModule .Ca_comBlueColor{
color:#1273BC;
}
.newBillModule textarea{
border:none;
border-bottom:1px solid #666666;
}
.newBillModule .Ca_payBtn{
color:#1273BC;
border-color:#1273BC;
}
.newBillModule .Ca_cashier{
width:25%;
float:left;
}
.newBillModule .Ca_popDiv{
width:100%;
height:52px;
line-height: 52px;
padding:0 20px;
font-size:12px;
display: flex;
justify-content: space-between;
}
.Ca_popDiv p{
display: inline-block;
}
.Ca_popDiv p:last-child{
float:right;
margin-right:0;
}
.newBillModule .Cafujian{
width:100%;
min-height: 50px;
margin-top:20px;
}
.Cafujian>div{
float: left;
width: 138px;
height: 92px;
border: 1px dashed rgba(210,210,210,1);
border-radius: 2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.Cafujian>div .icon-guanbi1{
display: inline-block;
margin-left: 15px;
color:#fff;
position: absolute;
right: -6px;
top: -9px;
background-color: #f56c6c;
border-radius: 50%;
height: 20px;
width: 20px;
text-align: center;
line-height: 20px;
}
.Cafujian>div .icon-guanbi1:hover{
color:#c94052;
font-size:12px;
}
.Cafujian>div img{
width:100%;
height:100%;
}
.newBillModule .Ca_rightFile{
float:left;
width:300px;
/* height:500px; */
border:1px solid red;
}
.newBillModule .Ca_description{
width:600px;
min-height: 30px;
display: inline-block;
margin-top:30px;
font-size: 14px;
}
.newBillModule .Ca_remarkSpan{
display: inline-block;
height: 30px;
vertical-align: top;
margin-top: 30px;
}
.Cafujian .icon-excel{
text-align: center;
font-size: 38px;
color: green;
line-height: 75px;
}
.newBillModule .Ca_AccountInfo{
width:100%;
padding:0 20px;
text-align:left;
}
.newBillModule .collection_Order{
width:100%;
height:36px;
font-size:12px;
line-height: 35px;
padding:0 20px;
border-bottom:1px dashed #BFBFBF;
}
</style>
<template>
<div class="newBillModule">
<div class="clearfix">
<div class="Co_oderleft">
<div class="Ca_leftOrder">
<div class="Ca_title">{{dataList.CompanyName}}</div>
<div class="Ca_t2">{{dataList.FinanceName}}</div>
<div class="Ca_line"></div>
<div class="clearfix collection_Order">
<div class="Co_oderleft">
<span>{{$t('hotel.hotel_SerialNumber')}}：</span><span class="Ca_comSize">{{dataList.FrID}}</span>
</div>
<div class="Co_oderRight">
<span>{{$t('fnc.zhibiao')}}：</span><span class="Ca_comSize">{{dataList.CreateDate}}</span>
</div>
</div>
<div v-for="item in dataList.SBankList">
<div class="clearfix Ca_diaobo">
<div class="Co_oderRight" style="margin:10px 0;">
<span class="Ca_comColor">{{$t('fnc.dbriqi')}}：</span><span class="Ca_comSize">{{item.AllotDate}}</span>
</div>
</div>
<table class="collection_Table" style="border-collapse: collapse;">
<tr>
<th width="100">{{$t('fnc.skfangshi')}}</th>
<th width="300">{{$t('fnc.acc')}}</th>
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
<td>{{item.TypeName}}</td>
<td>
<div class="Ca_AccountInfo">{{item.Alias}}-{{item.AccountType}}-{{item.BankNo}}</div>
</td>
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>{{item.Money}}</td>
</tr>
</table>
<div class="clearfix Ca_comLinediv">
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">{{item.Description}}</div>
<input type="button" class="hollowFixedBtn Co_oderRight" style="margin-top:25px;" @click="showFileList(item)" :value="item.comText"/>
<div class="Cafujian clearfix" v-if="item.isShow">
<template v-for="(file,fIndex) in item.vorcherInos">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Content" @click="showImg(file.Content)">
</div>
</div>
<div v-if="file.Type==1">
<div class="iconfont " :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFile(file)">
</div>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
</div>
</template>
</div>
</div>
</div>
<div v-for="item in dataList.FBankList">
<div class="clearfix Ca_diaobo">
<div class="Co_oderRight" style="margin:10px 0;">
<span class="Ca_comBlueColor">{{$t('fnc.dbriqi')}}：</span><span class="Ca_comSize">{{item.AllotDate}}</span>
</div>
</div>
<table class="pay_Table" style="border-collapse: collapse;">
<tr>
<th width="100">{{$t('fnc.fkfangshi')}}</th>
<th width="300">{{$t('fnc.acc')}}</th>
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
<td>{{item.TypeName}}</td>
<td>
<div class="Ca_AccountInfo">{{item.Alias}}-{{item.AccountType}}-{{item.BankNo}}</div>
</td>
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>{{item.Money}}</td>
</tr>
</table>
<div class="clearfix Ca_comLinediv" style="width:100%;padding:0 20px;">
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">{{item.Description}}</div>
<input type="button" class="hollowFixedBtn Co_oderRight Ca_payBtn" style="margin-top:25px;" @click="showFuFileList(item)" :value="item.comText"/>
<div class="Cafujian clearfix" v-if="item.isShow">
<template v-for="(file,fIndex) in item.vorcherInos">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Content" @click="showImg(file.Content)">
</div>
</div>
<div v-if="file.Type==1">
<div class="iconfont _wenjian_P" :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFileT(file)">
</div>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
</div>
</template>
</div>
</div>
</div>
<div class="Ca_popDiv" v-if="dataList.AuditSteps!=''">
<template v-for="(item,index) in dataList.AuditSteps">
<p>{{item.AuditDescription}}：
<template v-if="item.Status===2">
<span class="_r_name" v-if="s.AuditStatus==2" v-for="(s,si) in item.AuditRecordList">{{s.AuditName}} </span>
</template>
</p>
</template>
</div>
</div>
</div>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src.subCode">
</viewer>
</div>
</template>
<script>
export default {
props:["ID"], //接收参数 ID width color
data(){
return {
msg:{
ID:0
},
dataList:[],
images:[],
imageOptions:{
navbar:false,
title:false
},
}
},
methods:{
inited (viewer){
this.$viewer = viewer
},
getList(ID){
this.msg.ID = ID ;
this.apipost('Financial_get_GetFundTransfer', this.msg, res => {
if(res.data.resultCode == 1) {
this.dataList = res.data.data;
this.dataList.SBankList.forEach(x => {
x.comText = this.$t('fnc.xsfujian');
x.isShow = false;
});
this.dataList.FBankList.forEach(x => {
x.comText = this.$t('fnc.xsfujian');
x.isShow = false;
});
}else{
this.Error(res.data.message);
}
}, err => {})
},
//点击显示附件
showFileList(item){
if(item.comText== this.$t('fnc.ycfujian')){
item.comText=this.$t('fnc.xsfujian');
}else{
item.comText=this.$t('fnc.ycfujian')
}
if(item.isShow){
item.isShow=false;
}else{
item.isShow=true;
}
this.$forceUpdate();
},
showFuFileList(item){
if(item.comText==this.$t('fnc.ycfujian')){
item.comText=this.$t('fnc.xsfujian');
}else{
item.comText=this.$t('fnc.ycfujian')
}
if(item.isShow){
item.isShow=false;
}else{
item.isShow=true;
}
this.$forceUpdate();
},
//显示大图
showImg(obj){
let isExsit=false
this.images.forEach(x=>{
if(x==obj)
isExsit=true
})
if(!isExsit) {
this.images.push(obj)
} else {
this.$viewer.view(this.images.indexOf(obj))
}
this.$viewer.show()
},
//预览文件
showUpLoadFileT(i){
if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
this.previewPDF(i.Content)
}else{
window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Content)
}
},
},
mounted(){
//this.getList(this.ID);
},
watch: { // 监听参数变化
GetDetail: {
handler: function(val, oldVal) {
},
deep: true
},
ID:{
handler: function(val, oldVal) {
this.ID = val
this.getList(this.ID)
},
deep: true
}
}
}
</script>
src/components/Hotel/HotelQueryList.vue
View file @ 33b8a1ca
......@@ -28,38 +28,39 @@
<li>
<span>
<em>星级</em>
<el-select v-model="msg.Star" :placeholder="$t('pub.pleaseSel')" >
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="3星或商务" :value='3'></el-option>
<el-option label="4星" :value='4'></el-option>
<el-option label="5星" :value='5'></el-option>
<el-select v-model="msg.Star" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="3星或商务" :value='3'></el-option>
<el-option label="4星" :value='4'></el-option>
<el-option label="5星" :value='5'></el-option>
</el-select>
</span>
</li>
<li>
<li>
<span>
<em>价格区间</em>
<el-select v-model="msg.PriceLevel" :placeholder="$t('pub.pleaseSel')" >
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="5000以下" :value='1'></el-option>
<el-option label="5000~6000" :value='2'></el-option>
<el-option label="6000~7000" :value='3'></el-option>
<el-option label="7000~8000" :value='4'></el-option>
<el-option label="8000~9000" :value='5'></el-option>
<el-option label="9000~10000" :value='6'></el-option>
<el-option label="10000以上" :value='7'></el-option>
<el-select v-model="msg.PriceLevel" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="5000以下" :value='1'></el-option>
<el-option label="5000~6000" :value='2'></el-option>
<el-option label="6000~7000" :value='3'></el-option>
<el-option label="7000~8000" :value='4'></el-option>
<el-option label="8000~9000" :value='5'></el-option>
<el-option label="9000~10000" :value='6'></el-option>
<el-option label="10000以上" :value='7'></el-option>
</el-select>
</span>
</li>
<li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date" :picker-options="beforeCheck"></el-date-picker>
<el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date" :picker-options="afterCheck"></el-date-picker>
</span>
</li>
<li>
<span>
<em>酒店</em>
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300" filterable multiple :multiple-limit="3">
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300"
filterable multiple :multiple-limit="3">
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
......@@ -82,43 +83,52 @@
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
</div>
<template v-if="isShow">
<el-table :data="dataList" style="width:100%" border v-loading='loading' height="500">
<el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.HotelId)">{{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div>
</template>
</el-table-column>
<el-table-column label="价格&库存" fixed min-width="120">
<template slot-scope="scope">
<div class="Hotel_kong">价格</div>
<div class="Hotel_kong" style="min-width:60px;">总/用/剩</div>
<div class="Hotel_kong">超定</div>
</template>
</el-table-column>
<el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)" :key='index' min-width="120">
<template slot-scope="scope">
<div class="Hotel_kong Com_hoteldiv">
<template v-if="scope.row.subList[index].PriceList.length>0">
<template v-for="childItem in scope.row.subList[index].PriceList">
<div :class="getClass(1,childItem.InventoryType)" style="height:100%;float:left;width:100%"
:style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}">{{childItem.CostPrice}}</div>
</template>
</template>
<template v-else>
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template>
</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge" @click="GotoUrl(scope.row,index,scope.row.subList[index].UseInventory)">
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}</div>
<div class="Hotel_kong Com_hoteldiv">
<span v-if="scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory>0" style="color:red;">
{{scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory}}
</span>
</div>
</template>
</el-table-column>
</el-table>
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' height="500">
<el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.HotelId)">
{{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div>
</template>
</el-table-column>
<el-table-column label="价格&库存" fixed min-width="120">
<template slot-scope="scope">
<div class="Hotel_kong">价格</div>
<div class="Hotel_kong" style="min-width:60px;">总/用/剩</div>
<div class="Hotel_kong">超定</div>
</template>
</el-table-column>
<el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)" :key='index'
min-width="120">
<template slot-scope="scope">
<div class="Hotel_kong Com_hoteldiv">
<template v-if="scope.row.subList[index].PriceList.length>0">
<template v-for="childItem in scope.row.subList[index].PriceList">
<div :class="getClass(1,childItem.InventoryType)" style="height:100%;float:left;width:100%"
:style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}">{{childItem.CostPrice}}</div>
</template>
</template>
<template v-else>
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template>
</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge"
@click="GotoUrl(scope.row,index,scope.row.subList[index].UseInventory)">
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
</div>
<div class="Hotel_kong Com_hoteldiv">
<span v-if="scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory>0"
style="color:red;">
{{scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory}}
</span>
</div>
</template>
</el-table-column>
</el-table>
<div class="noDataNotice" v-else>
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</template>
</div>
......@@ -143,7 +153,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="说明">
<quill-editor class="w595" :options="editorOption" v-model="postMsg.TipContent"></quill-editor>
<quill-editor class="w595" :options="editorOption" v-model="postMsg.TipContent"></quill-editor>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -164,7 +174,9 @@
<template v-if="queryMsg.total>0">
<tr v-for="(item,index) in HotelTipList">
<td>{{item.Id}}</td>
<td><p style="text-align:left;padding-left:5px;" v-html="item.TipContent"></p></td>
<td>
<p style="text-align:left;padding-left:5px;" v-html="item.TipContent"></p>
</td>
<td>{{item.CreateByName}}</td>
<td>{{item.CreateTimeStr}}</td>
<td>
......@@ -198,7 +210,9 @@
<template v-if="queryMsg.total>0">
<tr v-for="(item,index) in HotelTipList">
<td>{{item.Id}}</td>
<td><p style="text-align:left;padding:0 5px;" v-html="item.TipContent"></p></td>
<td>
<p style="text-align:left;padding:0 5px;" v-html="item.TipContent"></p>
</td>
<td>{{item.CreateByName}}</td>
<td>{{item.CreateTimeStr}}</td>
</tr>
......@@ -223,7 +237,7 @@
return {
msg: {
//酒店选择数组
HotelChooseArray:[],
HotelChooseArray: [],
StartDate: new Date().Format("yyyy-MM-dd"),
EndDate: this.setEdate(),
//只查询日本
......@@ -232,11 +246,31 @@
City: 0,
OutBranchId: -1,
//星级
Star:0,
Star: 0,
//价格等级
PriceLevel:0
PriceLevel: 0
},
beforeCheck: {
disabledDate: time => {
if (this.msg.StartDate) {
let endTime = new Date(this.msg.EndDate);
return time && endTime.getTime() < time.getTime();
} else {
return false;
}
}
},
afterCheck: {
disabledDate: time => {
if (this.msg.StartDate) {
let startTime = new Date(this.msg.StartDate);
//可以选择当天
return time && time.getTime() < startTime.getTime() - 1 * 24 * 60 * 60 * 1000;
} else {
return false;
}
}
},
//分公司列表
companyList: [],
defaultSelectValue: 0,
......@@ -277,13 +311,13 @@
return startTime.getTime() >= time.getTime()
}
},
editorOption:{
editorOption: {
placeholder: '请输入内容',
modules:{
toolbar:[
['bold', 'italic', 'underline', 'strike'], // toggled buttons
['blockquote', 'code-block','align']
]
modules: {
toolbar: [
['bold', 'italic', 'underline', 'strike'], // toggled buttons
['blockquote', 'code-block', 'align']
]
}
},
};
......@@ -295,7 +329,7 @@
query: {
ID: HotelId,
tab: "酒店查询",
blank:'y',
blank: 'y',
}
});
},
......@@ -306,7 +340,8 @@
query: {
HotelId: item.HotelId,
HotelUseTime: item.subList[subIndex].DateStr,
tab: "团控查询"
blank: 'y',
tab: "团控查询",
}
});
}
......@@ -364,7 +399,7 @@
var weekDay = ["天", "一", "二", "三", "四", "五", "六"];
var myDate = new Date(Date.parse(dateStr));
return str[1] + '/' + str[2] + "（"+weekDay[myDate.getDay()]+"）";
return str[1] + '/' + str[2] + "（" + weekDay[myDate.getDay()] + "）";
},
//获取星期几
getWeek(dateStr) {
......@@ -373,7 +408,7 @@
return weekDay[myDate.getDay()]
},
//获取颜色状态
getClass(Status,InventoryType) {
getClass(Status, InventoryType) {
var classStr = "";
if (Status == 0) {
classStr = 'noKucun';
......@@ -524,10 +559,10 @@
text-decoration: underline;
}
.HqCom_bottom .ql-container
{
min-height: 100px;
}
.HqCom_bottom .ql-container {
min-height: 100px;
}
.classHong {
background-color: rgb(255, 55, 55);
}
......@@ -556,7 +591,7 @@
.Com_hoteldiv {
min-width: 70px;
white-space:nowrap;
white-space: nowrap;
}
.noKucun {
......@@ -616,23 +651,32 @@
height: 350px;
padding-top: 35px;
}
.HQ_miaoshu{
color:#E95252;
font-size:12px;
.HQ_miaoshu {
color: #E95252;
font-size: 12px;
}
.HQ_miaoshu:first-child{
margin-top:10px;
.HQ_miaoshu:first-child {
margin-top: 10px;
}
.HotelQueryList .has-gutter tr th, .el-table th.is-leaf{
background: #EAEAEA!important;
.HotelQueryList .has-gutter tr th,
.el-table th.is-leaf {
background: #EAEAEA !important;
}
.HotelQueryList .el-table td, .el-table th.is-leaf{
border-bottom:1px solid #ebeef5;
.HotelQueryList .el-table td,
.el-table th.is-leaf {
border-bottom: 1px solid #ebeef5;
}
.HotelQueryList .el-table .cell{
padding:0;
.HotelQueryList .el-table .cell {
padding: 0;
}
.HotelQueryList .el-table td{
padding:0;
.HotelQueryList .el-table td {
padding: 0;
}
</style>
src/components/Hotel/roomQuery.vue
View file @ 33b8a1ca
......@@ -49,7 +49,7 @@
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" style="display:none;" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" />
</li>
</ul>
</div>
......
src/components/PrintPage.vue
View file @ 33b8a1ca
......@@ -73,8 +73,7 @@ export default {
'my-HB-Bill':myhrBill,
'my-GZ-Bill': myGZBill
},methods:{
numAdd(){
alert(111)
numAdd(){
this.num = this.num + 1
}
},mounted(){
......
src/components/SalesModule/Lowpricemanagement.vue
View file @ 33b8a1ca
......@@ -39,16 +39,22 @@
<td>{{item.Reasons}}</td>
<td>{{item.ApplyReason}}</td>
<td>
<el-row>
<el-row v-if="item.ApplyState === 0">
<button class="normalBtn" type="primary" @click="outerVisible = true,dialogTitle='审核理由',addMsg.ID=item.ID,addMsg.ApplyState= 1,addMsg.Reasons=item.Reasons">同意</button>
<button class="hollowFixedBtn" @click="outerVisible = true,dialogTitle='拒绝理由',addMsg.ID=item.ID,addMsg.ApplyState= 2,addMsg.Reasons=item.ApplyReason">拒绝</button>
</el-row>
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
<el-dialog custom-class='w450' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<el-form :rules="rules" ref="addMsg" label-width="100px">
<el-form-item label="优惠金额" prop="Description">
<el-input class='w217' v-model="addMsg.ApplyPrice"></el-input>
</el-form-item>
<el-form-item :label="$t('system.label_info')" prop="Description">
<el-input maxlength='250' class='w217' type="textarea" v-model="addMsg.Reasons"></el-input>
</el-form-item>
......@@ -80,7 +86,8 @@
addMsg: {
Reasons: '',
ApplyState:"",
ID:''
ID:'',
ApplyPrice: '',
},
rules: {
Name: [{
......@@ -125,19 +132,24 @@
closeChangeMachie(done) { // 转交窗口关闭
done();
},
submitForm(){
console.log(this.addMsg.Description)
submitForm(){
if (!this.addMsg.ApplyPrice || this.addMsg.ApplyPrice < 0) {
this.$message.error('请填写大于等于0的金额')
return
}
this.apipost("lessprice_post_UpdateLesspriceOrder", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message)
this.outerVisible = false;
this.addMsg.Reasons = '';
this.addMsg.ApplyPrice = '';
this.getList()
}
else {
this.$message.error(res.data.message)
this.outerVisible = false;
this.addMsg.Reasons = '';
this.addMsg.ApplyPrice = '';
}
}, err => {})
}
......
src/components/SalesModule/groupTourOrder.vue
View file @ 33b8a1ca
......@@ -1267,8 +1267,8 @@
<em style="font-size: 12px !important;color: #606266;line-height: 34px">订单当前单价</em>
<em style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;" class='w150'>{{SOMsg.OrderUnitPrice}}</em>
<em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
<el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input>
<!-- <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
<el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input> -->
<em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >审核人</em>
<el-select placeholder="请选择" v-model="SOMsg.UpdateBy">
......@@ -3166,7 +3166,7 @@
this.remarksMsg.isOrder = '1'
this.SpecialOffer = false
this.SOMsg.UpdateBy=''
this.SOMsg.ApplyPrice=''
this.SOMsg.ApplyPrice=0
this.SOMsg.ApplyReason=''
},
clearMsg () {
......@@ -3602,10 +3602,10 @@
},
//申请优惠
Preservation(){
if(this.SOMsg.ApplyPrice < 0 ){
this.$message.error('请填写大于等于0的金额')
return
}
// if(this.SOMsg.ApplyPrice <= 0 ){
// this.$message.error('请填写大于等于0的金额')
// return
// }
var numReg = /^[0-9]+$/
var numRe = new RegExp(numReg)
if (!numRe.test(this.SOMsg.ApplyPrice)) {
......@@ -3628,13 +3628,13 @@
this.$message.success(res.data.message)
this.SpecialOffer =false;
this.SOMsg.UpdateBy=''
this.SOMsg.ApplyPrice=''
this.SOMsg.ApplyPrice=0
this.SOMsg.ApplyReason=''
}else {
this.$message.error(res.data.message)
this.SpecialOffer =false;
this.SOMsg.UpdateBy=''
this.SOMsg.ApplyPrice=''
this.SOMsg.ApplyPrice=0
this.SOMsg.ApplyReason=''
}
},
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 33b8a1ca
......@@ -2179,8 +2179,8 @@
<em style="font-size: 12px !important;color: #606266;line-height: 34px">订单当前单价</em>
<em style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;" class='w150'>{{SOMsg.OrderUnitPrice}}</em>
<em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
<el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input>
<!-- <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
<el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input> -->
<em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >审核人</em>
<el-select placeholder="请选择" v-model="SOMsg.UpdateBy">
......@@ -3597,7 +3597,7 @@ submitYSZEForm(){
this.remarksMsg.isOrder=1;
this.SpecialOffer = false;
this.SOMsg.UpdateBy=''
this.SOMsg.ApplyPrice=''
this.SOMsg.ApplyPrice=0
this.SOMsg.ApplyReason=''
},
houseSubmit: function (){
......@@ -4137,10 +4137,10 @@ submitYSZEForm(){
},
//申请优惠
Preservation(){
if(this.SOMsg.ApplyPrice < 0 ){
this.$message.error('请填写大于等于0的金额')
return
}
// if(this.SOMsg.ApplyPrice < 0 ){
// this.$message.error('请填写大于等于0的金额')
// return
// }
var numReg = /^[0-9]+$/
var numRe = new RegExp(numReg)
if (!numRe.test(this.SOMsg.ApplyPrice)) {
......@@ -4163,13 +4163,13 @@ submitYSZEForm(){
this.$message.success(res.data.message)
this.SpecialOffer =false;
this.SOMsg.UpdateBy=''
this.SOMsg.ApplyPrice=''
this.SOMsg.ApplyReason=''
this.SOMsg.ApplyPrice=0
this.SOMsg.ApplyReason=0
}else {
this.$message.error(res.data.message)
this.SpecialOffer =false;
this.SOMsg.UpdateBy=''
this.SOMsg.ApplyPrice=''
this.SOMsg.ApplyPrice=0
this.SOMsg.ApplyReason=''
}
},
......
src/components/SalesModule/productQuery.vue
View file @ 33b8a1ca
......@@ -1981,7 +1981,6 @@
TCID: id
}, res => {
if (res.data.resultCode == 1) {
console.log(res.data.data)
this.tripDetails = res.data.data.FlightList
} else {
this.$message.error(res.data.message)
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 33b8a1ca
......@@ -2600,8 +2600,8 @@
style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;"
class='w150'>{{SOMsg.OrderUnitPrice}}</em>
<em style="margin-left: 100px;font-size: 12px !important;color: #606266;">优惠金额</em>
<el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150'></el-input>
<!-- <em style="margin-left: 100px;font-size: 12px !important;color: #606266;">优惠金额</em>
<el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150'></el-input> -->
<em style="margin-left: 100px;font-size: 12px !important;color: #606266;">审核人</em>
<el-select placeholder="请选择" v-model="SOMsg.UpdateBy">
......@@ -3890,7 +3890,7 @@
this.remarksMsg.OrderId = "0";
this.SpecialOffer = false;
this.SOMsg.UpdateBy = ''
this.SOMsg.ApplyPrice = ''
this.SOMsg.ApplyPrice = 0
this.SOMsg.ApplyReason = ''
},
......@@ -4654,10 +4654,10 @@
},
//申请优惠
Preservation() {
if (this.SOMsg.ApplyPrice < 0) {
this.$message.error('请填写大于等于0的金额')
return
}
// if (this.SOMsg.ApplyPrice < 0) {
// this.$message.error('请填写大于等于0的金额')
// return
// }
var numReg = /^[0-9]+$/
var numRe = new RegExp(numReg)
if (!numRe.test(this.SOMsg.ApplyPrice)) {
......@@ -4680,13 +4680,13 @@
this.$message.success(res.data.message)
this.SpecialOffer = false;
this.SOMsg.UpdateBy = ''
this.SOMsg.ApplyPrice = ''
this.SOMsg.ApplyPrice = 0
this.SOMsg.ApplyReason = ''
} else {
this.$message.error(res.data.message)
this.SpecialOffer = false;
this.SOMsg.UpdateBy = ''
this.SOMsg.ApplyPrice = ''
this.SOMsg.ApplyPrice = 0
this.SOMsg.ApplyReason = ''
}
},
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 33b8a1ca
......@@ -1688,9 +1688,7 @@
//默认显示联运
this.queryMsg.IsShowUnion = 0;
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo
this.$route.query.tcmun = this.$route.query.tcmun
this.CurrentUserInfo = userInfo;
if (this.$route.query.tcmun) {
this.queryMsg.TCNUM = this.$route.query.tcmun;
}
......
src/components/activity/BmenuManagement.vue 0 → 100644
View file @ 33b8a1ca
<style>
</style>
<template>
<div class="flexOne">
<div class="query-box">
<ul>
<li>
<span><em>名称</em>
<el-input v-model='msg.MenuName' class="permiss-input" placeholder="请输入内容"></el-input>
</span>
</li>
<!-- <li>
<span><em>权限层级</em>
<el-select v-model='msg.Tier' placeholder="请选择">
<el-option label="不限" value="0"></el-option>
<el-option label="一级" value="1"></el-option>
<el-option label="二级" value="2"></el-option>
<el-option label="三级" value="3"></el-option>
</el-select>
</span>
</li> -->
<li>
<span><em>上级权限</em>
<el-select filterable v-model='msg.ParentId' filterable placeholder="请选择">
<el-option label="不限" value="0"></el-option>
<el-option v-for="item in getParentNodeData" :key="item.MenuId" :label="item.MenuName"
:value="item.MenuId">
</el-option>
</el-select>
</span>
</li>
<li>
<span><em>状态</em>
<el-select v-model="msg.MenuStatus" placeholder="请选择">
<el-option label="不限" value="-1"></el-option>
<el-option label="开启" value="0"></el-option>
<el-option label="关闭" value="1"></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" name="" id="" value="查询" @click="resetPageIndex(),getList()" />
<input type="button" @click="outerVisible = true,dialogTitle='新增权限菜单',clearMessage();" class="normalBtn"
value="新增" />
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="300">名称</th>
<th width="500">菜单地址</th>
<th>层级</th>
<th>状态</th>
<th width="200">分组名称</th>
<th width="100">排序</th>
<th width="100">操作</th>
</tr>
<tr v-for="(item,index) in DataList">
<td>{{item.MenuName}}</td>
<td>{{item.MenuUrl}}</td>
<td>{{item.Tier | tierFormat(item.Tier)}}</td>
<td>{{item.MenuStatus==0?'开启':'关闭'}}</td>
<td>
{{item.GroupingCode}}
</td>
<td>
{{item.Sort}}
</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button @click="outerVisible = true,dialogTitle='修改权限菜单',updateData(index,item.MenuId)" type="primary"
icon="el-icon-edit" circle></el-button>
</el-tooltip>
</el-row>
</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination>
<el-dialog custom-class='w750' :title="dialogTitle" :visible.sync="outerVisible" center
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
<table class="layerNoIcon">
<tr>
<td>
<el-form-item label="名称" prop="mName">
<el-input maxlength='50' class='w200' type="text" v-model="addMsg.mName"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</td>
<td>
<el-form-item label="菜单URL" prop="mUrl">
<el-input maxlength='50' class='w200' type="text" v-model="addMsg.mUrl"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<!-- <td>
<el-form-item label="权限层级" prop="Tier">
<el-select class='w200' v-model="addMsg.Tier" @change='getChildMenu' placeholder="请选择">
<el-option label="一级" value="1"></el-option>
<el-option label="二级" value="2"></el-option>
<el-option label="三级" value="3"></el-option>
</el-select>
</el-form-item>
</td> -->
<td>
<el-form-item label="分组名称">
<el-input maxlength='50' class='w200' type="text" v-model="addMsg.GroupingCode"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</td>
<td>
<el-form-item label="上级权限" prop="ParentId">
<el-select filterable class='w200' v-model='addMsg.ParentId' :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in layerGetParentNodeData" :key="item.MenuId" :label="item.MenuName"
:value="item.MenuId">
</el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="菜单图标">
<el-input class='w200' type="text" maxlength='50' v-model="addMsg.MenuStyleIcon"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</td>
<td>
<el-form-item label="排序" prop='Sort'>
<el-input maxlength='50' class='w200' @keyup.native="checkInteger(addMsg,'Sort')" type="text"
v-model="addMsg.Sort" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="状态">
<el-switch v-model="addMsg.MenuStatus" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
</td>
</tr>
</table>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn"
@click="outerVisible = false,resetForm('addMsg'),getList()">{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="normalBtn" type="primary" @click="submitForm('addMsg'),getList()">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
let validateParent = (rule, value, callback) => {
if (this.addMsg.Tier != '1' && this.addMsg.Tier != '' && value == '') {
return callback(new Error('请选择上级层级'));
} else {
callback();
}
}
let validateUrl = (rule, value, callback) => {
if (this.addMsg.Tier == '3' && this.addMsg.Tier != '' && value == '') {
return callback(new Error('请输入菜单URL'));
} else {
callback();
}
}
return {
dialogTitle: '',
DataList: '',
total: 0,
pageSize: '',
currentPage: 1,
thisColor: '#E95252',
predefineColors: [
'#ff4500',
'#ff8c00',
'#ffd700',
'#90ee90',
'#00ced1',
'#1e90ff',
'#c71585',
],
outerVisible: false,
addStatus: [{
value: '0',
label: '开启'
}, {
value: '1',
label: '关闭'
}],
msg: { //列表查询请求数据
pageIndex: 1,
pageSize: 15,
MenuName: '',
ParentId: '',
MenuStatus: '0',
Tier: '',
type: '1',
mName: '',
mUrl: '',
mStatus: 0,
},
addMsg: {
Id: 0,
mName: '',
mUrl: '',
ParentId: '',
mStyle: '',
mStatus: 1,
sort: ''
},
rules: {
Sort: [{
required: true,
message: '请输入排序',
trigger: 'blur'
}],
mName: [{
required: true,
message: '请输入菜单名称',
trigger: 'blur'
}],
Tier: [{
required: true,
message: '请选择菜单层级',
trigger: 'change'
}],
ParentId: [{
validator: validateParent,
trigger: 'change'
}],
mUrl: [{
validator: validateUrl,
trigger: 'blur'
}],
},
getParentNodeMsg: {
'Tier': '0',
"ParentId": '0',
"MenuStatus": '0',
"MenuName": '',
},
layerGetParentNodeData: [],
getParentNodeData: [],
currentUpdateIndex: -1
}
},
mounted() {
this.getallmenu()
this.getList();
this.getParentNode()
},
filters: {
tierFormat(value) {
if (value == '1')
return '一级'
if (value == '2')
return '二级'
if (value == '3')
return '三级'
}
},
methods: {
getallmenu(){
let msg = {
type: -1,
parentId: 0,
mName: '',
mUrl: '',
mStatus: '',
}
this.apiJavaPost("/api/menumanager/getallmenu", this.msg, res => {
console.log(res)
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
console.log(this.dataList,'datalist');
} else {
this.Error(res.data.message)
}
}, null);
},
getParentNode() { //上级权限
this.apipost('admin_get_SysMenuGetList', this.getParentNodeMsg, res => {
if (this.outerVisible) {
this.layerGetParentNodeData = res.data.data;
} else {
this.getParentNodeData = res.data.data;
}
}, err => {})
},
getList() { //列表查询
this.apiJavaPost("/api/menumanager/getallmenu", this.msg, res => {
console.log(res)
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
console.log(this.dataList,'datalist');
} else {
this.Error(res.data.message)
}
}, null);
},
getChildMenu() {
this.addMsg.ParentId = '';
if (this.addMsg.Tier == 1) {
this.addMsg.ParentId = -1;
this.layerGetParentNodeData = [
{
MenuId: -1,
MenuName: 'B2B前台菜单'
},
{
MenuId: -2,
MenuName: '个人中心菜单'
}
];
} else {
this.getParentNodeMsg.Tier = this.addMsg.Tier - 1;
this.getParentNode();
}
},
addData() { //新增数据
if (this.addMsg.MenuName == '') {
this.$message.error('菜单名不能为空');
return
}
let mStyle = {
"icon": "",
"color": ""
};
mStyle.icon = this.addMsg.MenuStyleIcon;
mStyle.color = this.addMsg.MenuStyleColor;
this.addMsg.MenuStyle = JSON.stringify(mStyle);
if (this.addMsg.Tier == 1)
this.addMsg.ParentId = 0
this.apipost('admin_post_SysMenuSet', this.addMsg, res => {
if (res.data.resultCode == 1) {
this.outerVisible = false;
this.$message.success(res.data.message)
if (this.currentUpdateIndex > -1) {
this.DataList[this.currentUpdateIndex] = this.addMsg
}
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
updateData(index, id) { //修改
this.apipost('admin_get_SysMenuGet', {
MenuId: id
}, res => {
let updateList = res.data.data
this.addMsg.MenuId = id
this.addMsg.MenuName = updateList.MenuName
this.addMsg.Tier = updateList.Tier.toString()
this.addMsg.ParentId = updateList.ParentId
this.addMsg.Sort = updateList.Sort
this.addMsg.GroupingCode = updateList.GroupingCode
this.addMsg.MenuUrl = updateList.MenuUrl
this.addMsg.MenuStatus = updateList.MenuStatus.toString()
let style = JSON.parse(updateList.MenuStyle)
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)
this.addMsg.MenuStyleIcon = style.icon
this.addMsg.MenuStyleColor = style.color
}
this.currentUpdateIndex = index
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
clearMessage() {
this.addMsg = {
'Tier': '',
'MenuName': '',
'MenuUrl': '',
'ParentId': '',
'MenuStyle': '',
'MenuStatus': '0',
MenuStyleIcon: '',
MenuStyleColor: ''
}
},
resetPageIndex() {
this.msg.pageIndex = 1
this.currentPage = 1
},
submitForm(addMsg) { //提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.addData()
} else {
return false;
}
});
},
closeChangeMachie(done) { //弹出框关闭初始化弹框内表单
done();
this.resetForm('addMsg');
},
resetForm(formName) { //弹出框取消 初始化谈框内表单
this.$refs[formName].resetFields();
}
}
}
</script>
\ No newline at end of file
src/components/leaderPay2.vue
View file @ 33b8a1ca
......@@ -239,7 +239,7 @@
<th>领队退款</th>
</tr>
<tr v-for="item in TotalPriceData" v-if="item.PlanPrice > 0 || item.PlanTotalPrice > 0 || item.ExpendTotalPrice > 0">
<td>{{moneyFormat(item.CurrencyStr)}}</td>
<td>{{item.CurrencyStr}}</td>
<td>{{moneyFormat(item.PlanPrice)}}</td>
<td>{{moneyFormat(item.PlanTotalPrice)}}</td>
<td>{{moneyFormat(item.ExpendTotalPrice)}}</td>
......@@ -256,6 +256,7 @@
<input type="button" class="leader2Btn" value="查看详情" @click="Lookdetails()">
</div>
</div>
<a :href='blankUrl' id='blankLink' target="_blank" style="display:none">1</a>
</div>
</template>
<script>
......@@ -283,6 +284,7 @@ export default {
totalList:[],
isShowRemark:false,
TotalPriceData: [],
blankUrl:'',
}
},
methods: {
......@@ -380,17 +382,21 @@ export default {
Lookdetails(){
console.log(this.$route.query.id);
console.log(this.$route.query.NewCombinationNum);
this.$router.push({
name: 'leaderPay',
query: {
"id": this.$route.query.id,
NewCombinationNum:this.$route.query.NewCombinationNum,
isUpdate: true,
blank: 'y',
tab: '领队报账'
}
})
let fullPath = `/leaderPay?id=${this.$route.query.id}&NewCombinationNum=${this.$route.query.NewCombinationNum}&isUpdate=${true}&blank=y&tab=领队报账`
let dom = document.querySelector("#blankLink")
dom.href=`http://${window.location.host}/#${fullPath}`
//console.log(that.$refs.blankLink.click())
dom.click()
// this.$router.push({
// name: 'leaderPay',
// query: {
// id: this.$route.query.id,
// NewCombinationNum:this.$route.query.NewCombinationNum,
// isUpdate: true,
// blank: 'y',
// tab: '领队报账'
// }
// })
}
},
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 33b8a1ca
......@@ -40,7 +40,7 @@
<TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
:NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
<TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="TeamType==0"
<TravelPrice @saveMsg="PostConfig.IsUpdateHotel=1,SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="TeamType==0"
:PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice>
<TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" v-if="TeamType==1"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice2>
......@@ -122,6 +122,8 @@
Feature: "", //行程特色
fileList: [],
VideoStr: "", //视频地址
//是否更新酒店库存
IsUpdateHotel:0
},
//行程
FeatureData: {
......@@ -371,6 +373,7 @@
basicData.TravelInfoIsCopy = true;
}
basicData.TeamType=this.TeamType;
basicData.IsUpdateHotel=this.PostConfig.IsUpdateHotel;
this.apipost(
"travel_post_SetTravelConfigInfo",
basicData,
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 33b8a1ca
......@@ -180,12 +180,12 @@
border: 1px solid #d1d1d1;
}
._TravelPriceDetails .jiDiv{
width:800px;
._TravelPricePopover .jiDiv{
width:650px;
max-height:400px;
overflow: auto;
}
._TravelPriceDetails table {
._TravelPricePopover table {
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
......@@ -195,13 +195,13 @@
width: 100%;
}
._TravelPriceDetails table ._color_666 {
._TravelPricePopover table ._color_666 {
background-color: #ededed;
color: #666666;
padding: 5px;
}
._TravelPriceDetails table td {
._TravelPricePopover table td {
background-color: #ffffff;
padding: 9px 0;
color: #333333;
......@@ -209,7 +209,7 @@
border: 1px solid #d2d2d2;
}
._TravelPriceDetails table td._d_name {
._TravelPricePopover table td._d_name {
background-color: #ededed;
}
......@@ -257,6 +257,7 @@
.TP_Airticktid {
text-decoration: underline;
cursor: pointer;
color: #409eff;
}
.TP_noneed {
......@@ -664,7 +665,7 @@
<span class="TPsecondTitle">机票绑定</span>
</div>
<div class="TPright clearfix">
<el-popover popper-class="_TravelPriceDetails" trigger="click">
<el-popover popper-class="_TravelPricePopover" trigger="click">
<div>
<div style="margin-bottom:20px;">
开始日期
......@@ -681,28 +682,22 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="_color_666">选择</td>
<td class="_color_666">航班号</td>
<td class="_color_666">航空公司</td>
<td class="_color_666">航段</td>
<td class="_color_666">航班号/航空公司/航段</td>
<td class="_color_666">时间</td>
<td class="_color_666">PNR</td>
<td class="_color_666">机票数量</td>
<td class="_color_666">使用数量</td>
<td class="_color_666">机票数量/使用数量</td>
<td class="_color_666">绑定机位数</td>
</tr>
<tr v-for="fitem in selectFilghtList">
<td>
<el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox>
</td>
<td><span class="TP_Airticktid"
@click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span>
<td>
<span class="TP_Airticktid" @click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span> / {{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}}
</td>
<td>{{fitem.AlName}}</td>
<td>{{fitem.DepartureName}}-{{fitem.ArrivalCityName}}</td>
<td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
<td>{{fitem.PNR}}</td>
<td>{{fitem.TicketNum}}</td>
<td>{{fitem.UseAmount}}</td>
<td>{{fitem.TicketNum}} / {{fitem.UseAmount}}</td>
<td>
<el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
</td>
......@@ -812,7 +807,7 @@
<el-option :key="0" label="请选择" :value="0"></el-option>
<el-option v-for="subItem in item.HotelList" :key="subItem.ID" :label="subItem.Name" :value="subItem.ID">
<span style="float: left">{{subItem.Name}}</span>
<span style="float: right; color:red; font-size: 13px">{{ subItem.Inventory }}</span>
<span style="float: right; color:red; font-size: 13px">剩余库存:{{subItem.Inventory}} / 价格:{{subItem.CostPrice}}</span>
</el-option>
</el-select>
</td>
......@@ -1558,7 +1553,7 @@
IsMoreThanZero: 1
};
this.apipost(
"hotel_post_GetHasStockHotelList", msg,
"hotel_post_GetHasStockHotelListExt", msg,
res => {
if (res.data.resultCode == 1) {
item.HotelList = res.data.data;
......@@ -1576,7 +1571,6 @@
LineTeamId:this.PostConfig.LineteamId
}
this.apipost("sell_get_GetNewTCIDLessprice", msg,res => {
console.log(res,'res');
if (res.data.resultCode == 1) {
this.lessPriceData = res.data.data;
}else{
......@@ -1626,7 +1620,6 @@
this.DateArr.push(x.StartDate);
});
this.initCalendar();
console.log(this.priceData,'pricedate');
},
deep: true
},
......@@ -1651,5 +1644,4 @@
TravelPriceFlightList: TravelPriceFlightList
}
};
</script>
</script>
\ No newline at end of file
src/router/config.js
View file @ 33b8a1ca
......@@ -3000,12 +3000,12 @@ export default {
title: '奖项列表'
}
},
{
path: '/Rotationchart',
name: 'Rotationchart',
component: resolve => require(['@/components/activity/Rotationchart'], resolve),
, {
path: '/BmenuManagement',
name: 'BmenuManagement',
component: resolve => require(['@/components/activity/BmenuManagement'], resolve),
meta: {
title: '轮播图管理'
title: 'B2B菜单管理'
}
},
]
......
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