Skip to content

S
SuperMan
Commit 0a83fa59 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 11878386 b505a8bd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 844 additions and 593 deletions
src/components/Ticketing/TicketManager.vue
View file @ 0a83fa59
......@@ -2209,7 +2209,8 @@
FlyState: "0",
LineId: 0, //线路编号
ID: 0,
TicketType: 0 //定金类型(1定，2定等)
TicketType: 0, //定金类型(1定，2定等)
IsLimit:1
},
addMsg: {
ID: "0",
......@@ -2610,7 +2611,6 @@
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
this.noData = !this.total > 0;
console.log(this.dataList,'datalist');
}
if (this.msg.ID == 0) {
this.msg.ID = "";
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 0a83fa59
......@@ -1062,6 +1062,7 @@
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
......@@ -1243,14 +1244,14 @@
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单地接数量" prop="AirticketNum">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"
@input='getNumber();getTotalPrice();getHouseNo()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单房数量" prop="SingleRoomNum">
<el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')"
......@@ -1274,12 +1275,6 @@
<el-input v-model='addMsg.VisaNum' @keyup.native="checkInteger(addMsg,'VisaNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="保险数量" prop="SaleNum">
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="拒签人数" prop="RefuseVisaNum" style="display:none;">
......@@ -1287,11 +1282,14 @@
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
&nbsp;
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="保险数量" prop="SaleNum">
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="预计用房" prop="PredictRoomNum">
<el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
......@@ -1402,8 +1400,13 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
&nbsp;
<el-col :span="4" style="display:none;">
<el-form-item label="是否可清位">
<el-select v-model='addMsg.IsCanClear' :placeholder="$t('pub.pleaseSel')">
<el-option label='可以清位' :value='0' :key='0'></el-option>
<el-option label='不可以清位' :value='1' :key='1'></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
......@@ -1445,6 +1448,7 @@
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
......@@ -2768,6 +2772,7 @@
//订单归属【HK新加，报名清单页面修改使用】
CreateBy: 0,
RefuseVisaNum:0,//拒签人数
IsCanClear:0 //是否可清位
},
//行程下载使用
travelControlTripLayerShow: false,
......@@ -3082,6 +3087,7 @@
},
res => {
if (res.data.resultCode == 1) {
console.log(res,'data');
this.IsUnion = res.data.data.IsUnion
this.isAllowUpdate = res.data.data.IsUpdatePlatOrder;
this.addObj = res.data.data.modelPrice;
......@@ -3108,6 +3114,8 @@
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
this.addMsg.IsCanClear=x.IsCanClear;
this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople;
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 0a83fa59
......@@ -264,8 +264,8 @@
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">收入</div>
<template v-if="IsHaveAuth">
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn"
@click="AddIncomeDetail" />
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn"
@click="AddIncomeDetail" />
</template>
</div>
<div class="clearfix TB_PrintDiv">
......@@ -578,7 +578,7 @@
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">成本</div>
<template v-if="IsHaveAuth">
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
</template>
</div>
<div class="clearfix TB_PrintDiv">
......@@ -1062,7 +1062,7 @@
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">非成本</div>
<template v-if="IsHaveAuth">
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
</template>
</div>
......@@ -1269,11 +1269,11 @@
</div>
</div>
<div class="Team_BtnList" v-if="IsHaveAuth">
<input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn" />
<input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn" />
<input type="button" v-if="!CloseIncomeBtn" @click="UpdateBrakeAccountStatus"
:value="(DataList&&DataList.TeamBalance&&DataList.TeamBalance.BrakeAccountStatus === 0) ? '关闭收支操作' : '开启收支操作'"
class="hollowFixedBtn" />
<input type="button" value="导出" @click="ExportExcle" class="normalBtn" />
class="hollowFixedBtn" />
<input type="button" value="导出" @click="ExportExcle" class="normalBtn" />
<input type="button" value="打印" @click.prevent="doPrint" class="normalBtn" />
</div>
<el-dialog custom-class='w350' title="合并单据" :visible.sync="zhuanLoading" center :before-close="initZhuanMsg">
......@@ -1306,7 +1306,7 @@
TCNUM: '',
FrIds: '',
},
IsHaveAuth:false,//权限判断按钮是否显示
IsHaveAuth: false, //权限判断按钮是否显示
zhuanLoading: false,
moneyAll: {
Moneyall: 0,
......@@ -1724,27 +1724,32 @@
},
//权限验证
checkHasAuth() {
this.apipost(
'travel_get_CheckBalancePaymentAuth', {
TCID: this.TCID
},
res => {
if (res.data.resultCode == 1) {
this.IsHaveAuth=true;
}
else
{
this.IsHaveAuth=false;
}
},
err => {}
)
// this.apipost(
// 'travel_get_CheckBalancePaymentAuth', {
// TCID: this.TCID
// },
// res => {
// if (res.data.resultCode == 1) {
// this.IsHaveAuth=true;
// }
// else
// {
// this.IsHaveAuth=false;
// }
// },
// err => {}
// )
}
},
mounted() {
this.TCID = this.$route.query.id;
this.OutBranchId = this.$route.query.OutBranchId;
this.CloseIncomeBtn = this.$route.query.CloseIncomeBtn;
if (this.$route.query.IsHaveAuth) {
this.IsHaveAuth = true;
} else {
this.IsHaveAuth = false;
}
this.checkHasAuth();
this.getList();
this.getAllCont();
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 0a83fa59
......@@ -1473,7 +1473,8 @@
name: 'TeamBalancePayment',
query: {
id: id,
OutBranchId: OutBranchId,
OutBranchId:OutBranchId,
IsHaveAuth:true,
blank: 'y',
tab: '团队收支明细'
}
......
src/components/activity/CouponList.vue
View file @ 0a83fa59
......@@ -82,6 +82,20 @@
</el-select>
</span>
</li>
<li>
<span>
<em>使用范围</em>
<el-select filterable v-model="msg.couponsUseScope">
<el-option :label="$t('active.cl_tongyong')" :value="1"></el-option>
<el-option :label="$t('active.cl_team')" :value="2"></el-option>
<el-option :label="$t('active.cl_qianzheng')" :value="3"></el-option>
<el-option :label="$t('active.cl_jipiao')" :value="4"></el-option>
<el-option label="门票" :value="5"></el-option>
<el-option label="车辆" :value="6"></el-option>
</el-select>
</span>
</li>
<li>
<input
type="button"
......@@ -116,6 +130,7 @@
<th>{{$t('active.cl_sxriqi')}}</th>
<th>{{$t('active.cl_sxzhuangtai')}}</th>
<th>{{$t('active.cl_gqriqi')}}</th>
<th>使用范围</th>
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('active.cl_addPp')}}</th>
<th>{{$t('system.table_operation')}}</th>
......@@ -141,7 +156,16 @@
<span v-if="item.couponEffectStatus === 2" style="color: gray">{{$t('active.cl_wsxiao')}}</span>
<span v-if="item.couponEffectStatus === 3" style="color: red">{{$t('active.cl_ygqi')}}</span>
</td>
<td>{{item.expirationDate}}</td>
<td>
<span v-if="item.couponsUseScope == 1">全场通用</span>
<span v-if="item.couponsUseScope == 2">团队</span>
<span v-if="item.couponsUseScope == 3">签证</span>
<span v-if="item.couponsUseScope == 4">机票</span>
<span v-if="item.couponsUseScope == 5">门票</span>
<span v-if="item.couponsUseScope == 6">车辆</span>
</td>
<td>
<span v-if="item.couponStatus == 1" style="color: green">{{$t('pub.normalSel')}}</span>
<span v-if="item.couponStatus == 2" style="color: gray">{{$t('active.ld_jinyong')}}</span>
......@@ -343,6 +367,8 @@
<el-option :label="$t('active.cl_team')" :value="2"></el-option>
<el-option :label="$t('active.cl_qianzheng')" :value="3"></el-option>
<el-option :label="$t('active.cl_jipiao')" :value="4"></el-option>
<el-option label="门票" :value="5"></el-option>
<el-option label="车辆" :value="6"></el-option>
</el-select>
</el-form-item>
</td>
......@@ -384,6 +410,7 @@ export default {
couponStatus: -1,
groupId: '',
branchId: '',
couponsUseScope:"",
},
rules: {
branchId: [{ required: true, message: this.$t('rule.company'), trigger: "change" }],
......@@ -471,7 +498,8 @@ export default {
if (res.data.resultCode === 1) {
// this.currentPage = res.data.data.pageCount
this.total = res.data.data.count
this.DataList = res.data.data.pageData
this.DataList = res.data.data.pageData;
console.log("DataList",this.DataList);
} else {
this.$message.error(res.data.message)
}
......
src/components/busManagement/busHandBook.vue
View file @ 0a83fa59
......@@ -9,7 +9,9 @@
text-align: center;
height: 40px;
}
.busManagerTalbe tr td{
padding:0 5px;
}
.commonBackColor {
background-color: #E6E6E6;
color: #333;
......@@ -25,7 +27,15 @@
color: #fff;
border: 1px solid #d1d1d1;
}
.addHandBook{
margin-right: 5px;
color: seagreen;
cursor: pointer;
visibility: hidden;
}
.addHandBookDIS{
visibility: visible!important;
}
</style>
<template>
<div>
......@@ -73,9 +83,10 @@
<td class="commonBackColor">ホテル</td>
<td class="commonBackColor">ホテルTEL</td>
</tr>
<tr v-for="subItem in DataObj.Details_Extends">
<tr v-for="(subItem,index) in DataObj.Details_Extends">
<td>
{{subItem.UseDate}}
<i class="iconfont icon-bumenguanli-tianjia addHandBook" :class="{'addHandBookDIS':index==0||index==DataObj.Details_Extends.length-1}" @click="addHand(index)"></i>
<el-date-picker v-model='subItem.UseDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</td>
<td>
<el-input type="text" v-model="subItem.BusType" />
......@@ -163,6 +174,7 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.DataObj = res.data.data;
console.log(this.DataObj,'dataObj');
} else {
this.Error(res.data.message);
}
......@@ -182,6 +194,30 @@
this.isSave = false;
}, err => {})
}
},
//添加
addHand(index){
var obj = {
BusContent:'',
BusType:'',
FlightNum:'',
HotelName:'',
HotelTel:'',
Id:0,
MainId:0,
UseDate:''
}
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth() + 1;
var day = date.getDate();
var UseDate = year+'-'+month+"-"+day;
obj.UseDate = UseDate
if(index==0){
this.DataObj.Details_Extends.unshift(obj)
}else{
this.DataObj.Details_Extends.push(obj);
}
}
},
mounted() {
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 0a83fa59
......@@ -92,11 +92,11 @@
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
{{outItem.NewCombinationNum}}
</td>
<td>
{{item.StartCityNames}}
<td>
{{item.OutBranchName}}
</td>
<td>
{{item.OutBranchName}}
{{item.StartCityNames}}
</td>
<td>
<div class="w120">
......
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