Skip to content

S
SuperMan
Commit 9ecdf986 authored by youjie's avatar youjie
Browse files
Options

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

parents 30d585a5 3cc9734f
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 67 deletions
src/components/FinancialModule/ConsolidationOfAccounts/index.vue
View file @ 9ecdf986
......@@ -398,8 +398,7 @@
<el-table-column v-if="msg.IsAirTicketSelect=='1'"
prop=""
:label="$t('objFill.caiwubz')"
show-overflow-tooltip
width="120">
width="160">
<template slot-scope="scope">
<div>{{scope.row.Remark}}</div>
<template v-if="scope.row.vorcherInos">
......
src/components/FinancialModule/DataAnalysis/index.vue
View file @ 9ecdf986
......@@ -380,6 +380,8 @@ export default {
this.dateTime = [sDate,eDate]
this.msg.startDate = sDate
this.msg.endDate = eDate
this.msg.LineId =14;
}else{
let eDate = moment().subtract(1, 'months').format('YYYY-MM');
if(this.msg.startDate == this.msg.endDate && this.msg.startDate== eDate){
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 9ecdf986
......@@ -1060,7 +1060,6 @@
font-size: 12px;
border: 1px solid #e5e5e5;
}
</style>
<template>
......@@ -1254,9 +1253,6 @@
</el-select>
</el-form-item>
</el-col>
</el-col>
<el-col :span="4" v-if="addMsg.TradeWay == 1">
<el-form-item :label="$t('salesModule.PlatOrder')" prop="PlatformOrder">
<el-input v-model="addMsg.PlatformOrder" @input="platformOrderMethods" :disabled="isAllowUpdate == 0">
......@@ -1437,7 +1433,7 @@
<el-col :span="4" v-else>
<el-form-item :label="$t('fnc.cjdanjia')" prop="Unit_Price">
<el-input v-model="addMsg.Unit_Price" class="w210"
@keyup.native=" checkPrice(addMsg, 'Unit_Price'); getTotalPrice();"></el-input>
@keyup.native="checkPrice(addMsg, 'Unit_Price'); getTotalPrice();"></el-input>
</el-form-item>
<el-form-item>
<p style="line-height: 18px; color: #e95252">
......@@ -1846,7 +1842,7 @@
{{ $t("active.cl_orderType") }}：<span class="RL-redType">{{$t('leader.leader_leaderGuid')}}</span>
</td>
</tr>
<tbody v-for="(item, index) in OrderDataList.leadetList" :key="index">
<tbody v-for="(item, index) in OrderDataList.leadetList" :key="`o_l_`+index">
<tr>
<td rowspan="3">
<div class="fbold over_ellipsis" style="width: 120px; cursor: pointer" :title="item.OrderId">
......@@ -2058,8 +2054,8 @@
icon="iconfont icon-rizhi1"></el-button>
</el-popover>
</el-tooltip>
<el-tooltip v-if="S_UpdateOrderMoney" class="item" effect="dark" :content="$t('objFill.bianjixiaofei')" placement="top-start"
style="float: left">
<el-tooltip v-if="S_UpdateOrderMoney" class="item" effect="dark" :content="$t('objFill.bianjixiaofei')"
placement="top-start" style="float: left">
<el-button @click="clickEditTip(item)" type="primary"
style="background-color: #00c6ff !important;border-color:#00c6ff !important;"
icon="iconfont icon-bianji-smal">
......@@ -2130,7 +2126,9 @@
<p class="RL-redType RL-remarkCon" v-if="item.GuestList.length > 0">
<span style="color: blue !important" v-for="(childItem,childIndex) in item.GuestList" :key="childIndex"
@click="goToPassenger(childItem, 2)">{{ childItem.userName }}
<span :style="childItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{childItem.IsBed==1?$t('op.TakeBed'):$t('op.NoneedBed')}}） </span>
<span
:style="childItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{childItem.IsBed==1?$t('op.TakeBed'):$t('op.NoneedBed')}}）
</span>
<span style="color:#f56c6c">{{childItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}</span>
<span style="color:#f56c6c">{{childItem.TicketOutTypeStr}}
</span>
......@@ -2141,7 +2139,8 @@
<span class="RL-redType RL-remarkCon">
<span v-for="(childItem,childIndex) in item.CancelGuestList"
:key="childIndex">{{ childItem.userName }}<span
style="color:#f56c6c">{{childItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}</span> &nbsp;&nbsp;</span>
style="color:#f56c6c">{{childItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}</span>
&nbsp;&nbsp;</span>
</span>
</p>
<span>{{ $t("salesModule.RoomInfo") }}：{{
......@@ -2181,8 +2180,10 @@
<template v-for="(uItem,uIndex) in item.OrderGuestFlightList">
<div :key="uIndex+20000">
{{uItem.GuestNames}} {{$t('salesModule.FlighInfo')}}：
<span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【{{$t('visa.v_zanding')}}】</span>
<a v-if="(item.outNotice == 1&&childItem.OrderGuestFlightList&&childItem.OrderGuestFlightList.length>1)||(uItem.TicketUnionId&&uItem.TicketUnionId>0)" @click="toTrip(item,uItem.TicketUnionId,uItem.GuestIds)"
<span v-if="uItem.IsSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
v-else>【{{$t('visa.v_zanding')}}】</span>
<a v-if="(item.outNotice == 1&&childItem.OrderGuestFlightList&&childItem.OrderGuestFlightList.length>1)||(uItem.TicketUnionId&&uItem.TicketUnionId>0)"
@click="toTrip(item,uItem.TicketUnionId,uItem.GuestIds)"
style="cursor:pointer;text-decoration:underline;color:green;">
{{ $t("Operation.Op_teamNotice") }}({{
SetNoticeMsg.OutNotice == 1 ? "OK" : $t('visa.v_zanding')
......@@ -2258,7 +2259,7 @@
}}</span>
</td>
</tr>
<tbody v-for="(childItem, childIndex) in subItem.List" :key="childIndex + 2000">
<tbody v-for="(childItem, childIndex) in subItem.List" :key="`o_s_`+subIndex+'_c_'+childIndex + 2000">
<tr>
<td rowspan="3" style="position: relative">
<span class="TC_neibu" style="float: inherit;margin-left: 5px; margin-right: 5px;position:absolute;top:10px;left:3px;
......@@ -2677,7 +2678,9 @@
<template v-for="(fourthItem,fourthIndex) in childItem.GuestList">
<span style="color: blue !important" :key="fourthIndex"
@click="goToPassenger2(msg.TCID, fourthItem.OrderId, 2)">{{ fourthItem.userName }}
<span :style="fourthItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{fourthItem.IsBed==1?$t('op.TakeBed'):$t('op.NoneedBed')}}） </span>
<span
:style="fourthItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{fourthItem.IsBed==1?$t('op.TakeBed'):$t('op.NoneedBed')}}）
</span>
<span style="color:#f56c6c">{{fourthItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}
</span>
<span v-if="fourthItem.TicketOutType==1" style="color:#409EFF;">{{fourthItem.TicketOutTypeStr}}
......@@ -2694,7 +2697,8 @@
<span class="">{{ $t("salesModule.CancelOrder") }}:</span>
<span class="RL-redType RL-remarkCon">
<span v-for="subItem in childItem.CancelGuestList">{{ subItem.userName }}<span
style="color:#f56c6c">{{subItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}</span> &nbsp;&nbsp;</span>
style="color:#f56c6c">{{subItem.VisaType==1?'('+$t('visa.v_gvisa')+')':''}}</span>
&nbsp;&nbsp;</span>
</span>
</p>
<span style="display: block">
......@@ -2702,8 +2706,7 @@
}}<span v-if="childItem.OneSex > 0"
style="color: #e95252">（{{ childItem.OneSex == 1 ?$t('objFill.dannan') : $t('objFill.dannv') }}）</span><span
v-if="childItem.ChirdNoNeedBedNum > 0"
style="color: #e95252">（{{$t('Operation.Op_childNobed')}}{{ childItem.ChirdNoNeedBedNum }}{{$t('hotel_.hotel_people')}}
）</span>：{{ childItem.OrderGuestHouseStr }}
style="color: #e95252">（{{$t('Operation.Op_childNobed')}}{{ childItem.ChirdNoNeedBedNum }}{{$t('hotel.hotel_people')}}）</span>：{{ childItem.OrderGuestHouseStr }}
<el-popover trigger="click" popper-class="RL_Scenic">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align: center">
......@@ -2726,7 +2729,8 @@
style="color: #f56c6c; margin-left: 20px; cursor: pointer">{{ $t("ground.tuiJingdian") }}</span>
</el-popover>
</span>
<p v-if="childItem.IsOneDay==1&&childItem.LuggageNum">{{$t('objFill.xinglisl')}}：{{childItem.LuggageNum}}</p>
<p v-if="childItem.IsOneDay==1&&childItem.LuggageNum">
{{$t('objFill.xinglisl')}}：{{childItem.LuggageNum}}</p>
<div>
<span v-if="
......@@ -2866,7 +2870,8 @@
</el-popover>
</div>
<div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;margin-top:10px;">
<span>{{$t('objFill.gaijiashenq')}}: {{childItem.ChangePriceTime}}{{$t('objFill.shengqingje')}}【<span
<span>{{$t('objFill.gaijiashenq')}}:
{{childItem.ChangePriceTime}}{{$t('objFill.shengqingje')}}【<span
style="color:red;">{{childItem.ChangePriceMoney}}</span>{{$t('hotel.hotel_yuan')}}】{{childItem.ChangePriceReason}}</span>
<div style="text-align:right;" v-if="childItem.ChangePriceState==1">
{{$t('objFill.dai')}}{{childItem.ChangePriceType=="2"?"OP":$t('fnc.zhuguan')}}{{childItem.ManagerExamineName}}{{$t('fnc.shenhe')}}
......@@ -2918,9 +2923,12 @@
<span class="font-color-blur">{{$t('objFill.weishenqing')}}</span>
</template>
<template v-else>
<span class="font-color-red" v-if="childItem.OrderspecialofferState === -1">{{$t('visa.v_jujue')}}</span>
<span class="font-color-org" v-if="childItem.OrderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-green" v-if="childItem.OrderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
<span class="font-color-red"
v-if="childItem.OrderspecialofferState === -1">{{$t('visa.v_jujue')}}</span>
<span class="font-color-org"
v-if="childItem.OrderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-green"
v-if="childItem.OrderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
</template>
</div>
<div class="font-color-red" v-if="childItem.OrderspecialofferId !== 0">
......@@ -3382,8 +3390,10 @@
</template>
<template v-else>
<span class="font-color-red" v-if="item.OrderspecialofferState === -1">{{$t('visa.v_jujue')}}</span>
<span class="font-color-org" v-if="item.OrderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-green" v-if="item.OrderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
<span class="font-color-org"
v-if="item.OrderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-green"
v-if="item.OrderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
</template>
</div>
<div class="font-color-red" v-if="item.OrderspecialofferId !== 0">
......@@ -3459,7 +3469,8 @@
@click="getLeaderInfo(index, item.LeaderId)" :key="item.subCode">
<span class="RL_LeaderName">{{ item.LeaderName }}【{{
getLeaderTypeStr(item.Type, item.LeaderGuidClass)
}}】【{{$t('salesModule.Passport')}}：{{item.Passport}} {{$t('hotel.table_tel')}}:{{item.MobilePhone}} {{$t('objFill.shengfenzheng')}}:{{item.IdCard}}】</span>
}}】【{{$t('salesModule.Passport')}}：{{item.Passport}} {{$t('hotel.table_tel')}}:{{item.MobilePhone}}
{{$t('objFill.shengfenzheng')}}:{{item.IdCard}}】</span>
</div>
</div>
</div>
......@@ -4102,7 +4113,7 @@
orderId: 0,
unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id)
isopOperation: true,
GuestIds:'',
GuestIds: '',
},
employeeMsg: {
BranchId: "-1",
......@@ -4451,7 +4462,7 @@
);
})
.catch(() => {
this.$message.info(this.$t('pub.cancelBtn')+'！');
this.$message.info(this.$t('pub.cancelBtn') + '！');
});
},
//上传
......@@ -4539,11 +4550,11 @@
// 20190807 新增追加团款 提交按钮
submitZhuiJiaTuanKuan() {
if (!this.zhuijiaMsg.ChangePrice) {
this.$message.error(this.$t('objFill.qingsrzjje')+'!');
this.$message.error(this.$t('objFill.qingsrzjje') + '!');
return;
}
if (!this.zhuijiaMsg.OP_Remarks) {
this.$message.error(this.$t('rule.EnterMark')+'!');
this.$message.error(this.$t('rule.EnterMark') + '!');
return;
}
this.apipost(
......@@ -5184,13 +5195,13 @@
},
});
},
toTrip: function (obj, TicketUnionId,GuestIds) {
toTrip: function (obj, TicketUnionId, GuestIds) {
this.tripObj.tcid = obj.TCID;
this.tripObj.configId = obj.ConfigId;
this.tripObj.orderId = obj.OrderId;
this.tripObj.cityId = obj.DepartureCityId;
this.tripObj.unionfid =0;
this.tripObj.GuestIds =GuestIds;
this.tripObj.unionfid = 0;
this.tripObj.GuestIds = GuestIds;
if (TicketUnionId) {
this.tripObj.unionfid = TicketUnionId;
}
......@@ -6309,7 +6320,7 @@
}
if (item.PositionType == 2) {
this.NowInfo.DuringHoliday =
item.StartDate + " "+this.$t('OrderList.zhi')+" " + item.EndDate;
item.StartDate + " " + this.$t('OrderList.zhi') + " " + item.EndDate;
this.NowInfo.date = this.ConfigData.Config.TCNUM;
}
if (item.PositionType == 3) {
......@@ -6484,9 +6495,9 @@
SetOutNotice() {
var that = this;
this.Confirm(
this.$t('objFill.shifou')+"【" +
this.$t('objFill.shifou') + "【" +
(that.SetNoticeMsg.OutNotice == 1 ? this.$t('visa.v_zanding') : this.$t('pub.sureBtn')) +
"】"+this.$t('Operation.Op_teamNotice')+'?',
"】" + this.$t('Operation.Op_teamNotice') + '?',
function () {
if (that.SetNoticeMsg.OutNotice == 0) {
that.SetNoticeMsg.OutNotice = 1;
......@@ -6809,7 +6820,7 @@
//恢复订单
RecoverOrder(item) {
var _this = this;
this.Confirm(that.$t('objFill.querenyhfcddm'), function () {
this.Confirm(_this.$t('objFill.querenyhfcddm'), function () {
_this.apipost(
"sellorder_post_RecoverOrderService", {
OrderId: item.OrderId,
......@@ -6976,5 +6987,4 @@
},
},
};
</script>
\ No newline at end of file
src/components/administrative/ContractManage.vue
View file @ 9ecdf986
......@@ -42,7 +42,6 @@
.ContractManage .Ec_cha:hover {
color: red;
}
</style>
<template>
......@@ -51,7 +50,8 @@
<ul>
<li>
<span><em>{{$t('objFill.hetongbh')}}</em>
<el-input class="w210" v-model="msg.T_ContractNum" :placeholder="$t('objFill.qingshurhtbh')" @keyup.enter.native="getList">
<el-input class="w210" v-model="msg.T_ContractNum" :placeholder="$t('objFill.qingshurhtbh')"
@keyup.enter.native="getList">
</el-input>
</span>
</li>
......@@ -67,25 +67,29 @@
</li>
<li>
<span><em>{{$t('objFill.jiafangmc')}}</em>
<el-input class="w210" v-model="msg.Tourists_Name" :placeholder="$t('rule.EnterCusNameC')" @keyup.enter.native="getList">
<el-input class="w210" v-model="msg.Tourists_Name" :placeholder="$t('rule.EnterCusNameC')"
@keyup.enter.native="getList">
</el-input>
</span>
</li>
<li>
<span><em>{{$t('objFill.kehudianh')}}</em>
<el-input class="w210" v-model="msg.Tourists_Tel" :placeholder="$t('objFill.qingsrkhdh')" @keyup.enter.native="getList">
<el-input class="w210" v-model="msg.Tourists_Tel" :placeholder="$t('objFill.qingsrkhdh')"
@keyup.enter.native="getList">
</el-input>
</span>
</li>
<li>
<span><em>{{$t('visa.v_tuanhao')}}</em>
<el-input class="w210" v-model="msg.C_TCNUM" :placeholder="$t('visa.v_shurutuanhao')" @keyup.enter.native="getList">
<el-input class="w210" v-model="msg.C_TCNUM" :placeholder="$t('visa.v_shurutuanhao')"
@keyup.enter.native="getList">
</el-input>
</span>
</li>
<li>
<span><em>{{$t('system.query_lineName')}}</em>
<el-input class="w210" v-model="msg.C_ProductName" :placeholder="$t('system.ph_lineName')" @keyup.enter.native="getList">
<el-input class="w210" v-model="msg.C_ProductName" :placeholder="$t('system.ph_lineName')"
@keyup.enter.native="getList">
</el-input>
</span>
</li>
......@@ -110,15 +114,15 @@
</li>
<li>
<span><em>{{$t('scen.sc_temID')}}</em>
<el-input class="w210" v-model="msg.TCID" :placeholder="$t('objFill.qingsrtdbh')" @keyup.enter.native="getList" clearable
@clear="getList">
<el-input class="w210" v-model="msg.TCID" :placeholder="$t('objFill.qingsrtdbh')"
@keyup.enter.native="getList" clearable @clear="getList">
</el-input>
</span>
</li>
<li>
<span><em>{{$t('hotel.order_Number')}}</em>
<el-input class="w210" v-model="msg.OrderId" :placeholder="$t('rule.qsrdingdanhao')" @keyup.enter.native="getList" clearable
@clear="getList">
<el-input class="w210" v-model="msg.OrderId" :placeholder="$t('rule.qsrdingdanhao')"
@keyup.enter.native="getList" clearable @clear="getList">
</el-input>
</span>
</li>
......@@ -180,7 +184,8 @@
</td>
<td>{{ item.T_ContractNum }}</td>
<td style="text-align:left">
<span v-if="item.Tourists_Sign&&item.Tourists_Sign!=''" style="color:green;">【{{$t('objFill.yiqianzi')}}】</span>
<span v-if="item.Tourists_Sign&&item.Tourists_Sign!=''"
style="color:green;">【{{$t('objFill.yiqianzi')}}】</span>
<span v-else style="color:red;">【{{$t('objFill.weiqianzi')}}】</span>
{{ item.Tourists_Name }}
</td>
......@@ -319,25 +324,21 @@
//提交并盖章
SubmitContract(item) {
var that = this;
this.Confirm(that.$t('objFill.shifoutjbgzcht'), function () {
console.log(res,'----444')
this.apipost(
"travelcontract_post_UpdateTravelContractStatusService", {
var tipMsg = that.$t('objFill.shifoutjbgzcht');
var postMsg = {
ID: item.ID,
Status: 1
},
}
this.Confirm(tipMsg, function () {
that.apipost("travelcontract_post_UpdateTravelContractStatusService", postMsg,
res => {
console.log(res,'----111')
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
} else {
console.log('----22')
that.Error(res.data.message);
}
},
err => { console.log(res,'----333')}
);
}, null);
});
},
//复制合同
......@@ -525,5 +526,4 @@
}
}
};
</script>
\ No newline at end of file
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