Skip to content

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

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

parents ce2909d4 0060f8c9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 488 deletions
src/assets/css/summaryLogin.css
View file @ c5dd3e67
......@@ -45,7 +45,7 @@
font-size:18px;
color:#333333;
}
.Summary_login_Div .icon-login-name,.icon-login-password{
.Summary_login_Div .icon-login-name, .Summary_login_Div .icon-login-password{
width:16px;
height:15px;
display:inline-block;
......
src/components/FinancialModule/BasicDocuments.vue
View file @ c5dd3e67
......@@ -271,6 +271,8 @@
background-color: white;
padding: 15px;
border: 1px solid #e0e0e0;
max-height: 400px;
overflow: auto;
}
.page_bdm .chongdi_list em{
font-size: 14px;
......@@ -591,7 +593,7 @@
<span v-else class="yixuanze_money">已选择金额：{{ChongDiMoney}}</span>
</div>
<div v-if="shifouChongDi" class="chongdi_list">
<!-- <div>
<div>
<em>发团时间：</em>
<el-date-picker class="h34"
@change="timeAdd(1)"
......@@ -600,7 +602,7 @@
value-format="yyyy-MM-dd"
range-separator="-">
</el-date-picker>
</div> -->
</div>
<div class="_kehu">
<em>{{$t('fnc.khleixing')}}：</em>
<el-select filterable v-model='ChongDiMsg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(ChongDiMsg.ClientType, '1')" class="w135 _border_b_1">
......@@ -902,7 +904,7 @@
<span v-else class="yixuanze_money">已选择金额：{{ChongDiMoney}}</span>
</div>
<div v-if="shifouChongDi" class="chongdi_list">
<!-- <div>
<div>
<em>发团时间：</em>
<el-date-picker class="h34"
@change="timeAdd(1)"
......@@ -911,7 +913,7 @@
value-format="yyyy-MM-dd"
range-separator="-">
</el-date-picker>
</div> -->
</div>
<div class="_kehu">
<em>{{$t('fnc.khleixing')}}：</em>
<el-select filterable v-model='ChongDiMsg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(ChongDiMsg.ClientType, '1')" class="w135 _border_b_1">
......@@ -1470,7 +1472,6 @@ export default {
methods:{
// 单选计算
checkdIteam(item){
console.log(item.checked)
if (item.checked) {
if (item.HangingAccountsTypeStr === '收') {
this.ChongDiMoney += item.Money
......@@ -1514,7 +1515,6 @@ export default {
this.apipost('Financial_post_GetHangingAccountList', this.ChongDiMsg, res=>{
if(res.data.resultCode == 1) {
let data = res.data.data;
console.log(data)
data.map(item=>{
item.checked = false
})
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ c5dd3e67
......@@ -1217,6 +1217,26 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "GZIncome",
// formatter: this.moneyFormat,
title: "挂账收入",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "CDIncome",
// formatter: this.moneyFormat,
title: "冲抵收入",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "ShiJiLiRun",
formatter: this.moneyFormat,
......
src/components/SalesModule/addPassenger.vue
View file @ c5dd3e67
......@@ -1860,18 +1860,21 @@
let OrderId = this.addMsg.OrderId;
let IsBed = this.addMsg.IsBed;
let Sex = this.addMsg.Sex;
this.apipost(
"sellorder_post_GetHouseDetailsByOrderID",
{TCIDs:TCIDs,OrderId:OrderId,Sex:Sex,IsBed:IsBed},
res => {
if (res.data.resultCode == 1) {
this.roomlist = res.data.data;
} else {
this.$message.error(res.data.message);
if(Sex ==1 || Sex == 2) {
this.apipost(
"sellorder_post_GetHouseDetailsByOrderID",
{TCIDs: TCIDs, OrderId: OrderId, Sex: Sex, IsBed: IsBed},
res => {
if (res.data.resultCode == 1) {
this.roomlist = res.data.data;
} else {
this.$message.error(res.data.message);
}
},
err => {
}
},
err => {}
);
);
}
},
getHouselist(Sex,TCID,OrderId,IsBed){
if(Sex ==1 || Sex == 2){
......@@ -1887,45 +1890,20 @@
},
err => {}
);
}else {
this.$message.error('请选择性别');
}
},
addhouse(){
let orderId = this.addMsg.OrderId;
let sex = this.addMsg.Sex;
this.apipost(
"sellorder_get_BatchSetOrderHouse_V2",
{orderId:orderId,sex:sex,},
res => {
if (res.data.resultCode == 1) {
this.Roominformation()
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
},
authentication() {
if (this.$route.query.guestId == 0) {
if(sex ==1 || sex == 2) {
this.apipost(
"sellorder_post_GetGusetByIDCard",
{IdCard: this.addMsg.IdCard,},
"sellorder_get_BatchSetOrderHouse_V2",
{orderId: orderId, sex: sex,},
res => {
if (res.data.resultCode == 1) {
let obj = res.data.data;
this.addMsg = obj;
this.addMsg.Sex = obj.Sex.toString();
this.addMsg.Marriage = obj.Marriage.toString();
if (this.addMsg.Marriage == "0") {
this.addMsg.Marriage = "";
}
this.addMsg.IsCriminalRecord = obj.IsCriminalRecord === null ? '' : obj.IsCriminalRecord.toString();
this.addMsg.IsDepartureRecord = obj.IsDepartureRecord.toString();
this.addMsg.Id = this.$route.query.guestId;
this.addMsg.TCID = this.$route.query.TCID;
this.addMsg.OrderId = this.$route.query.orderId;
this.Roominformation() //调取下房间信息
this.Roominformation()
} else {
this.$message.error(res.data.message);
}
......@@ -1934,6 +1912,59 @@
}
);
}
},
authentication() {
let IdCard = this.addMsg.IdCard;
if (this.$route.query.guestId == 0) {
if(IdCard.length == 18){
this.apipost(
"sellorder_post_GetGusetByIDCard",
{IdCard: this.addMsg.IdCard,},
res => {
if (res.data.resultCode == 1) {
let obj = res.data.data;
this.addMsg.SurName = obj.SurName;
this.addMsg.Name = obj.Name;
this.addMsg.ESurName = obj.ESurName;
this.addMsg.EName = obj.EName;
this.addMsg.Sex = obj.Sex.toString();
this.addMsg.MobilePhone = obj.MobilePhone;
this.addMsg.Birthday = obj.Birthday;
this.addMsg.BirthdayAddress = obj.BirthdayAddress;
this.addMsg.PassportNo = obj.PassportNo;
this.addMsg.PassportAddress = obj.PassportAddress;
this.addMsg.PassportIssued = obj.PassportIssued;
this.addMsg.PassportExpiry = obj.PassportExpiry;
this.addMsg.Nationality = obj.Nationality;
this.addMsg.Marriage = obj.Marriage.toString();
if (this.addMsg.Marriage == "0") {
this.addMsg.Marriage = "";
}
this.addMsg.Address = obj.Address;
this.addMsg.AddressDetail = obj.AddressDetail;
this.addMsg.IdentityType = obj.IdentityType;
this.addMsg.HistoryRecord = obj.HistoryRecord;
this.addMsg.Duty = obj.Duty;
this.addMsg.Remarks = obj.Remarks;
this.addMsg.IsHightSchool = obj.IsHightSchool;
this.addMsg.IsRecommend = obj.IsRecommend;
this.addMsg.Id = this.$route.query.guestId;
this.addMsg.TCID = this.$route.query.TCID;
this.addMsg.OrderId = this.$route.query.orderId;
this.Roominformation() //调取下房间信息
} else {
// this.$message.error(res.data.message);
}
},
err => {
}
);
}
}
}
},
mounted() {
......
src/components/Supplier/roomQuery2.vue
View file @ c5dd3e67
This diff is collapsed.
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ c5dd3e67
......@@ -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="PostConfig.IsUpdateHotel=1,SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="TeamType==0"
<TravelPrice @saveMsg="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>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ c5dd3e67
......@@ -814,12 +814,12 @@
</tr>
<template v-for="(subItem,subIndex) in priceData.PriceHotelList">
<tr v-for="(childItem,childIndex) in subItem.SubList">
<td style="background-color:#E6E6E6;color:#333;" v-if="childIndex==0"
:rowspan="subItem.SubList.length">{{subItem.UseDay}}</td>
<td style="background-color:#E6E6E6;color:#333;" v-if="childIndex==0" :rowspan="subItem.SubList.length">
{{subItem.UseDay}}</td>
<td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;">
<td style="text-align:left;padding-left:3px;">
<span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
<a style="color:green" v-if="childItem.HotelName!='温馨的家'">
【<template v-if="childItem.OPState==1">
......@@ -836,7 +836,7 @@
【<span style="color:green">本团使用：{{childItem.UseCount}}
{{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}}</span>】
</span>
<span style="color:#E95252;" v-if="childItem.HotelName!='温馨的家'"> 【剩余：{{childItem.RemainingInventory}}】
<span style="color:#E95252;" v-if="childItem.HotelName!='温馨的家'"> 【剩余：{{childItem.RemainingInventory}}】
</span>
</td>
<td>
......@@ -864,14 +864,18 @@
</template>
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="saveHoteluseDetail()" v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)"
:class="{'disClick':!isSaved}">{{btnText}}</button> &nbsp;
<button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=1,saveHoteluseDetail(1)"
v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)" :class="{'disClick':!isSaved}">{{btnText}}</button>
&nbsp;
<button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=2;saveHoteluseDetail(2)"
v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)"
:class="{'disClick':!isSaved}">{{btnTongBu}}</button> &nbsp;
<button class="hollowFixedBtn" :class="{'disClick':!isSaved}"
@click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button>
<template v-if="priceData.IsOpenHotel&&priceData.IsOpenHotel==1">
<br/>
<span style="color:red;font-weight:bold;" >※ 地接已关闭酒店操作,如需修改请联系地接OP.</span>
</template>
<template v-if="priceData.IsOpenHotel&&priceData.IsOpenHotel==1">
<br />
<span style="color:red;font-weight:bold;">※ 地接已关闭酒店操作,如需修改请联系地接OP.</span>
</template>
</div>
</el-dialog>
......@@ -921,9 +925,10 @@
uploadList: [],
CheckedVaule: 1, //选中值
UnCheckedVaule: 2, //没选中
UnCheckedLessPrice: 0,//不少价
UnCheckedLessPrice: 0, //不少价
isSaved: true,
btnText: '保存',
btnTongBu: '同步酒店',
//日期数组
days: [],
dateString: "2016-01-02",
......@@ -1575,14 +1580,22 @@
},
//保存酒店使用情况
saveHoteluseDetail() {
saveHoteluseDetail(type) {
var that = this;
this.Confirm("是否确定提交选中的酒店?", function () {
var str = "是否确定提交选中的酒店?";
if (type == 2) {
str = "是否同步行程酒店到地接?";
}
this.Confirm(str, function () {
if (that.isSaved) {
that.isSaved = false;
that.$emit("saveMsg");
}
that.btnText = '保存中...'
if (type == 2) {
that.btnTongBu = "同步酒店...";
} else {
that.btnText = '保存...';
}
});
},
//取消
......@@ -1602,7 +1615,8 @@
//保存完成初始化
initStatus() {
this.isSaved = true;
this.btnText = '保存'
this.btnText = '保存';
this.btnTongBu = "同步酒店";
},
//获取酒店信息
getHotelList(item, event) {
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ c5dd3e67
......@@ -84,6 +84,9 @@
<td>
<span class="spanlink" v-if='childItem.PeoplePrice==0'
@click="goUrl('ticketManagement',subItem,'门票管理')">设置</span>
<span v-else>
{{childItem.PeoplePrice}}
</span>
</td>
<td>
{{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}}
......
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