Skip to content

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

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

parents 54012cdc a2c84dae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 892 additions and 320 deletions
src/components/Details.vue
View file @ d93666c6
......@@ -572,6 +572,12 @@ export default {
case "/LianMengManagementList": //客户联盟客户列表
path = "/LianMengManagement";
break;
case "/happyMoneyDetails": // 红包结算
path = "/LianMengManagement";
break;
case "/happyMoney": // 红包结算
path = "/LianMengManagement";
break;
}
//找到Root
......@@ -795,6 +801,12 @@ export default {
case "/LianMengManagementList": //客户联盟客户列表
path = "/LianMengManagement";
break;
case "/happyMoneyDetails": // 红包结算
path = "/LianMengManagement";
break;
case "/happyMoney": // 红包结算
path = "/LianMengManagement";
break;
}
//找到Root
......
src/components/FinancialModule/FinancialSubmodule/JiPiaoBillModule.vue
View file @ d93666c6
......@@ -70,39 +70,44 @@
<td height="34px">{{item.EmName}}</td>
</tr>
</template>
<tr v-if="details&&details.length<2">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="details&&details.length<3">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="details&&details.length<4">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<tr v-else-if="details&&details.length<1">
<td colspan="9" height="34px" style="text-align: center">暂无数据</td>
</tr>
<template v-else>
<tr v-if="details&&details.length<2">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="details&&details.length<3">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="details&&details.length<4">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
</template>
</table>
</div>
</div>
......@@ -134,10 +139,10 @@ export default {
this.loading = true
this.apipost('Financial_post_GetTicketFinanceRelevance', {FrId: this.FrID}, res=>{
if(res.data.resultCode == 1) {
this.loading = false
let data= res.data.data;
this.details = data;
}
this.loading = false
}, null)
}
}
......
src/components/FinancialModule/RecPayQuery.vue
View file @ d93666c6
......@@ -903,7 +903,7 @@ export default {
this.msg.AccountType=15;
this.msg.TradeWay=4;
this.getAccountList(this.msg.AccountType,this.msg.TradeWay)
this.msg.BankID=14;
this.msg.BankID=this.$route.query.BankID;
this.transactionDate[0]=this.$route.query.StartDate;
this.transactionDate[1]=this.$route.query.StartDate;
}
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ d93666c6
......@@ -522,8 +522,12 @@ tr._item_list td:last-child {
<el-option value="4" label="国内票务"></el-option>
<el-option value="5" v-if="isShowType" label="散卖机票"></el-option>
<el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
<el-option value="12" v-if="isShowType" label="日本地接部专户(人民币)"></el-option>
<el-option value="7" v-if="isShowType" label="老挝地接部专户"></el-option>
<el-option value="8" label="票务部专户"></el-option>
<el-option value="9" v-if="isShowType" label="酒店住宿"></el-option>
<el-option value="10" v-if="isShowType" label="景点门票"></el-option>
<el-option value="11" v-if="isShowType" label="餐厅美食"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -649,8 +653,11 @@ Vue.component("TCIDJump", {
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6||rowData.DataType===7||rowData.DataType===12">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===8">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===9">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===10">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===11">{{rowData.TCID}}</span>
</div>
`,
......@@ -689,7 +696,11 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===12" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===8" @click="goAIR('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===9">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===10">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===11">{{rowData.TCNUM}}</span>
</div>`,
props: {
rowData: {
......@@ -712,6 +723,9 @@ Vue.component("TCNUMJump", {
if(rowData.DataType===7){
BankID=15;
}
if(rowData.DataType===12){
BankID=19;
}
if(rowData.TCNUM.indexOf('JAP')!=-1 || rowData.TCNUM.indexOf('LAO')!=-1){
StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
}
......
src/components/Hotel/roomQuery.vue
View file @ d93666c6
......@@ -134,7 +134,7 @@
<th width="100">地接状态</th>
</tr>
<tr v-if="dataList.length==0">
<td colspan="11">暂无数据</td>
<td colspan="13">暂无数据</td>
</tr>
<template v-for="(outItem,outindex) in dataList">
<tbody :class="{roomQuerySplitTrCss:outindex%2!=0}">
......@@ -381,7 +381,6 @@
});
}
this.dataList = sourceData;
console.log("this.dataList",this.dataList)
} else {
this.$message.error(res.data.message)
}
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ d93666c6
......@@ -98,7 +98,7 @@
{{item.StopPrice >= 0 && item.StopPrice !== null ? moneyFormat(item.StopPrice) : ''}}
</td>
<td>
{{moneyFormat((item.PayType === 1 ? (item.HighSpeedPayType === 1 ? item.HighSpeedPrice + Number(item.CostPrice) : Number(item.CostPrice)) : 0) + Number(item.StopPrice))}}
{{moneyFormat( item.HighSpeedPrice + Number(item.CostPrice) + Number(item.StopPrice))}}
<!-- {{Number(moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))) <= 0 ? '' : moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))}} -->
</td>
<td v-if='index==0' :rowspan='list.BusList.length'>
......@@ -747,11 +747,10 @@
deleteSelfPlayingExpendList(outIndex, index) {
this.list.OtherOrderReportList.SelfPlayingExpendList.splice(index, 1)
},
busTotalPrice(obj) {
busTotalPrice(obj) {
let totalPrice = 0
obj.forEach(item => {
totalPrice += (item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(
item.HighSpeedPrice) : 0) + Number(item.StopPrice)
totalPrice += Number(item.CostPrice) + Number(item.HighSpeedPrice) + Number(item.StopPrice)
})
return this.moneyFormat(totalPrice)
},
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ d93666c6
......@@ -22,8 +22,17 @@
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li><span><em>餐厅</em>
<el-select v-model="msg.QDiningID" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in DiningList" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
<button class="normalBtn" type="button" @click="DownLoadDinner()">下载</button>
</li>
</ul>
</div>
......@@ -175,7 +184,10 @@
EndDate: '',
currentPage: 1,
total: 0,
QDiningID: 0, //餐厅编号
},
//餐厅列表
DiningList: [],
LineList: [],
LineTeamList: [],
thLengthTitle: [],
......@@ -292,6 +304,33 @@
}
}, err => {})
},
//获取餐厅列表
GetDinnerList() {
this.DiningList = [];
this.apipost(
"dining_post_GetList", {
QCountry: 651,
},
res => {
if (res.data.resultCode == 1) {
this.DiningList = res.data.data;
}
}
);
},
//餐厅下载
DownLoadDinner() {
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
};
let fileName = "餐厅下载" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("dinner_get_downloadDinner", qMsg, fileName,
res => {
this.loading = false;
});
}
},
mounted() {
let myDate = new Date();
......@@ -306,7 +345,8 @@
let height = window.innerHeight - 65 - 164;
this.boxHeight = height;
this.offsetwidth = width;
this.getList()
this.GetDinnerList();
this.getList();
},
}
......
src/components/SalesModule/CustomerAnalysis.vue
View file @ d93666c6
......@@ -97,7 +97,7 @@
<p style="color:#93959A;font-size:10px">本年预计收益</p>
</div>
<div style="margin-top:20px">
<p style="color:#2C3343"><span style="font-size:14px">￥</span><span style="font-size:20px">{{datainfo.totalYearPrice}}</span></p>
<p style="color:#2C3343"><span style="font-size:14px">￥</span><span style="font-size:20px">{{datainfo.allianceTotalYearPrice}}</span></p>
<p style="color:#93959A;font-size:10px">本年交易金额</p>
</div>
<div style="margin-top:20px">
......
src/components/SalesModule/CustomerCertification.vue
View file @ d93666c6
......@@ -128,6 +128,7 @@
<th width="10%">电话</th>
<th width="10%">交易金额</th>
<th width="10%">地址</th>
<th width="10%">所属联盟</th>
<th width="10%">申请时间</th>
<th width="10%">申请状态</th>
<th width="10%">操作</th>
......@@ -141,6 +142,7 @@
<td>{{item.ContactPhone}}</td>
<td>{{item.TradeMoney}}</td>
<td>{{item.Addres}}</td>
<td>{{item.AllianceName}}</td>
<td>{{item.CreateDateStr}}</td>
<td>
<span v-if="item.ApplyState === 0" class="_status_str _status_str_y">审核中</span>
......
src/components/SalesModule/MyCustomer.vue
View file @ d93666c6
......@@ -7,7 +7,7 @@
z-index: 50; bottom:0;left: 0;border-top:3px solid #38425d;background-color:#f9f9f9; padding: 10px;width: 100%;min-width: 1146px;}
.page_MyCustomer .edHeightOne{display: block!important;height: 450px;}
.page_MyCustomer ._mc_list{overflow-x: auto; background: #fff; padding-top: 20px; padding-left: 15px;}
.page_MyCustomer ._mc_list>ul>li{padding: 20px 20px 0 20px;width: 260px;box-sizing: border-box; height:386px;
.page_MyCustomer ._mc_list>ul>li{padding: 20px 20px 0 20px;width: 260px;box-sizing: border-box; height:410px;
float: left;border: 1px solid #F1F2F5;background: #fff; margin-right:10px;margin-bottom: 20px; border-radius: 10px; position: relative; cursor: pointer;}
.page_MyCustomer ._mc_list>ul>li:hover{box-shadow:0px 0px 10px rgba(191,191,191,1);transition: all linear 0.3s;}
.page_MyCustomer ._mc_list>ul>li .iconDelete{cursor: pointer; display: none; position: absolute; top: -4px; right: 0; color: #E95252; z-index: 5; }
......@@ -148,8 +148,9 @@
<div class="_bt">
<el-row :gutter="24">
<el-col :span="18">
<p>累计交易额度 <span> {{item.tradeTotal}}</span></p>
<p>询价与需求 <span> {{item.inquireCount}}</span></p>
<p>累计交易额度 <span> {{item.tradeTotal}}</span></p>
<p>询价与需求 <span> {{item.inquireCount}}</span></p>
<p>所属联盟 <span> {{item.allianceName}}</span></p>
</el-col>
<el-col :span="6" style="text-align:right;padding:0">
<span class="xqBtn" @click.stop="goUrC('CustomerAnalysis',item.customerId)">详情</span>
......
src/components/SalesModule/customerTransfer.vue
View file @ d93666c6
......@@ -110,6 +110,7 @@
<th width="7%">联系人</th>
<th width="10%">联系电话</th>
<th width="20%">地址</th>
<th width="7%">所属联盟</th>
<th width="8%">所属销售</th>
<th width="8%">客户状态</th>
<th width="5%">交易额</th>
......@@ -140,6 +141,7 @@
{{item.ContactNumber}}
</td>
<td>{{item.Address}}</td>
<td>{{item.AllianceName}}</td>
<td>{{item.EmName}}</td>
<td>{{valueToWord(item.CustomerStatus)}}</td>
<td>{{item.TotalPrice}}</td>
......
src/components/SalesModule/groupTourOrder.vue
View file @ d93666c6
......@@ -932,8 +932,8 @@
</el-col>
<el-col :span="4">
<el-form-item label="单男单女">
<el-radio v-model="addMsg.OneSex" :label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" :label="2">女</el-radio>
<el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" :label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(2)" :label="2">女</el-radio>
</el-form-item>
</el-col>
</el-row>
......@@ -1521,7 +1521,7 @@
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;">
<span :title="item.orderId" @click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</span>
<span style="font-weight: 100;" v-if="item.scoreNum >= 0" @click='goInvetig("investigationList", item.tcid, item.orderId)'>(评分{{item.scoreNum}})</span>
<span style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;" v-if="item.scoreNum >= 0" @click='goInvetig("investigationList", item.tcid, item.orderId)'>(评分{{item.scoreNum}})</span>
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip></p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
......@@ -2262,6 +2262,9 @@
}
},
methods: {
setDanren(e){
e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
},
gourlTip(path,id){
this.$router.push({
name: path,
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ d93666c6
......@@ -1762,7 +1762,7 @@
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">
<span>{{item.orderId}}</span>
<span style="font-weight: 100;cursor:pointer;" v-if="item.scoreNum >= 0"
<span style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;" v-if="item.scoreNum >= 0"
@click='goInvetig("investigationList", item.tcid, item.orderId)'>(评分{{item.scoreNum}})</span>
<!-- <span style="font-weight: 100;" v-if="item.scoreNum >= 0">(评分{{item.scoreNum}})</span> -->
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top"
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ d93666c6
......@@ -1534,7 +1534,7 @@
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">
<span>{{item.orderId}}</span>
<span style="font-weight: 100;" v-if="item.scoreNum >= 0" @click='goInvetig("investigationList", item.tcid, item.orderId)'>(评分{{item.scoreNum}})</span>
<span style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;" v-if="item.scoreNum >= 0" @click='goInvetig("investigationList", item.tcid, item.orderId)'>(评分{{item.scoreNum}})</span>
<!-- <span style="font-weight: 100;" v-if="item.scoreNum >= 0">(评分{{item.scoreNum}})</span> -->
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
......
src/components/SalesModule/investigationDetail.vue
View file @ d93666c6
......@@ -42,6 +42,15 @@ export default {
details: [],
texts: ['非常不满意', '不满意', '感觉一般', '满意', '非常满意']
}
},watch: {
ID: {
handler: function(val, oldVal) {
if (val !== oldVal){
this.getDetails()
}
},
deep: true
}
},mounted() {
this.getDetails()
},methods: {
......
src/components/SalesModule/investigationYouDetail.vue
View file @ d93666c6
......@@ -59,6 +59,15 @@ export default {
},
images: []
};
},watch: {
ID: {
handler: function(val, oldVal) {
if (val !== oldVal){
this.getDetails()
}
},
deep: true
}
},
mounted() {
this.getDetails();
......@@ -79,7 +88,7 @@ export default {
}
this.$viewer.show();
},
getDetails: function() {
getDetails: function() {
this.apipost(
"survey_post_GetGuestTravelNotes",
{ Id: this.ID },
......
src/components/SalesModule/productQuery.vue
View file @ d93666c6
......@@ -340,8 +340,8 @@
</el-col>
<el-col :span="4">
<el-form-item label="单男单女">
<el-radio v-model="addMsg.OneSex" label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" label="2">女</el-radio>
<el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" label="2">女</el-radio>
</el-form-item>
</el-col>
</el-row>
......@@ -1174,6 +1174,9 @@
}
},
methods: {
setDanren(e){
e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
},
groupTypeChange: function (val) {
if (val === '4') {
this.addMsg.ManNum = 0
......
src/components/SalesModule/publicCustomer.vue
View file @ d93666c6
......@@ -56,6 +56,7 @@
</th>
<th width="17%">联系电话</th>
<th width="20%">地址</th>
<th width="10%">所属联盟</th>
<th width="10%">来源</th>
<th width="8%">拜访次数</th>
<th width="10%">交易金额</th>
......@@ -72,7 +73,8 @@
<label><input type="checkbox" :value="item.CustomerId" v-model="customerList" @change="ckeckedOne" style="vertical-align: middle;"/>{{item.CustomerName}}<i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i></label>
</td>
<td><i class="iconfont icon-img_dianhua fz14" style="color:#09D49D;margin-right: 5px;"></i>{{item.ContactNumber}}</td>
<td>{{item.Address}}</td>
<td>{{item.Address}}</td>
<td>{{item.AllianceName}}</td>
<td>{{item.MarkOverType=='1'?'离职':item.MarkOverType=='2'?'申请注册':"自动释放"}}</td>
<td>{{item.VisiteCount}}</td>
<td style="color: #FF9C00;">￥{{moneyFormat(item.TotalPrice)}}</td>
......
src/components/TravelManager/TravelLeader/Leader.vue
View file @ d93666c6
......@@ -71,6 +71,7 @@
margin: 0 40px 40px 0;
float: left;
border-radius: 4px;
position: relative;
}
.Leader .topInfo {
width: 100%;
......@@ -181,6 +182,30 @@
.Leader .leftCode canvas {
height: 60px;
}
.Leader ._sanjiao_{
position: absolute;
top: 0;
left: 0;
width: 0;
height: 0;
border-top: 20px solid #e73828;
border-bottom: 20px solid transparent;
border-left: 20px solid #e73828;
border-right: 20px solid transparent;
z-index: 20;
}
.Leader ._sanjiao_:after {
content: '同';
position: absolute;
top: -15px;
left: -14px;
white-space: nowrap;
color: #FFFFFF;
font-size: 12px;
}
.Leader ._sanjiao_._sanjiao_lin:after{
content: '临';
}
</style>
<template>
<div class="flexOne Leader">
......@@ -220,6 +245,8 @@
</div>
<div class="contentDiv clearfix">
<div class="listDiv" v-for="item in DataList" :key="item.Code">
<div class="_sanjiao_" v-if="item.LeaderGuidClass==1"></div>
<div class="_sanjiao_ _sanjiao_lin" v-if="item.LeaderGuidClass==2"></div>
<div class="topInfo clearfix">
<div class="leftImg">
<div class="">
......@@ -263,9 +290,10 @@
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-form-item :label="$t('system.query_workType')" prop="Type">
<el-select v-model="addMsg.Type" :placeholder="$t('admin.admin_workType')" class="w210">
<el-option v-for='item in workTypeList' :key="item.Value" :label="item.Key" :value="item.Value">
</el-option>
<el-select v-model="addMsg.LeaderGuidClass" :placeholder="$t('admin.admin_workType')" class="w210">
<el-option key="0" label="公司领队" :value="0"></el-option>
<el-option key="1" label="同行领队" :value="1"></el-option>
<el-option key="2" label="临时领队" :value="2"></el-option>
</el-select>
</el-form-item>
<div class="cn_name clearfix">
......@@ -366,6 +394,18 @@
<el-radio label="1">{{$t('pub.singleTime')}}</el-radio>
</el-radio-group>
</el-form-item>
<template>
<el-form-item label="账号过期" v-if="addMsg.LeaderGuidClass!== '0'" prop="ValidDate" class='time'>
<el-date-picker class="w210" v-model="addMsg.ValidDate" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="账号过期" v-else class='time'>
<el-date-picker class="w210" v-model="addMsg.ValidDate" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</template>
<el-form-item :label="$t('hotel.hotel_remark')">
<el-input type="textarea" v-model="addMsg.Remarks" class="w210"></el-input>
</el-form-item>
......@@ -405,7 +445,7 @@ export default {
},
addMsg: {
ID: "0",
Type: "",
Type: 1,
EmployeeId: "",
Surname: "",
Name: "",
......@@ -425,7 +465,9 @@ export default {
LanguageId: "",
Remarks: "",
VisaNumber: "",
LeaderGuidType: ""
LeaderGuidType: "",
LeaderGuidClass: "",
ValidDate: "",
},
SexOptions: [
{
......@@ -597,6 +639,13 @@ export default {
trigger: "change"
}
],
ValidDate: [
{
required: true,
message: "请选择过期日",
trigger: "change"
}
],
BirthPlace: [
{
required: true,
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ d93666c6
......@@ -1397,7 +1397,10 @@
</el-form-item>
</el-col>
<el-col :span="4">
&nbsp;
<el-form-item label="单男单女">
<el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" :label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(2)" :label="2">女</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
......@@ -1507,7 +1510,7 @@
</div>
<div class="RL_rightNameList">
<div v-if="ConfigData.Leader.LeaderId>0&&ConfigData.Leader.LeaderName!=''">
{{ConfigData.Leader.LeaderName}}/领队
{{ConfigData.Leader.LeaderName}}/{{ConfigData.Leader.LeaderGuidClassStr}}领队
</div>
<div v-if="ConfigData.Leader.GuideId>0&&ConfigData.Leader.GuideName!=''">
{{ConfigData.Leader.GuideName}}/导游
......@@ -2482,7 +2485,7 @@
<div class="RL_ListDiv">
<div class="LeaderSpan" :class="{'ckedClass':ckedIndex==index}" v-for="(item,index) in leaderListArr"
@click="getLeaderInfo(index,item.LeaderId)" :key="item.subCode">
<span class="RL_LeaderName">{{item.LeaderName}}【{{item.Type==2?"领兼导":"领队"}}】</span>
<span class="RL_LeaderName">{{item.LeaderName}}【{{getLeaderTypeStr(item.Type, item.LeaderGuidClass)}}】</span>
</div>
</div>
</div>
......@@ -2945,6 +2948,7 @@
//订单归属【HK新加，报名清单页面修改使用】
CreateBy: 0,
RefuseVisaNum: 0, //拒签人数
OneSex: ""
},
//行程下载使用
travelControlTripLayerShow: false,
......@@ -3217,6 +3221,20 @@
commonShouSun: commonShouSun
},
methods: {
setDanren(e){
e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
},
getLeaderTypeStr: function (type, clas){
if (type == 2) {
return "领兼地"
} else if (type == 1 && clas == 0) {
return "领队"
} else if (type == 1 && clas == 1) {
return "同行领队"
} else if (type == 1 && clas == 2) {
return "临时领队"
}
},
gourlTip(path,id){
this.$router.push({
name: path,
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ d93666c6
......@@ -1191,7 +1191,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'领队佣金')">
<tr v-if="isExists(item.CostTypeList,'领队佣金') || isExists(item.CostTypeList,'领队奖励金')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ d93666c6
......@@ -373,7 +373,7 @@
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent TC_teamName">
<div class="clearfix">
<div class="TCL_remarkTitle" style="width:105px;"><span style="font-weight: 100;cursor:pointer;"
<div class="TCL_remarkTitle" style="width:105px;"><span style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;"
v-if="item.ScoreNum >= 0"
@click='goInvetig("investigationList", item.TCID, 0)'>(评分{{item.ScoreNum}})</span>
{{$t('Operation.Op_TeamName')}}：</div>
......@@ -489,9 +489,13 @@
:href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
</p>
<p class="travelnowrap" v-if="item.ClearOrderHour>0">
<span>已设定清位</span>
<span>同行清位时间</span>
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</p>
<p class="travelnowrap" v-if="item.SaleClearOrderHour>0">
<span>销售清位时间</span>
<span class="TCL-greenType">{{item.SaleClearOrderHour}}小时</span>
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
......
src/components/administrative/LianMengManagement.vue
View file @ d93666c6
......@@ -5,6 +5,7 @@
.LianMengManagement ._icon_btn i{width: 30px;height: 30px;display: inline-block;color: white !important;border-radius: 50%;text-align: center;line-height: 30px;margin-right: 10px;cursor: pointer;outline: none;}
.LianMengManagement ._icon_btn i.el-icon-edit{background-color: #47BF8C;}
.LianMengManagement ._icon_btn i.el-icon-check{background-color: #E95252;}
.LianMengManagement ._icon_btn i.el-icon-search{background-color: #E6A23C;}
</style>
<template>
<div class="LianMengManagement">
......@@ -41,8 +42,11 @@
<el-tooltip class="item" effect="dark" content="新增客户" placement="top">
<i class="edit el-icon-edit"@click="addCustorm(item)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="结算" placement="top">
<i class="edit el-icon-check"@click="addCustorm(item)" v-if="item.IsClearing == 1"></i>
<el-tooltip class="item" effect="dark" content="结算" placement="top">
<i class="edit el-icon-check" v-if="item.IsClearing == 1" @click="jiesuan(item.ID, 'happyMoney')" ></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="详情" placement="top">
<i class="edit el-icon-search" v-if="item.IsClearing == 2" @click="jiesuan(item.ID, 'happyMoneyDetails')" ></i>
</el-tooltip>
</td>
</tr>
......@@ -102,8 +106,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="dialogFormVisible=false, iniTAddMsg">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="UpdateDate('addMsg')">{{$t('pub.sureBtn')}}</el-button>
<button class="hollowFixedBtn" @click="dialogFormVisible=false, iniTAddMsg">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="UpdateDate('addMsg')">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<el-pagination
......@@ -182,15 +186,25 @@ export default {
this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID
this.getEmployee()
},methods: {
jiesuan: function (ID, path){
this.$router.push({
name: path,
query: {
id: ID,
blank: "y",
tab: '大红包结算'
}
});
},
goCustomerList: function (ID) {
this.$router.push({
name: 'LianMengManagementList',
query: {
id: ID,
blank: "y",
tab: '客户列表'
}
});
name: 'LianMengManagementList',
query: {
id: ID,
blank: "y",
tab: '客户列表'
}
});
},
EndYearChange: function () {
let Eyear = this.addMsg.EndYear ? parseInt(this.addMsg.EndYear) : 0
......
src/components/administrative/Temporarystaff.vue
View file @ d93666c6
......@@ -79,7 +79,7 @@
<th>{{$t('system.table_acc')}}</th>
<th>{{$t('adm.adm_logintel')}}</th>
<th>{{$t('admin.admin_Entrytime')}}</th>
<th>{{$t('admin.admin_Departuretime')}}</th>
<th>{{$t('hotel.hotel_status')}}</th>
<th>{{$t('admin.admin_operate')}}</th>
</tr>
<tr v-for="(item,index) in DataList" v-loading='loading'>
......@@ -185,7 +185,7 @@
:value='item.PostId'
:key='item.PostId'>
</el-option>
</el-select>
</el-select>
</el-form-item>
</td>
<td>
......
src/components/administrative/happyMoney.vue
View file @ d93666c6
......@@ -110,27 +110,37 @@
.happyMoney .avatar-uploader-icon {
height: 30px;
}
.happyMoney .normalBtn{
margin-top: 20px;
}
.happyMoney .normalBtn2{
background-color: #a0a0a0;
}
.happyMoney .normalBtn2:hover{
background-color: #a0a0a0;
border-color: #a0a0a0;
}
</style>
<template>
<div class="happyMoney">
<div class="happyMoney" v-if="show">
<div class="tit">
<div class="name">XXXXXXXXXXX2019年度大红包结算</div>
<div class="name">{{dataList.model.AllianceName + dataList.model.EndYear}}年度大红包结算</div>
</div>
<el-row>
<el-col span="16">
<el-col :span="16">
<div class="content-box">
<div class="content-box-tit">
<p>
经系统统计本联盟在
<span class="blod">2009年</span>
<span class="red">销售额为¥500万</span>,
<span class="blod">{{dataList.model.StartYear + '-' + dataList.model.EndYear}}年</span>
<span class="red">销售额为¥{{moneyFormat(dataList.model.TradeMoney)}}万</span>,
<span>合计</span>
<span class="red">人头数200人</span>
<span class="red">人头数{{dataList.model.TotalGuestNum}}人</span>
</p>
<p>
按大红包规则获得《
<span class="blod">50万-90万》返4%</span>，因而将
<span class="red">返回给本联盟50000元</span>到幸福存折，以下为所有门店交易明细，请及时确认
<span class="blod">{{dataList.commissionRatioModel.MinPrice}}元-{{dataList.commissionRatioModel.Money}}元》返{{dataList.commissionRatioModel.Ratio}}}‰</span>，因而将
<span class="red">返回给本联盟{{dataList.model.PredictPrice}}元</span>到幸福存折，以下为所有门店交易明细，请及时确认
</p>
</div>
<table
......@@ -147,13 +157,13 @@
<th>预计返现</th>
<th width="200">确认返现</th>
</tr>
<tr>
<td>XXXXXXXX旅行社</td>
<td>¥12653.00</td>
<td>1256人</td>
<td>¥9856.00</td>
<tr v-for="(item, index) in dataList.model.CustomerList">
<td>{{item.CustomerName}}</td>
<td>¥{{moneyFormat(item.TradeMoney)}}</td>
<td>{{item.TotalGuestNum}}人</td>
<td>¥{{moneyFormat(item.PredictPrice)}}</td>
<td>
<input type="number" placeholder="请输入返现金额" />
<input type="number" v-model="item.ClosePrice" @change="maxMoney(index)" placeholder="请输入返现金额" />
</td>
</tr>
</table>
......@@ -194,6 +204,9 @@
</div>
</el-col>
</el-row>
<el-row>
<input type="button" class="normalBtn" :value="$t('fnc.tijiao')" @click="subData" />
</el-row>
<div v-if="picIsShow" class="_show_img_box" @click="picIsShow=false,picObj=[]">
<div
style="position: absolute; width: 800px; height: 600px; left: 50%; top: 50%; margin-left: -400px; margin-top: -300px;"
......@@ -215,21 +228,65 @@
export default {
data() {
return {
loading: false,
saveMsg: []
loading: false,
saveMsg: [],
picIsShow: false,
show: false,
dataList: {},
};
},
mounted() {
// this.getList();
let id = this.$route.query.id
this.getList(id);
},
methods: {
getList: function() {
maxMoney: function (index) {
let allMoney = 0
this.dataList.model.CustomerList.map(x=>{
allMoney = x.ClosePrice ? parseFloat(x.ClosePrice) + allMoney : allMoney + 0
})
console.log(allMoney)
if (allMoney > this.dataList.model.PredictPrice) {
this.dataList.model.CustomerList[index].ClosePrice = 0;
this.$message.error('返现金额有误，请仔细核对');
return
}
},
subData: function () {
let allMoney = 0
this.dataList.model.CustomerList.map(x=>{
allMoney = x.ClosePrice ? parseFloat(x.ClosePrice) + allMoney : allMoney + 0
})
if (allMoney > this.dataList.model.PredictPrice) {
this.$message.error('返现金额有误，请仔细核对');
return
}
this.dataList.model.FileList = this.saveMsg
this.apipost(
"app_customer_UpdateClearingAlliance",
this.dataList,
res => {
if (res.data.resultCode === 1) {
this.$router.push({
name: 'LianMengManagement',
});
} else {
this.$message.error(res.data.message);
}
},
null
);
},
getList: function(id) {
this.show = false
this.apipost(
"",
{ TCID: TCID, OrderID: OrderID },
"app_customer_GetClearingAllianceList",
{ Id: id},
res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
console.log(res)
this.show = true;
this.dataList = res.data.data
}
},
null
......
src/components/administrative/happyMoneyDetails.vue 0 → 100644
View file @ d93666c6
<style>
.happyMoney .tit {
margin: 20px 0;
}
.happyMoney .tit .name {
width: 284px;
height: 28px;
background: #e3e3e3;
line-height: 28px;
font-size: 14px;
font-weight: bold;
color: rgba(51, 51, 51, 1);
text-align: center;
}
.happyMoney .content-box {
background-color: white;
padding: 30px 20px;
}
.happyMoney .content-box-tit {
font-size: 14px;
}
.happyMoney .content-box-tit p {
margin-bottom: 10px;
}
.happyMoney .content-box-tit p .blod {
font-weight: 800;
}
.happyMoney .content-box-tit p .red {
color: #e95252;
}
.happyMoney table tr td input {
border: none;
}
.happyMoney ._addUpload_box {
display: block;
margin-top: 15px;
}
.happyMoney ._addUpload_box img {
width: 100%;
}
.happyMoney ._addUpload_box > div {
float: left;
width: 138px;
height: 92px;
border: 1px dashed rgba(210, 210, 210, 1);
border-radius: 2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.happyMoney ._addUpload_box > div:hover {
background-color: #f5f5f5;
}
.happyMoney ._addFile_name {
padding-left: 15px;
max-width: 450px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.happyMoney ._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
margin-left: 15px;
position: absolute;
right: -6px;
top: -9px;
background-color: #f56c6c;
border-radius: 50%;
height: 20px;
width: 20px;
text-align: center;
line-height: 20px;
}
.happyMoney ._addUpload_box .icon-guanbi1:hover {
font-size: 12px;
color: #c94052;
}
.happyMoney ._addUpload_box .icon-excel,
.happyMoney ._addUpload_box .icon-pdf {
text-align: center;
font-size: 38px;
color: green;
line-height: 75px;
}
.happyMoney ._show_img_box {
position: fixed;
background: rgba(0, 0, 0, 0.6);
left: 0;
top: 0;
width: 100%;
height: 100%;
z-index: 999;
text-align: center;
}
.happyMoney ._pic_upload .el-upload-dragger {
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
.happyMoney ._pic_upload .el-upload--text.el-upload .el-upload__text {
font-size: 14px;
}
.happyMoney .avatar-uploader-icon {
height: 30px;
}
.happyMoney .normalBtn{
margin-top: 20px;
}
.happyMoney .normalBtn2{
background-color: #a0a0a0;
}
.happyMoney .normalBtn2:hover{
background-color: #a0a0a0;
border-color: #a0a0a0;
}
</style>
<template>
<div class="happyMoney" v-if="show">
<div class="tit">
<div class="name">{{dataList.AllianceName + dataList.EndYear}}年度大红包结算</div>
</div>
<el-row>
<el-col :span="16">
<div class="content-box">
<div class="content-box-tit">
{{dataList.Remarks}}
</div>
<table
class="singeRowTable"
border="0"
cellspacing="0"
cellpadding="0"
v-loading="loading"
>
<tr>
<th>名称</th>
<th>交易金额</th>
<th>交易人头</th>
<th>预计返现</th>
<th width="200">确认返现</th>
</tr>
<tr v-for="(item, index) in dataList.CustomerList">
<td>{{item.CustomerName}}</td>
<td>¥{{moneyFormat(item.TradeMoney)}}</td>
<td>{{item.TotalGuestNum}}人</td>
<td>¥{{moneyFormat(item.PredictPrice)}}</td>
<td>¥{{moneyFormat(item.PredictPrice)}}</td>
</tr>
</table>
<div class="_addUpload_box clearfix">
<template v-for="(file,fIndex) in dataList.FileList">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file)" />
</div>
</div>
<div v-if="file.Type==1">
<div
class="iconfont"
:class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
@click="showUpLoadFile(file)"
></div>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)"></div>
</div>
</template>
</div>
</div>
</el-col>
</el-row>
<div v-if="picIsShow" class="_show_img_box" @click="picIsShow=false,picObj=[]">
<div
style="position: absolute; width: 800px; height: 600px; left: 50%; top: 50%; margin-left: -400px; margin-top: -300px;"
>
<el-carousel :initial-index="initialIndex" height="600px" :interval="5000" trigger="click">
<el-carousel-item
style="height: 600px;overflow:auto;"
v-for="(item,index) in picObj"
:key="index"
>
<img :src="item" style />
</el-carousel-item>
</el-carousel>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
loading: false,
noBtn: false,
saveMsg: [],
picIsShow: false,
show: false,
dataList: {},
};
},
mounted() {
let id = this.$route.query.id
this.getList(id);
},
methods: {
getList: function(id) {
this.show = false
this.apipost(
"app_customer_GetClearingAllianceDetails",
{ Id: id},
res => {
if (res.data.resultCode === 1) {
console.log(res)
this.show = true
this.dataList = res.data.data
}
},
null
);
},
showUpLoadFile(i) {
// 预览上传文件
if (i.Type == 3) {
this.picObj.push(i.Url);
this.imgList.push(i.Url);
this.picIsShow = true;
} else {
if (
i.Content.substring(
i.Content.lastIndexOf(".") + 1,
i.Content.length
).toUpperCase() == "PDF"
) {
this.previewPDF(i.Url);
} else {
window.open(
"https://view.officeapps.live.com/op/view.aspx?src=" + i.Url
);
}
}
},
}
};
</script>
src/components/dmc/manager/dmcTotalTable.vue
View file @ d93666c6
......@@ -151,7 +151,7 @@
<table border="0" cellspacing="1" cellpadding="0" class="dmcTotalTable" v-loading="loading">
<tr>
<th colspan="11">公司通用信息</th>
<th colspan="5">团队需求表</th>
<th colspan="6">团队需求表</th>
<th colspan="10">地接op操作</th>
</tr>
<tr>
......@@ -168,6 +168,7 @@
<th width="60">导游</th>
<th width="60">已开票</th>
<th width="60">分房表</th>
<th width="60">旅客名单</th>
<th width="60">出团<br />通知书</th>
<th width="60">导游<br />计划表</th>
<th width="60">领队<br />交接表</th>
......@@ -256,7 +257,7 @@
<td>
<div class="link">
<p v-if='!item.LeaderName' @click="goUrlT('RegistrationList',item.TCID,'报名清单')">配置领队</p>
<p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName}}</p>
<p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName}}{{getLeaderTypeStr(item.LeaderGuidClass)}}</p>
</div>
</td>
<td>
......@@ -277,6 +278,9 @@
<span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单" @click="DownLoadGuestList(item)">旅客名单</a>
</td>
<td>
<div class="fz16 fbold linkspan">
<span @click="toTrip(item)" style="color: #4BCA81;" v-if="item.OutNotice==1">√</span>
......@@ -329,9 +333,10 @@
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlBus('BusInfo',item,outItem,'车配信息')">
<span style="color: #4BCA81;" v-if="item.BusResult==1">√</span>
<span class="colorE95252" v-else>{{item.BusResult=='-1'?"x":"O"}}</span>
<div class="fz16 fbold linkspan">
<span style="color: #4BCA81;" @click="goUrlBus('BusInfo',item,outItem,'车配信息')" v-if="item.BusResult==1">√</span>
<span class="colorE95252" @click="goUrlBus('BusInfo',item,outItem,'车配信息')" v-else>{{item.BusResult=='-1'?"x":"O"}}</span>
<span @click="GoShoupei(outItem)" style="cursor:pointer;text-decoration:underline;display:block;color:#666;font-size:12px;">车辆信息</span>
</div>
</td>
<td>
......@@ -340,8 +345,10 @@
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' >
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('TravelPassengerList3',item,outItem,'合团分房表')" v-if="outItem.PriceCommonList.length > 1">
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
<div class="fz16 fbold linkspan"
@click="goUrlLeaderIsApply('TravelPassengerList3',item,outItem,'合团分房表')"
v-if="outItem.PriceCommonList.length > 1">
<span style="color: #4BCA81;" v-if="item.LeaderIsApply==2">√</span>
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
......@@ -476,23 +483,23 @@
<tr>
<th>团号/时间</th>
<template v-for="(hItem,hIndex) in TeamHotelList">
<th>
{{hItem.TCNUM}}<br/>({{hItem.TCID}})
</th>
<th>
{{hItem.TCNUM}}<br />({{hItem.TCID}})
</th>
</template>
</tr>
</template>
<template v-for="(hItem,hIndex) in TeamHotelList">
<template v-for="(hSubItem,hSubIndex) in hItem.dayList">
<tr>
<td>{{hSubItem.UseTime}}</td>
<template v-for="(hSubItem,hSubIndex) in hItem.dayList">
<tr>
<td>{{hSubItem.UseTime}}</td>
<td>
<template v-if="hSubItem.subList&&hSubItem.subList.length>0">
{{hSubItem.subList[0].NewHotelName}}
</template>
</td>
</tr>
</template>
</tr>
</template>
</template>
</table>
<el-button @click="GetTeamHotelList(outItem.TCIDS)" slot="reference"
......@@ -505,7 +512,7 @@
</td>
</tr>
<tr>
<td colspan="21" style="text-align: left!important;padding:0 20px;">
<td colspan="22" style="text-align: left!important;padding:0 20px;">
<div class="link">
<p @click="getJourney(item.ConfigID,item.Title)" style="padding-top:4px;">{{item.Title}}</p>
<div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
......@@ -538,7 +545,7 @@
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
<el-dialog custom-class='w450' title="行程下载" :visible.sync="travelControlTripLayerShow" center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1">
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="2">
</tripDownLoadCommon>
</el-dialog>
......@@ -675,6 +682,13 @@
commonTeamInfo
},
methods: {
getLeaderTypeStr: function (clas){
if (clas == 1) {
return "（同行领队）"
} else if (clas == 2) {
return "（临时领队）"
}
},
getJourney(id, title) {
var that = this;
this.tripTitle = title;
......@@ -843,8 +857,8 @@
'NewCombinationNum': outItem.NewCombinationNum,
'LeaderName': obj.LeaderName,
'GuideName': obj.GuideName,
'IsCombine':outItem.PriceCommonList.length>1,
'NewTCIDs':outItem.TCIDS,
'IsCombine': outItem.PriceCommonList.length > 1,
'NewTCIDs': outItem.TCIDS,
blank: 'y',
tab: title
}
......@@ -1017,6 +1031,34 @@
}
}, err => {})
},
//下载旅客名单
DownLoadGuestList(item) {
this.loading = true;
//导出报表
let msg = {
TCID: item.TCID
};
var fileName = "旅客名单.xls";
if (item.TCNUMS != null) {
fileName =
"【" + item.TCNUMS + "】旅客名单.xls";
}
this.GetLocalFile("travel_get_GetTravelGuestExport_V2", msg, fileName,
res => {
this.loading = false;
});
},
//跳转手配书
GoShoupei(outItem) {
this.$router.push({
name: "busHandBook",
query: {
"TCID": outItem.TCIDS,
blank: 'y',
tab: "手配依赖书"
}
})
}
},
mounted() {
let myDate = new Date();
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ d93666c6
......@@ -185,11 +185,13 @@
max-height: 400px;
overflow: auto;
}
._TravelPricePopover .ScenicDiv{
._TravelPricePopover .ScenicDiv {
width: 450px;
max-height: 400px;
overflow: auto;
}
._TravelPricePopover table {
padding: 10px 0 0 20px;
background-color: #ededed;
......@@ -775,7 +777,7 @@
<el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">销售公司</span>
<el-select class="w350 multiple_input" :class="{'SaleBranchList':priceData.SaleBranchIdArray==''}"
v-model="priceData.SaleBranchIdArray" multiple>
v-model="priceData.SaleBranchIdArray" multiple @change="ChangeSaleBranch(priceData)">
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
</el-option>
</el-select>
......@@ -1009,7 +1011,7 @@
selectFilghtList: [],
FinfoList: [],
//选中景点
ScenicList:[],
ScenicList: [],
//下拉框默认值
SelectDefaultValue: 0,
SelectOtherDefault: -1,
......@@ -1067,6 +1069,17 @@
};
},
methods: {
//销售公司改变方法
ChangeSaleBranch(item) {
var str = "";
if (item.SaleBranchIdArray && item.SaleBranchIdArray.length > 0) {
item.SaleBranchIdArray.forEach(subItem => {
str += subItem + ",";
});
str = str.substring(0, str.lastIndexOf(','));
}
item.SaleBranchId = str;
},
//调用子组件方法
GetHotelUsePriceList(HotelId, UseDay, index, hotelSubIndex) {
let str = `comPriceHotelInfo${index}${hotelSubIndex}`;
......@@ -1180,7 +1193,7 @@
//销售清位时间
SaleClearOrderHour: 0,
//可退景点下拉列表
ScenicBackList:[],
ScenicBackList: [],
};
}
this.returnPriceList.push(objItem);
......@@ -1574,15 +1587,15 @@
});
},
//选中景点选择框
getScenic(item){
item.IsChecked=!item.IsChecked;
getScenic(item) {
item.IsChecked = !item.IsChecked;
this.initScenic();
},
//初始化景点
initScenic(){
this.ScenicList=[];
this.priceData.ScenicBackList.forEach(x=>{
if(x.IsChecked){
initScenic() {
this.ScenicList = [];
this.priceData.ScenicBackList.forEach(x => {
if (x.IsChecked) {
this.ScenicList.push(x);
}
})
......@@ -1816,4 +1829,5 @@
commonPHInfo: commonPHlInfo
}
};
</script>
\ No newline at end of file
</script>
src/router/config.js
View file @ d93666c6
......@@ -563,7 +563,15 @@ export default {
name: 'happyMoney',
component: resolve => require(['@/components/administrative/happyMoney'], resolve),
meta: {
title: '联盟管理'
title: '大红包结算'
},
},
{
path: '/happyMoneyDetails', //幸福存折
name: 'happyMoneyDetails',
component: resolve => require(['@/components/administrative/happyMoneyDetails'], resolve),
meta: {
title: '大红包结算详情'
},
},
{
......
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