Skip to content

S
SuperMan
Commit 30290908 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents defae2b3 cd23bab8
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 60 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 30290908
......@@ -1798,7 +1798,7 @@
<div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')"
@click='getHouse(item)'>{{$t('salesModule.UpdateRoom')}}
</div>
<div v-if="item.isOrder=='1'&&item.orderState!='4' && TransferMission ==true" @click="transfer(item)">{{$t('salesModule.UpdateRoom')}}{{$t('salesModule.OrderGroup')}}</div>
<div v-if="item.isOrder=='1'&&item.orderState!='4' && TransferMission ==true" @click="transfer(item)">{{$t('salesModule.OrderGroup')}}</div>
<div v-if="item.orderState=='1'||item.orderState=='2'"
@click='setChargeLoss(item)'>
<span v-if="item.isChargeLossOrders==1">{{$t('salesModule.LossSheet')}}</span>
......
src/components/SalesModule/yingyanMap.vue
View file @ 30290908
......@@ -21,7 +21,7 @@
<div v-show="mapType == 1" class="titleSjx"></div>
</div>
<div @click="getType(2)">
<i class="iconfont icon-guijitu"></i> {{ $t("fnc.dqzhuangtai") }}
<i class="iconfont icon-guijitu"></i>
{{ $t("salesModule.GuijiSearch") }}
<div v-show="mapType == 2" class="titleSjx"></div>
</div>
......
src/components/SalesVisa/VisaProductEditOrder.vue
View file @ 30290908
......@@ -171,7 +171,7 @@
<el-button v-show='item.visaManagementId>0' type="primary" style='background:#00a1f1; border-color:#00a1f1' @click='goUrlT(item)' icon="iconfont icon-bumen"></el-button>
</el-tooltip>
<el-tooltip effect="dark" :content="$t('salesModule.ApplyInvoice')" placement="top-start">
<el-button v-show='item.visaManagementId>0' type="primary" style='background:#607D8B; border-color:#607D8B' @click='goUrlAdd("invoicesManagerAdd", item.id, item.visaId, item.CustomerId, 2)' icon="iconfont icon-rizhi1"></el-button>
<el-button type="primary" style='background:#607D8B; border-color:#607D8B' @click='goUrlAdd("invoicesManagerAdd", item.id, item.visaId, item.CustomerId, 2)' icon="iconfont icon-rizhi1"></el-button>
</el-tooltip>
<el-tooltip v-if="item.income<=0&&(item.visaOrderStatus==1||item.visaOrderStatus==3)" class="item" effect="dark" :content="$t('pub.cancelBtn')" placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;' icon="iconfont icon-xingzhuangkaobei" @click='cancelOrder(item)'></el-button>
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ 30290908
......@@ -103,33 +103,40 @@
<li>
<span>
<em>{{$t('system.table_company')}}</em>
<el-select class="w150" filterable :placeholder="$t('sm.company')" v-model="queryMsg.OutBranchId">
<el-select filterable :placeholder="$t('sm.company')" v-model="queryMsg.OutBranchId">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue2'></el-option>
<el-option v-for='item in queryCommonData.BranchList' :key="item.Id" :label="item.BName" :value="item.Id">
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('advmanager.v_line')}}</em>
<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>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('advmanager.v_xilie')}}</em>
<el-select class='w150' v-model="queryMsg.ltID" 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>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('system.table_ssLine')}}</em>
<el-select v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<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>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select v-model="queryMsg.PlaceID" 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.PlaceList" :label="item.PlaceName" :value="item.PlaceID" :key="item.LtID"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('active.ad_xlmc')}}</em>
<el-select v-model="queryMsg.ltID" 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>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('fnc.tuanqi')}}</em>
......@@ -143,7 +150,7 @@
<span>
<em>机位占比</em>
<el-input class="w100" type="text" placeholder="" v-model="queryMsg.TicketStartNum" @keyup.native="checkPrice(queryMsg,'TicketStartNum')" maxlength="3">
</el-input>—
</el-input> —
<el-input class="w100" type="text" placeholder="" v-model="queryMsg.TicketEndNum" @keyup.native="checkPrice(queryMsg,'TicketEndNum')" maxlength="3">
</el-input>
</span>
......@@ -235,6 +242,7 @@ export default {
LineList: [],
//系列列表
LineTeamList: [],
PlaceList:[],//目的地
//公司数据
BranchList: [],
//公用下拉默认
......@@ -249,6 +257,7 @@ export default {
pageSize: 50,
LineID: 0,
ltID: 0,
PlaceID:0,
OutBranchId: -1,
QStartDate: "",
QEndDate: "",
......@@ -292,23 +301,42 @@ export default {
err => {}
);
},
//获取线路列表
//获取线路列表
getLineList() {
this.apipost(
"line_post_GetAllList_V2",
{ LineDirection: 2 },
"line_post_GetList",
{
LineDirection: 2
},
res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = [];
this.queryCommonData.LineTeamList = [];
}
}
);
},
//获取目的地列表
getLinePlaceList() {
this.queryMsg.PlaceID = 0;
this.queryMsg.LineteamId = 0;
let msg = {
lineID: this.queryMsg.LineId
};
this.apipost("team_post_GetLinePlace", msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.PlaceList = res.data.data;
this.queryCommonData.LineTeamList = [];
}
});
},
//获取系列列表
getLineTeamList() {
this.queryMsg.ltID = 0;
this.queryMsg.LineteamId = 0;
let msg = {
lineID: this.queryMsg.LineID,
lineID: this.queryMsg.LineId,
placeID: this.queryMsg.PlaceID,
isTOOP: 1
};
this.apipost("team_post_GetList", msg, res => {
......
src/components/administrative/model/Voting.vue
View file @ 30290908
......@@ -2,35 +2,14 @@
<div class="Voting">
<div class="Voting-box">
<div class="tit">
<p>占位占位投票（单选）</p>
<p>{{NowVoteData.Title}}</p>
</div>
<div class="list">
<div class="item" :class="{'active': radio === '1'}">
<el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="1">这里是A选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
</div>
<div class="item" :class="{'active': radio === '2'}">
<el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="2">这里是B选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
</div>
<div class="item" :class="{'active': radio === '3'}">
<el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="3">这里是C选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
</div>
<div class="item" :class="{'active': radio === '4'}">
<el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="4">这里是D选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
</div>
<div class="item" :class="{'active': radio === '1'}">
<el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="1">这里是A选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
</div>
<div class="item" :class="{'active': radio === '2'}">
<el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="2">这里是B选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
</div>
<div class="item" :class="{'active': radio === '3'}">
<el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="3">这里是C选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
</div>
<div class="item" :class="{'active': radio === '4'}">
<el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" label="4">这里是D选项的答案，如果你觉得投票该选这里，那就点击前面圆框</el-radio>
<div class="item" :class="{'active': radio === item.ID}" v-for="(item, index) in NowVoteData.VoteOptionsList">
<el-radio text-color="#ffffff" fill="#ffffff" v-model="radio" :label="item.ID">{{item.OptionsName}}</el-radio>
</div>
</div>
<div class="btn">
<div class="btn" @click="TP()">
<div>确认提交</div>
</div>
</div>
......@@ -40,15 +19,38 @@
<script>
export default {
name: 'Voting',
props: {
NowVoteData: {
type: Object,
default: {}
}
},
data () {
return {
radio: 1
radio: 1,
}
},
activated () {},
created () {},
mounted () {},
methods: {}
mounted () {
},
methods: {
TP: function () {
let data = this.NowVoteData
data.VoteOptionsList.map(x=>{
if (x.ID === this.radio) {
x.IsCheck = 1
} else {
x.IsCheck = 0
}
})
this.apipost('user_post_SetEmployeeVote', data, r=>{
if (r.data.resultCode === 1) {
this.MsgBus.$emit('closeVotingBox');
}
}, null)
}
}
}
</script>
......@@ -62,6 +64,8 @@ export default {
background: rgba(0, 0, 0, 0.19);
position: absolute;
z-index: 2019129;
left: 0;
top: 0;
}
.Voting div.Voting-box{
width:800px;
......@@ -114,5 +118,10 @@ export default {
color: white;
background:rgba(233,82,82,1);
border-radius:5px;
cursor: pointer;
}
.Voting .el-radio{
width: 100%;
height: 100%;
}
</style>
src/components/clientConfirm.vue
View file @ 30290908
......@@ -276,7 +276,7 @@
<template>
<div class="dic_content" :class="dialogVisible?'CisHideen':''">
<!-- 签字 -->
<div v-show="signShow&&dataList.companySignature!=''" class="signSpan">
<div class="signSpan">
<div @click="goUrl" class="sign">
<!-- <span><span class="sp1"></span></p> -->
<p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>
......
src/components/index.vue
View file @ 30290908
......@@ -1126,7 +1126,7 @@
</div>
</div>
<!-- 投票 -->
<Voting v-show="false"></Voting>
<Voting v-show="VotingShow" :NowVoteData="NowVoteData"></Voting>
</div>
</template>
......@@ -1380,6 +1380,8 @@ export default {
}
]
},
VotingShow: false,
NowVoteData: {}
};
},
filters: {
......@@ -1606,6 +1608,16 @@ export default {
},
mounted() {
let that = this;
this.apipost('user_post_GetNowVote', {}, r=>{
if (r.data.resultCode === 1){
this.NowVoteData = r.data.data
this.VotingShow = true
}
}, null)
this.MsgBus.$on('closeVotingBox', function () {
that.VotingShow = false
that.NowVoteData = {}
});
this.MsgBus.$on('doudong',function(){
that.dou()
});
......
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