Skip to content

S
SuperMan
Commit befd54a6 authored by 吴春's avatar 吴春
Browse files
Options

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

parents cd732c85 5708332b
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 52 deletions
src/components/SingleContract.vue
View file @ befd54a6
......@@ -576,12 +576,12 @@
<tr>
<td>
<div style="margin:20px 0 10px 50px">
<el-form-item style="display:inline-block;" label="费用总额（小写）人民币" prop="C_TotalPrice">
<el-form-item style="display:inline-block;" label="费用总额（小写）" prop="C_TotalPrice">
<el-input type="text" class="w300" v-model="CtObj.C_TotalPrice"
@keyup.native="checkPrice(CtObj,'C_TotalPrice'),number_chinese(CtObj.C_TotalPrice)"
maxlength="10"></el-input>&nbsp;{{getCurrencyStr()}}
</el-form-item>
<el-form-item style="display:inline-block;" label="（大写）人民币" label-width="120px">
<el-form-item style="display:inline-block;" label="（大写）" label-width="120px">
<el-input type="text" class="w300" maxlength="50" v-model="AmountMoney"></el-input>
&nbsp;{{getCurrencyStr()}}
</el-form-item>
......
src/components/TravelManager/TravelList/SaleTripList.vue
View file @ befd54a6
<style>
@import "../../../assets/css/newTravelManager.css";
</style>
<template>
<div>
......@@ -9,9 +10,11 @@
<li>
<span>
<em>{{$t('system.table_ssLine')}}</em>
<el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID'
:key='item.LineID'>
</el-option>
</el-select>
</span>
......@@ -21,7 +24,8 @@
<em>{{$t('active.ad_xlmc')}}</em>
<el-select class='w150' v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID'
:key='item.LtID'>
</el-option>
</el-select>
</span>
......@@ -29,7 +33,7 @@
<li>
<span>
<em>{{$t('visa.v_tuanhao')}}</em>
<el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150"
<el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
......@@ -44,7 +48,7 @@
</el-select>
</span>
</li>
<li>
<li>
<span>
<em>关键字</em>
<el-input maxlength="50" v-model="queryMsg.KeyWords" class="permiss-input w150"
......@@ -56,12 +60,14 @@
</li>
</ul>
</div>
<div class="TravelTclList" v-loading="queryCommonData.loading" :element-loading-text="queryCommonData.loadingText">
<div class="TravelTclList" v-loading="queryCommonData.loading"
:element-loading-text="queryCommonData.loadingText">
<ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size='queryMsg.pageSize' :total='queryMsg.total'>
</el-pagination>
<li v-for="(item,index) in queryCommonData.dataList" :key="index" :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<li v-for="(item,index) in queryCommonData.dataList" :key="index"
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div :data-id="item.ID">
<div class="el-col" style="position:relative;width:200px">
<div v-if="item.IsWarning===1" class="travel_warning"></div>
......@@ -100,9 +106,12 @@
</div>
<div class="el-col">
<div class="d7">
<el-button v-if="item.CreateBy==CurrentUserId && item.ShareTeamType<0" @click="goToOpenTravel('TravelManager3',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button v-if="item.CreateBy==CurrentUserId"
@click="goToOpenTravel('TravelManager',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}
</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button v-if="item.TCNUMS==''&&item.CreateBy==CurrentUserId" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button>
<el-button v-if="item.TCNUMS==''&&item.CreateBy==CurrentUserId" @click="delConfig(item.ID)"
type="primary">{{$t('system.table_delete')}}</el-button>
<el-button @click="goUrlR(item)" type="primary">
{{$t('Operation.Op_tripDownLoad')}}</el-button>
</div>
......@@ -153,8 +162,8 @@
LineteamId: 0,
CreateBy: 0,
TeamType: 1,
TCNUMS:"",
KeyWords:"",//关键字
TCNUMS: "",
KeyWords: "", //关键字
},
//当前用户id
CurrentUserId: 0,
......@@ -201,7 +210,7 @@
this.queryMsg.pageIndex = 1;
this.queryMsg.currentPage = 1;
},
//删除行程
//删除行程
delConfig(ID) {
var that = this;
this.Confirm(that.$t('sm.schbnhfjscz'), function () {
......@@ -329,17 +338,17 @@
);
},
//跳转至下载
goUrlR(item){
let routeData = this.$router.resolve({
goUrlR(item) {
let routeData = this.$router.resolve({
name: 'confirmationOrderDownLoadNew',
query: {
configId:item.ID,
configId: item.ID,
cityId: 0,
tcid: item.TCID,
orderId:0,
vshowL:false,
vshowM:false,
vshowTCNUM:true,
orderId: 0,
vshowL: false,
vshowM: false,
vshowTCNUM: true,
}
})
window.open(routeData.href, '_blank')
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ befd54a6
......@@ -364,7 +364,6 @@
</li>
<li>
<button class="hollowFixedBtn" @click="resetPageIndex(),getControlList()">{{$t('pub.searchBtn')}}</button>
<!-- <button class="hollowFixedBtn" @click='goToOpenTravel("TravelManager5")'>{{$t('sm.kaituan')}}</button> -->
</li>
</ul>
</div>
......
src/components/TravelManager/TravelList/oneDayTripList.vue
View file @ befd54a6
<style>
@import "../../../assets/css/newTravelManager.css";
</style>
<template>
<div>
......@@ -9,9 +10,11 @@
<li>
<span>
<em>{{$t('system.table_ssLine')}}</em>
<el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList()" clearable>
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID'
:key='item.LineID'>
</el-option>
</el-select>
</span>
......@@ -19,9 +22,10 @@
<li>
<span>
<em>{{$t('active.ad_xlmc')}}</em>
<el-select class='w150' v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-select class='w150' v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')" clearable>
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID'
:key='item.LtID'>
</el-option>
</el-select>
</span>
......@@ -29,8 +33,15 @@
<li>
<span>
<em>{{$t('visa.v_tuanhao')}}</em>
<el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')"></el-input>
<el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')" clearable></el-input>
</span>
</li>
<li>
<span>
<em>团名</em>
<el-input v-model="queryMsg.KeyWords" class="permiss-input w150" :placeholder="$t('pub.pleaseImport')"
maxlength="50" clearable></el-input>
</span>
</li>
<li>
......@@ -47,10 +58,10 @@
<li>
<span>
<em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
......@@ -58,12 +69,14 @@
</li>
</ul>
</div>
<div class="TravelTclList" v-loading="queryCommonData.loading" :element-loading-text="queryCommonData.loadingText">
<div class="TravelTclList" v-loading="queryCommonData.loading"
:element-loading-text="queryCommonData.loadingText">
<ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size='queryMsg.pageSize' :total='queryMsg.total'>
</el-pagination>
<li v-for="(item,index) in queryCommonData.dataList" :key="index" :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<li v-for="(item,index) in queryCommonData.dataList" :key="index"
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div :data-id="item.ID">
<div class="el-col" style="position:relative;width:200px">
<div v-if="item.IsWarning===1" class="travel_warning"></div>
......@@ -101,9 +114,11 @@
</div>
<div class="el-col">
<div class="d7">
<el-button @click="goToOpenTravel('TravelManager5',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="goToOpenTravel('TravelManager',item.ID)" type="primary">
{{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">{{$t('system.ph_shanchu')}}</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">
{{$t('system.ph_shanchu')}}</el-button>
</div>
</div>
</div>
......@@ -152,10 +167,11 @@
LineId: 0,
LineteamId: 0,
CreateBy: 0,
TeamType:2,
TCNUMS:"",
TeamType: 2,
TCNUMS: "",
StartGroupDate: "",
EndGroupDate: "",
KeyWords: "", //团名
},
remarkMsg: {
TCID: 0,
......@@ -224,7 +240,9 @@
},
//获取线路列表
getLineList() {
this.apipost("line_post_GetList", {"LineDirection":3}, res => {
this.apipost("line_post_GetList", {
"LineDirection": 3
}, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
}
......@@ -303,7 +321,6 @@
err => {}
);
});
}
},
//根据当前员工所在部门获取该部门及子部门员工信息
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ befd54a6
......@@ -1729,10 +1729,10 @@
},
//选中航班选择框
getSelect(item) {
if (this.PostConfig.LineId == 14 && item.DayNum != this.PostConfig.DayNum) {
this.Error("团期行程天数和机票的行程天数不一致!请重新选择!");
return;
}
// if (this.PostConfig.LineId == 14 && item.DayNum != this.PostConfig.DayNum) {
// this.Error("团期行程天数和机票的行程天数不一致!请重新选择!");
// return;
// }
item.IsSelected = !item.IsSelected;
this.FinfoList = [];
this.selectFilghtList.forEach(x => {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ befd54a6
......@@ -1739,10 +1739,10 @@
},
//选中航班选择框
getSelect(item) {
if (this.PostConfig.LineId == 14 && item.DayNum != this.PostConfig.DayNum) {
this.Error("团期行程天数和机票的行程天数不一致!请重新选择!");
return;
}
// if (this.PostConfig.LineId == 14 && item.DayNum != this.PostConfig.DayNum) {
// this.Error("团期行程天数和机票的行程天数不一致!请重新选择!");
// return;
// }
item.IsSelected = !item.IsSelected;
this.FinfoList = [];
this.selectFilghtList.forEach(x => {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ befd54a6
......@@ -1606,10 +1606,10 @@
},
//选中航班选择框
getSelect(item) {
if (this.PostConfig.LineId == 14 && item.DayNum != this.PostConfig.DayNum) {
this.Error("团期行程天数和机票的行程天数不一致!请重新选择!");
return;
}
// if (this.PostConfig.LineId == 14 && item.DayNum != this.PostConfig.DayNum) {
// this.Error("团期行程天数和机票的行程天数不一致!请重新选择!");
// return;
// }
item.IsSelected = !item.IsSelected;
this.FinfoList = [];
this.selectFilghtList.forEach(x => {
......
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