Skip to content

S
SuperMan
Commit f5bb4aa4 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

解决冲突

parents efb8bb26 26a6bcde
Show whitespace changes
Inline Side-by-side
Showing with 1414 additions and 1088 deletions
src/App.vue
View file @ f5bb4aa4
......@@ -108,7 +108,7 @@ export default {
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_a59svrd6x1.css";
@import "//at.alicdn.com/t/font_635492_uyefzcxpu3.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......
src/assets/common/lang/zh.js
View file @ f5bb4aa4
......@@ -37,6 +37,9 @@ export const pub={
returnBack:'返回',
allday:'全天',
clickToView:'点击查看',
man:'男',
woman:'女',
}
export const login = {
......@@ -1156,4 +1159,31 @@ export const rule = {
qxzfkdzhanghu: '请选择付款账户',
qxzxybsheren: '请选择下一步审核人',
qxzzdbumen:' 请选择制单部门',
qsrbmmingchen:"请输入部门名称",
qxzbmcengji:"请选择部门层级",
qxzfuzeren:"请选择负责人",
qsrbdgangwei:"请选择绑定岗位",
qsrzqdbmdianhua:"请输入正确的部门电话",
qszhengshu:"请输整数",
qsrname:"请输入姓名",
qsrtelphone:"请输入正确的手机",
qsrIdnum:"请输正确的身份证号",
}
export const adm={
adm_xzbumen:"新增部门",
adm_sxjg:"树形结构",
adm_fhlb:"返回列表",
adm_jggl:"结构管理",
adm_addzibumen:"添加子部门",
adm_addbumen:"添加部门",
adm_addyuangong:"添加员工",
adm_edityuangong:"员工修改",
adm_xueli:"学历",
adm_rzshijain:"入职时间",
}
\ No newline at end of file
src/components/FinancialModule/CapitalAllocation.vue
View file @ f5bb4aa4
......@@ -15,7 +15,7 @@
.page_CapitalAllocation .page_CapitalAllocation_list {
width: 100%;
}
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.edit{
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.editedit{
width: 30px;
height: 30px;
display: inline-block;
......@@ -53,6 +53,7 @@
<li>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()"/>
</li>
</ul>
</div>
......@@ -142,9 +143,9 @@
<tr>
<th>单号</th>
<th>金额</th>
<th>实付</th>
<!-- <th>实付</th> -->
<!-- <th>原币金额</th> -->
<th>交易日期</th>
<!-- <th>交易日期</th> -->
<th>创建时间</th>
<th>创建人</th>
<!-- <th>备注</th> -->
......@@ -152,11 +153,11 @@
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item, index) in dataList">
<td>{{item.FrID}}</td>
<td style="cursor:pointer" @click="goDetail('CapitalAllocationDetail', item.FrID)">{{item.FrID}}</td>
<td>{{item.Money}}</td>
<td>{{item.PayMoney}}</td>
<!-- <td>{{item.PayMoney}}</td> -->
<!-- <td>{{item.OriginalMoney}}</td> -->
<td>{{item.TradeDate}}</td>
<!-- <td>{{item.TradeDate}}</td> -->
<td>{{item.CreateDate}}</td>
<td>{{item.EmName}}</td>
<!-- <td>{{item.Description}}</td> -->
......@@ -199,6 +200,16 @@
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:total=total>
</el-pagination>
</div>
</div>
</div>
</template>
......@@ -209,7 +220,7 @@ export default {
msg: {
pageIndex: 1,
pageSize: 15,
FrID: '',
FrID: '0',
UpdateBy: '-1',
RB_Branch_Id: -1,
RB_Depart_Id: -2,
......@@ -218,6 +229,7 @@ export default {
Status: '-1',
sTradeDate: '',
eTradeDate: '',
EmployeeId:0
},
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
......@@ -265,7 +277,8 @@ export default {
this.loading= true
this.apipost('Financial_get_GetFundTransferPageList', this.msg, res=>{
if (res.data.resultCode===1){
this.dataList = res.data.data.pageData
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.$message.error(res.data.message)
}
......@@ -275,6 +288,23 @@ export default {
this.loading= false
}, null)
},
handleCurrentChange(val) { //翻页
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex(){ // 重置页码
this.msg.pageIndex=1;
this.currentPage = 1;
},
//导出
method5: function() {
if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
this.msg.EmployeeId=this.EmId;
this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,"资金调拨报表.xls");} ,
getCompanyList: function () { //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ f5bb4aa4
......@@ -161,6 +161,8 @@
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="1" value="1" label="收入"></el-option>
<el-option key="2" value="2" label="支出"></el-option>
<el-option key="2" value="5" label="应收"></el-option>
<el-option key="2" value="6" label="应付"></el-option>
<el-option key="2" value="4" label="资金调拨"></el-option>
</el-select>
</span>
......@@ -589,6 +591,12 @@
<template v-else-if="item.OrderSource==10 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">签证编号：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==11 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">投诉编号：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==12 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">散卖机票编号：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==0">
<p class="_TCIDAndTCNUMList">{{ item.BranchName }}-{{item.DepartName}} </p>
</template>
......@@ -619,7 +627,15 @@
<p>{{item.Type==1?'实收':'实付'}}：<span class="">{{moneyFormat(item.PayMoney)}}</span></p>
</td>
<td>
<span class="_color_gar">{{item.Type==2?item.ClientTypeName+'：':'汇款人：'}}</span><span>{{item.RemitterName}}</span>
<template v-if='item.Type===1'>
<span class="_color_gar">汇款人：</span><span>{{item.RemitterName}}</span>
</template>
<template v-if='item.Type===2'>
<span class="_color_gar">付款对象：</span><span>{{item.RemitterName}}</span>
</template>
<template v-if='item.Type===4'>
<span class="_color_gar">无</span>
</template>
</td>
<td valign="middle">
<img class="_head_img" :src="item.EmPhoto" alt="">
......@@ -658,7 +674,8 @@
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type==1?'addReceivablesDocuments':'addFinancialDocuments',item.Type,item.FrID,true,active,msg.pageIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<i class="iconfont icon-sousuo" @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
<i class="iconfont icon-sousuo" v-if='item.Type!==4' @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
<i class="iconfont icon-sousuo" v-if='item.Type===4' @click="goUrl('CapitalAllocationDetail',item.FrID,active,msg.pageIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="审核" placement="top">
<i v-if="msg.Conditon==3 && item.Is_Self!=1" class="iconfont icon-ico_commodity_defaul" @click="goUrl('BasicDocuments',item.FrID,active,msg.pageIndex)"></i>
......@@ -1343,7 +1360,7 @@ export default {
pageSize:6,
FrID:this.msg.FrID==0?'':this.msg.FrID,
sDate:this.msg.sDate,
eDate:this.msg.sDate,
eDate:this.msg.eDate,
Status:this.msg.Status,
TemplateId:this.msg.TemplateId,
RB_Branch_Id:this.msg.RB_Branch_Id,
......
src/components/Hotel/roomReservations.vue
View file @ f5bb4aa4
......@@ -51,7 +51,7 @@
<tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div>
<div v-if='outItem.StaticsReportList.length>1' class="w100">合团号：{{outItem.NewCombinationNum}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w100">{{outItem.NewCombinationNum}}</div>
</td>
<td>
<div class="w80">
......@@ -157,7 +157,7 @@
</td>
<td>
<div class="w80 link">
<p @click="goUrl('roomReservationsDetails',item,'订房详情')">详情</p>
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">详情</p>
</div>
</td>
</tr>
......@@ -251,7 +251,7 @@
}
})
},
goUrl(path, obj, title) {
goUrl(path, obj,outItem, title) {
this.$router.push({
name: path,
query: {
......@@ -259,7 +259,7 @@
'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': obj.NewCombinationNum,
'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y',
tab: title
}
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ f5bb4aa4
<template>
<div>
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<!--<li><span><em>线路</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList(msg.LineId)">
<el-option label="不限" value='-1'></el-option>
<el-option
v-for="item in LineList"
:label='item.LineName'
:value='item.LineID'
:key='item.LineID'>
</el-option>
</el-select>
</span>
</li>-->
<li><span><em>系列</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" value='-1'></el-option>
<el-option
v-for="item in LineTeamList"
:label='item.LtName'
:value='item.LtID'
:key='item.LtID'>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>团号</em><el-input v-model='msg.TCNUM' ></el-input>
<em>团号</em>
<el-input v-model='msg.TCNUM'></el-input>
</span>
</li>
<li><span><em>日期</em><el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()"/>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
</li>
</ul>
</div>
......@@ -48,7 +34,6 @@
<th width="80">出发地</th>
<th width="80">航班时间</th>
<th width="80">公司团号</th>
<!--<th width="150">团名</th>-->
<th width="120">机位总数/已收客数</th>
<th v-for='item in thLengthTitle'>{{item}}</th>
<th>备注</th>
......@@ -59,12 +44,15 @@
<tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div>
<div v-if='outItem.StaticsReportList.length>1' class="w100">合团号：{{outItem.NewCombinationNum}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w100">{{outItem.NewCombinationNum}}</div>
</td>
<td><div class="w80">
<td>
<div class="w80">
{{item.StartCityNames}}
</div></td>
<td><div class="w120">
</div>
</td>
<td>
<div class="w120">
{{item.FlightDate}}
<el-popover popper-class="bookDinnerStatistics_tripDetails" width="550" trigger="click">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
......@@ -79,7 +67,8 @@
<td class="_d_name _color_666">
<span v-if="din==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="din==item.FlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span v-else-if="din>0 && din!=item.FlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
<span
v-else-if="din>0 && din!=item.FlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td>
<td>
<div>{{ds.Flight_number}}</div>
......@@ -96,22 +85,27 @@
<td>{{ds.StopoverName}}</td>
</tr>
</table>
<el-button slot="reference" class="normalBtn mt5" style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button>
<el-button slot="reference" class="normalBtn mt5"
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button>
</el-popover>
</div></td>
<td><div class="w120 link">
</div>
</td>
<td>
<div class="w120 link">
<p v-for='xx in stringToArr(item.TCNUMS)' @click="goUrlT('productQuery',xx,'产品查询')">{{xx}}</p>
</div></td>
<!--<td><div class="w200 padding10">
{{item.Titles}}
</div></td>-->
<td><div class="w120 link">
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}</p>
</div></td>
</div>
</td>
<td>
<div class="w120 link">
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">
{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}
</p>
</div>
</td>
<td v-for="x in item.CommonReport.DiningList" style="vertical-align: top;">
<div style="width:350px;">
<!--<p v-if="x.UseTimeStr">{{x.UseTimeStr}}</p>-->
<table v-if="x.UseTimeStr" class="DiningTable" width="100%" border="0" cellspacing="0" cellpadding="0">
<table v-if="x.UseTimeStr" class="DiningTable" width="100%" border="0" cellspacing="0"
cellpadding="0">
<tr>
<th width="12%">{{x.UseTimeStr.substring(5)}}</th>
<th width="10%">大</th>
......@@ -125,35 +119,10 @@
<td v-for="t in s.DiningPriceList">{{t.PeoplePrice}}</td>
<td>{{s.PayStyleStr}}</td>
<td><span v-if="s.IsFeature==1" style="color:red;">{{s.DiningName}}</span> <span v-else>{{s.DiningName}}</span></td>
<td><span v-if="s.IsFeature==1" style="color:red;">{{s.DiningName}}</span> <span
v-else>{{s.DiningName}}</span></td>
</tr>
</table>
<!--<div style="width: 100%; max-height: 100px; overflow-y: auto; " class="ownScrollbarStyle">
<table class="DiningTable" width="100%" border="0" cellspacing="0" cellpadding="0" >
<tbody v-for="s in x.DiningSummaryList">
<tr>
<td width="30%">{{useDinnerTypeToWord(s.UseDinnerType)}}</td>
<td width="70%">
<p class="phoverStype" @click="goUrlT('restaurantList',s.ID,'餐厅列表')">{{s.DiningName}}</p>
</td>
</tr>
<tr>
<td>支付方式</td>
<td>
<el-select v-model="s.DiningReserveType" :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0'></el-option>
<el-option label='公司预定' value='1'></el-option>
<el-option label='导游预定' value='2'></el-option>
</el-select>
</td>
</tr>
<tr>
<td>用餐人数</td>
<td><span style="margin-right: 5px;" v-for="t in s.DiningPriceList">{{PeopleTypeToWord(t.PeopleType)}}{{t.PeoplePrice}}</span></td>
</tr>
</tbody>
</table>
</div>-->
</div>
</td>
<td>
......@@ -163,7 +132,7 @@
</td>
<td>
<div class="w80 link">
<p @click="goUrl('bookDinnerStatisticsDetails',item,'订餐详情')">详情</p>
<p @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'订餐详情')">详情</p>
</div>
</td>
</tr>
......@@ -171,7 +140,8 @@
<td :colspan="colspanTotal" style="text-align: left!important;padding-left: 20px;">
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252">地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252">
地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
</div>
</td>
</tr>
......@@ -179,43 +149,44 @@
</tbody>
</table>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total></el-pagination>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination>
</div>
</template>
<script>
export default {
data () {
export default {
data() {
return {
loading:false,
currentPage:1,
total:0,
msg:{
pageIndex:1,
pageSize:10,
SelectType:2,
loading: false,
msg: {
pageIndex: 1,
pageSize: 10,
SelectType: 2,
LineId: 14,
LineteamId: "-1",
StartDate:'',
EndDate:''
StartDate: '',
EndDate: '',
currentPage: 1,
total: 0,
},
LineList: [],
LineTeamList: [],
thLengthTitle:[],
list:[],
colspanTotal:0,
thLengthTitle: [],
list: [],
colspanTotal: 0,
}
},
methods: {
stringToArr(str){
stringToArr(str) {
return str.split(',')
},
PeopleTypeToWord(str){
if(str==1)
PeopleTypeToWord(str) {
if (str == 1)
return '成人:'
if(str==2)
if (str == 2)
return '小孩:'
if(str==3)
if (str == 3)
return '婴儿:'
},
getLineList() {
......@@ -231,8 +202,7 @@ export default {
getLineTeamList(lineId) {
this.LineTeamList = [];
this.apipost(
"team_post_GetList",
{
"team_post_GetList", {
lineID: 14,
isTOOP: 1
},
......@@ -244,14 +214,39 @@ export default {
}
);
},
goUrlR(path,obj,title){
this.$router.push({ name:path,query:{"ID":obj,blank:'y',tab:title}})
goUrlR(path, obj, title) {
this.$router.push({
name: path,
query: {
"ID": obj,
blank: 'y',
tab: title
}
})
},
goUrlT(path,obj,title){
this.$router.push({ name:path,query:{"id":obj,blank:'y',tab:title}})
goUrlT(path, obj, title) {
this.$router.push({
name: path,
query: {
"id": obj,
blank: 'y',
tab: title
}
})
},
goUrl(path,obj,title){
this.$router.push({ name:path,query:{"id":obj.TCIDS,'TCNUM':obj.TCNUMS,'flightTotal':obj.TotalSeat,'GuestNum':obj.CommonReport.HouseStatistics.RealityNum,'NewCombinationNum':obj.NewCombinationNum,blank:'y',tab:title}})
goUrl(path, obj,outItem, title) {
this.$router.push({
name: path,
query: {
"id": obj.TCIDS,
'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y',
tab: title
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
......@@ -259,53 +254,39 @@ export default {
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
this.msg.currentPage = 1;
},
getList(){
this.loading=true
this.apipost('dmcstatistics_post_GetUniteCombinationNumService',this.msg,res=>{
if(res.data.resultCode==1){
this.loading=false
this.total=res.data.data.count
this.list=res.data.data.pageData.data
this.thLengthArr=[]
this.thLengthTitle=[]
this.colspanTotal=res.data.data.pageData.columnsCount+6
for(let i=1;i<=res.data.data.pageData.columnsCount;i++){
this.thLengthTitle.push('第'+i+'天')
}
// this.list.forEach(item=>{
// console.log(item)
// if(item.CommonReport.DiningList.length<res.data.data.pageData.columnsCount){
// let _cha=res.data.data.pageData.columnsCount-item.CommonReport.DiningList.length
// let _chaArr=new Array()
// for (let i=0;i<_cha;i++) {
// _chaArr.push({'HotelName':''})
// }
// item.CommonReport.DiningList=item.CommonReport.DiningList.concat(_chaArr)
// }else{
//
// }
// })
this.list.forEach(outItem=>{
outItem.StaticsReportList.forEach(item=>{
if(item.CommonReport.DiningList.length<res.data.data.pageData.columnsCount){
let _cha=res.data.data.pageData.columnsCount-item.CommonReport.DiningList.length
let _chaArr=new Array()
for (let i=0;i<_cha;i++) {
_chaArr.push({'HotelName':''})
}
item.CommonReport.DiningList=item.CommonReport.DiningList.concat(_chaArr)
}else{
getList() {
this.loading = true
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
this.loading = false
if (res.data.resultCode == 1) {
this.msg.total = res.data.data.count;
this.list = res.data.data.pageData.data;
this.thLengthArr = [];
this.thLengthTitle = [];
this.colspanTotal = res.data.data.pageData.columnsCount + 6;
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
this.thLengthTitle.push('第' + i + '天');
}
})
})
}else{
this.loading=false
this.$message.error(res.data.message)
this.list.forEach(outItem => {
outItem.StaticsReportList.forEach(item => {
if (item.CommonReport.DiningList.length < res.data.data.pageData.columnsCount) {
let _cha = res.data.data.pageData.columnsCount - item.CommonReport.DiningList.length;
let _chaArr = new Array();
for (let i = 0; i < _cha; i++) {
_chaArr.push({
'HotelName': ''
});
}
},err=>{})
item.CommonReport.DiningList = item.CommonReport.DiningList.concat(_chaArr);
}
});
});
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
},
mounted() {
......@@ -319,37 +300,140 @@ export default {
this.msg.StartDate = nowDate;
this.getList()
},
}
}
</script>
<style>
.bookDinnerStatisticsSplitTrCss td{background: #eee!important;}
.bookDinnerStatisticsTalbe{ background: #ccc;}
.bookDinnerStatisticsTalbe tr th{background: #E6E6E6;height:40px; font-size: 12px; color: #333;}
.bookDinnerStatisticsTalbe tr{background: #fff;text-align: center; height: 40px;}
/*.bookDinnerStatisticsTalbe tr:nth-child(2n+1){background:#f2f2f2; }*/
.bookDinnerStatisticsTalbe tr td{font-size: 12px;}
.bookDinnerStatisticsTalbe tr td .pHouseStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px;}
.bookDinnerStatisticsTalbe tr td .pHouseStyle:last-child{border-bottom: none;}
.bookDinnerStatisticsTalbe tr td .pDateStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px; margin-top: 0;}
.bookDinnerStatisticsTalbe tr td .pMsgStyle{; padding: 0 10px; line-height: 20px;}
.bookDinnerStatisticsTalbe tr td .link p:hover{text-decoration: underline; cursor: pointer;}
.bookDinnerStatisticsTalbe tr td .phoverStype:hover{text-decoration: underline; cursor: pointer;}
.bookDinnerStatistics_tripDetails {padding: 0; box-shadow: 0px 1px 3px 0px #dedede; max-height: 400px;overflow-y: auto;}
.bookDinnerStatistics_tripDetails .popper__arrow::after {border-bottom-color: #ededed !important;}
.bookDinnerStatistics_tripDetails>table { padding: 10px 0 0 20px; background-color: #ededed; border-collapse: collapse; border: 1px solid #d2d2d2; font-size: 12px;}
.bookDinnerStatistics_tripDetails>table th { background-color: #ededed; padding: 5px;}
.bookDinnerStatistics_tripDetails>table td { background-color: #ffffff; padding: 9px 15px;color: #333333;border: 1px solid #d2d2d2;}
.bookDinnerStatistics_tripDetails>table td._d_name {background-color: #ededed;}
.bookDinnerStatistics_tripDetails>table ._color_666 {color: #666666;}
.bookDinnerStatistics_tripDetails table tr._color_666 th { padding: 9px 15px;}
.DiningTable{background: #fff;}
.DiningTable tr {height: 20px;}
.DiningTable tr th{ height:20px; font-size: 12px;background: #fafafa!important; border-bottom: 1px solid #ccc; border-right: 1px solid #ccc;}
.DiningTable tr th:last-child{border-right: none;}
.DiningTable tr td{ height:30px; border-bottom: 1px solid #ccc; border-right: 1px solid #ccc;}
.DiningTable tr td:last-child{border-right: none;}
.bookDinnerStatisticsSplitTrCss td {
background: #eee !important;
}
.bookDinnerStatisticsTalbe {
background: #ccc;
}
.bookDinnerStatisticsTalbe tr th {
background: #E6E6E6;
height: 40px;
font-size: 12px;
color: #333;
}
.bookDinnerStatisticsTalbe tr {
background: #fff;
text-align: center;
height: 40px;
}
/*.bookDinnerStatisticsTalbe tr:nth-child(2n+1){background:#f2f2f2; }*/
.bookDinnerStatisticsTalbe tr td {
font-size: 12px;
}
.bookDinnerStatisticsTalbe tr td .pHouseStyle {
border-bottom: 1px solid #ccc;
height: 20px;
line-height: 20px;
}
.bookDinnerStatisticsTalbe tr td .pHouseStyle:last-child {
border-bottom: none;
}
.bookDinnerStatisticsTalbe tr td .pDateStyle {
border-bottom: 1px solid #ccc;
height: 20px;
line-height: 20px;
margin-top: 0;
}
.bookDinnerStatisticsTalbe tr td .pMsgStyle {
;
padding: 0 10px;
line-height: 20px;
}
.bookDinnerStatisticsTalbe tr td .link p:hover {
text-decoration: underline;
cursor: pointer;
}
.bookDinnerStatisticsTalbe tr td .phoverStype:hover {
text-decoration: underline;
cursor: pointer;
}
.bookDinnerStatistics_tripDetails {
padding: 0;
box-shadow: 0px 1px 3px 0px #dedede;
max-height: 400px;
overflow-y: auto;
}
.bookDinnerStatistics_tripDetails .popper__arrow::after {
border-bottom-color: #ededed !important;
}
.bookDinnerStatistics_tripDetails>table {
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.bookDinnerStatistics_tripDetails>table th {
background-color: #ededed;
padding: 5px;
}
.bookDinnerStatistics_tripDetails>table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.bookDinnerStatistics_tripDetails>table td._d_name {
background-color: #ededed;
}
.bookDinnerStatistics_tripDetails>table ._color_666 {
color: #666666;
}
.bookDinnerStatistics_tripDetails table tr._color_666 th {
padding: 9px 15px;
}
.DiningTable {
background: #fff;
}
.DiningTable tr {
height: 20px;
}
.DiningTable tr th {
height: 20px;
font-size: 12px;
background: #fafafa !important;
border-bottom: 1px solid #ccc;
border-right: 1px solid #ccc;
}
.DiningTable tr th:last-child {
border-right: none;
}
.DiningTable tr td {
height: 30px;
border-bottom: 1px solid #ccc;
border-right: 1px solid #ccc;
}
.DiningTable tr td:last-child {
border-right: none;
}
</style>
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ f5bb4aa4
......@@ -3,8 +3,8 @@
<div class="query-box" style="border-bottom: none;">
<ul>
<li>
<input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)"/>
<input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)"/>
<input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
</li>
</ul>
</div>
......@@ -43,25 +43,25 @@
</td>
<td>
<div class="w200">
<p style="height: 84px; padding-left: 10px; display:flex; align-items:center;" v-for="subItem in item.DiningSummaryList" class="link pHouseStyle" @click="goUrlR('restaurantList',subItem.DiningID,'餐厅列表')">{{subItem.DiningName}}</p>
<p style="height: 84px; padding-left: 10px; display:flex; align-items:center;"
v-for="subItem in item.DiningSummaryList" class="link pHouseStyle"
@click="goUrlR('restaurantList',subItem.DiningID,'餐厅列表')">{{subItem.DiningName}}</p>
</div>
</td>
<td>
<div class="w200">
<p style="height: 84px; padding-left: 10px; display:flex; align-items:center;" class="pHouseStyle" v-for="subItem in item.DiningSummaryList">
<el-select class='w160 sel' v-model='subItem.NewDiningID' filterable :placeholder="$t('pub.pleaseSel')" @visible-change='getDingList(item)' @change='sendValue(subItem,item)'>
<el-option
v-for='itemHotel in item.DinnerList'
:label='itemHotel.Name'
:value='itemHotel.ID'
:key='itemHotel.ID'
></el-option>
<p style="height: 84px; padding-left: 10px; display:flex; align-items:center;" class="pHouseStyle"
v-for="subItem in item.DiningSummaryList">
<el-select class='w160 sel' v-model='subItem.NewDiningID' filterable :placeholder="$t('pub.pleaseSel')"
@visible-change='getDingList(item)' @change='sendValue(subItem,item)'>
<el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.Name' :value='itemHotel.ID'
:key='itemHotel.ID'></el-option>
</el-select>
</p>
</div>
</td>
<td>
<div class="w80" >
<div class="w80">
<p style="height: 84px; line-height: 84px;" v-for="subItem in item.DiningSummaryList" class="pHouseStyle">
{{subItem.UseDinnerTypeStr}}
</p>
......@@ -83,7 +83,7 @@
</div>
</td>
<td>
<div class="w180" >
<div class="w180">
<div class="DivStyle" v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList">
{{personStrToWord(childItem.PeopleType)}}
......@@ -104,7 +104,8 @@
<div class="w80">
<div class="DivStyle" v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList">
<span class="spanlink" v-if='childItem.PeoplePrice==0' @click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span>
<span class="spanlink" v-if='childItem.PeoplePrice==0'
@click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span>
<span v-if='childItem.PeoplePrice!=0'>{{childItem.PeoplePrice}}</span>
</p>
</div>
......@@ -114,7 +115,8 @@
<div class="w80">
<div class="DivStyle" v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList">
<el-input class='w50 tcenter' @input='calculationPrice(subItem)' maxlength='2' v-model='childItem.Discount' @keyup.native="checkInteger(childItem,'Discount')"></el-input>
<el-input class='w50 tcenter' @input='calculationPrice(subItem)' maxlength='2'
v-model='childItem.Discount' @keyup.native="checkInteger(childItem,'Discount')"></el-input>
</p>
</div>
</div>
......@@ -132,9 +134,8 @@
<div class="w80">
<div class="DivStyle" v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList">
<!--<span class="spanlink" v-if='childItem.PeoplePrice==0' @click="goUrl('restaurantInfoManage',subItem,'餐厅列表')">设置</span>
<span v-if='childItem.PeoplePrice!=0'>{{o.PeoplePrice}}%</span>-->
<el-input class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.DiscountPrice' @keyup.native="checkInteger(childItem,'DiscountPrice')"></el-input>%
<el-input class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.DiscountPrice'
@keyup.native="checkInteger(childItem,'DiscountPrice')"></el-input>%
</p>
</div>
</div>
......@@ -150,11 +151,11 @@
<div class="w150">
<p style="height: 84px; line-height: 84px;" v-for="subItem in item.DiningSummaryList" class="pHouseStyle">
<el-select class='w100 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0' ></el-option>
<el-option label='现付' value='1' ></el-option>
<el-option label='签单' value='2' ></el-option>
<el-option label='实物抵扣' value='3' ></el-option>
<el-option label='预付' value='4' ></el-option>
<el-option label='请选择' value='0'></el-option>
<el-option label='现付' value='1'></el-option>
<el-option label='签单' value='2'></el-option>
<el-option label='实物抵扣' value='3'></el-option>
<el-option label='预付' value='4'></el-option>
</el-select>
</p>
</div>
......@@ -163,9 +164,9 @@
<div class="w150">
<p style="height: 84px; line-height: 84px;" v-for="subItem in item.DiningSummaryList" class="pHouseStyle">
<el-select v-model='subItem.DiningReserveType' class='w100 sel' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0' ></el-option>
<el-option label='公司预订' value='1' ></el-option>
<el-option label='导游预订' value='2' ></el-option>
<el-option label='请选择' value='0'></el-option>
<el-option label='公司预订' value='1'></el-option>
<el-option label='导游预订' value='2'></el-option>
</el-select>
</p>
</div>
......@@ -179,7 +180,8 @@
</td>
<td>
<div class="w300">
<p style="height: 84px; padding-left: 10px; display:flex; align-items:center;" v-for="subItem in item.DiningSummaryList" class="pHouseStyle">
<p style="height: 84px; padding-left: 10px; display:flex; align-items:center;"
v-for="subItem in item.DiningSummaryList" class="pHouseStyle">
{{subItem.Address}}
</p>
</div>
......@@ -193,7 +195,8 @@
</td>
<td>
<div class="w150">
<p style="height: 84px; display:flex; align-items:center; padding-left: 15px;" v-for="subItem in item.DiningSummaryList" class="pHouseStyle">
<p style="height: 84px; display:flex; align-items:center; padding-left: 15px;"
v-for="subItem in item.DiningSummaryList" class="pHouseStyle">
<el-input type='textarea' class='w120' v-model='subItem.Remarks'></el-input>
</p>
</div>
......@@ -205,10 +208,10 @@
</template>
<script>
export default {
export default {
data() {
return {
defaultSelectValue:0,
defaultSelectValue: 0,
list: [],
roomList: [],
TCNUM: "",
......@@ -218,12 +221,26 @@ export default {
},
methods: {
//页面跳转[大写]
goUrlR(path, obj,title) {
this.$router.push({ name: path, query: { ID: obj ,blank:'y',tab:title} });
goUrlR(path, obj, title) {
this.$router.push({
name: path,
query: {
ID: obj,
blank: 'y',
tab: title
}
});
},
//页面跳转[小写]
goUrlT(path, obj,title) {
this.$router.push({ name: path, query: { id: obj ,blank:'y',tab:title} });
goUrlT(path, obj, title) {
this.$router.push({
name: path,
query: {
id: obj,
blank: 'y',
tab: title
}
});
},
goUrl(path, obj, name) {
this.$router.push({
......@@ -235,33 +252,34 @@ export default {
}
});
},
personStrToWord(str){
if(str==1)
personStrToWord(str) {
if (str == 1)
return '大人'
if(str==2)
if (str == 2)
return '儿童'
if(str==3)
if (str == 3)
return '婴儿'
},
getList() {
this.apipost(
"dmcstatistics_get_GetDinnerStaticsDetail",
{ TCIDs: this.$route.query.id },
"dmcstatistics_get_GetDinnerStaticsDetail", {
TCIDs: this.$route.query.id
},
res => {
if (res.data.resultCode == 1) {
this.list = res.data.data;
this.list.forEach(item=>{
item.DinnerList=[];
item.DiningSummaryList.forEach(x=>{
x.PayStyle=x.PayStyle.toString()
x.DiningReserveType=x.DiningReserveType.toString()
this.calculationPrice(x)
this.list.forEach(item => {
item.DinnerList = [];
item.DiningSummaryList.forEach(x => {
x.PayStyle = x.PayStyle.toString();
x.DiningReserveType = x.DiningReserveType.toString();
this.calculationPrice(x);
item.DinnerList.push({
Name:x.NewDiningName,
ID:x.NewDiningID
Name: x.NewDiningName,
ID: x.NewDiningID
})
if(x.ReserveNo==''||x.ReserveNo==null){
x.ReserveNo = this.$route.query.NewCombinationNum;
if (x.ReserveNo == '' || x.ReserveNo == null) {
x.ReserveNo = this.$route.query.NewCombinationNum;;
}
})
})
......@@ -272,54 +290,54 @@ export default {
err => {}
);
},
calculationPrice(obj){
let totalPrice=0
obj.DiningPriceList.forEach(item=>{
totalPrice+=item.PeoplePrice*(item.PeopleNum-item.Discount)*(1-item.DiscountPrice/100)
calculationPrice(obj) {
let totalPrice = 0;
obj.DiningPriceList.forEach(item => {
totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
})
obj.TotalPrice=totalPrice.toFixed(2)
obj.TotalPrice = totalPrice.toFixed(2);
},
saveList(type){
if(type==0){
this.list.forEach(item=>{
item.DiningSummaryList.forEach(insideItem=>{
insideItem.OrderState=0
saveList(type) {
if (type == 0) {
this.list.forEach(item => {
item.DiningSummaryList.forEach(insideItem => {
insideItem.OrderState = 0;
})
})
}
if(type==1){
this.list.forEach(item=>{
item.DiningSummaryList.forEach(insideItem=>{
insideItem.OrderState=1
if (type == 1) {
this.list.forEach(item => {
item.DiningSummaryList.forEach(insideItem => {
insideItem.OrderState = 1;
})
})
}
this.apipost('dmcstatistics_get_SetDiningOrder',this.list,res=>{
if(res.data.resultCode==1){
this.$message.success(res.data.message)
}else{
this.$message.error(res.data.message)
this.apipost('dmcstatistics_get_SetDiningOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
} else {
this.$message.error(res.data.message);
}
},err=>{})
}, err => {})
},
//获取餐厅下拉
getDingList(item){
getDingList(item) {
let msg = {
QCity:item.DiningSummaryList[0].QCity
QCity: item.DiningSummaryList[0].QCity
}
this.apipost('dining_post_GetLineDinnerList',msg,res=>{
if(res.data.resultCode==1){
this.apipost('dining_post_GetLineDinnerList', msg, res => {
if (res.data.resultCode == 1) {
item.DinnerList = res.data.data;
this.$forceUpdate();
}else{
} else {
this.Error(res.data.message)
}
},err=>{})
}, err => {})
},
//重置电话地址
sendValue(subItem,item){
item.DinnerList.forEach(x=>{
if(subItem.NewDiningID == x.ID){
sendValue(subItem, item) {
item.DinnerList.forEach(x => {
if (subItem.NewDiningID == x.ID) {
subItem.Address = x.Address;
subItem.Tel = x.Tel;
}
......@@ -328,60 +346,93 @@ export default {
},
mounted() {
this.TCNUM = this.$route.query.TCNUM;
this.GuestNum= this.$route.query.GuestNum;
this.GuestNum = this.$route.query.GuestNum;
this.getList();
}
};
};
</script>
<style>
.bookDinnerStatisticsTalbe {
.bookDinnerStatisticsTalbe {
background: #ccc;
}
.bookDinnerStatisticsTalbe tr th {
}
.bookDinnerStatisticsTalbe tr th {
background: #e6e6e6;
height: 40px;
font-size: 12px;
color: #333;
}
.bookDinnerStatisticsTalbe tr {
}
.bookDinnerStatisticsTalbe tr {
background: #fff;
text-align: center;
height: 40px;
}
.bookDinnerStatisticsTalbe tr td {
}
.bookDinnerStatisticsTalbe tr td {
font-size: 12px;
}
.bookDinnerStatisticsTalbe tr td input{
height:20px!important;
}
.bookDinnerStatisticsTalbe tr td input {
height: 20px !important;
padding: 0;
text-align: center;
}
.bookDinnerStatisticsTalbe tr td .sel input{
height:34px!important;
}
.bookDinnerStatisticsTalbe tr td .pHouseStyle {
}
.bookDinnerStatisticsTalbe tr td .sel input {
height: 34px !important;
}
.bookDinnerStatisticsTalbe tr td .pHouseStyle {
border-bottom: 1px solid #ccc;
height: 28px;
line-height: 28px;
}
.bookDinnerStatisticsTalbe tr td .pHouseStyle:last-child {
}
.bookDinnerStatisticsTalbe tr td .pHouseStyle:last-child {
border-bottom: none;
}
.bookDinnerStatisticsTalbe tr td .DivStyle {
}
.bookDinnerStatisticsTalbe tr td .DivStyle {
border-bottom: 1px solid #ccc;
height: 84px;
line-height: 28px;
box-sizing: border-box;
}
.bookDinnerStatisticsTalbe tr td .DivStyle p{border-bottom: 1px solid #ccc;}
.bookDinnerStatisticsTalbe tr td .DivStyle p:last-child{border-bottom: none;}
.bookDinnerStatisticsTalbe tr td .DivStyle:last-child {
}
.bookDinnerStatisticsTalbe tr td .DivStyle p {
border-bottom: 1px solid #ccc;
}
.bookDinnerStatisticsTalbe tr td .DivStyle p:last-child {
border-bottom: none;
}
.bookDinnerStatisticsTalbe tr td .DivStyle:last-child {
border-bottom: none;
}
.bookDinnerStatisticsTalbe tr td .tdItemStyle {
border-bottom: 1px solid #ccc;
}
.bookDinnerStatisticsTalbe tr td .tdItemStyle:last-child {
border-bottom: none;
}
.bookDinnerStatisticsTalbe tr td .tdItemStyle{border-bottom: 1px solid #ccc;}
.bookDinnerStatisticsTalbe tr td .tdItemStyle:last-child{border-bottom: none;}
.bookDinnerStatisticsTalbe tr td .link:hover{text-decoration: underline; cursor: pointer;}
.bookDinnerStatisticsTalbe .Book_span{margin-right:3px;}
.bookDinnerStatisticsTalbe tr td .spanlink:hover{text-decoration: underline; cursor: pointer;}
}
.bookDinnerStatisticsTalbe tr td .link:hover {
text-decoration: underline;
cursor: pointer;
}
.bookDinnerStatisticsTalbe .Book_span {
margin-right: 3px;
}
.bookDinnerStatisticsTalbe tr td .spanlink:hover {
text-decoration: underline;
cursor: pointer;
}
</style>
src/components/SalesModule/groupInquiry.vue
View file @ f5bb4aa4
......@@ -747,7 +747,8 @@ export default {
//航班配置
FlightState:0,
TCVisaStatus: '-1',
IsShowUnion:1
IsShowUnion:1,
QueryType:1,//查询类型 1:签证
},
remarkMsg: {
TCID: 0,
......
src/components/administrative/departmentManagement.vue
View file @ f5bb4aa4
......@@ -111,7 +111,7 @@
</span>
</li>
<li>
<span><em>部门层级</em><el-select v-model="msg.Tier">
<span><em>{{$t('admin.admin_departmentLevel')}}</em><el-select v-model="msg.Tier">
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in tierList' :label='item.name' :value='item.id' :key="item.id"></el-option>
</el-select>
......@@ -125,9 +125,9 @@
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/>
<input type="button" @click="outerVisible = true,dialogTitle='新增部门',getCompany()" class="normalBtn"
<input type="button" @click="outerVisible = true,getCompany()" class="normalBtn"
:value="$t('pub.addBtn')"/>
<input type="button" class="normalBtn" value="树形结构" @click="isTree=true"/>
<input type="button" class="normalBtn" :value="$t('adm.adm_sxjg')" @click="isTree=true"/>
</li>
</ul>
</div>
......@@ -135,9 +135,9 @@
<div v-show="isTree" class="departmentTreeStyleCont">
<div class="departmentTreeStyle">
<p>
结构管理
{{$t('adm.adm_jggl')}}
<input type="button" class="normalBtn fr"
style="font-size: 12px; width: 86px; height: 24px; padding: 0 2px; margin-top: -5px;" value="返回列表"
style="font-size: 12px; width: 86px; height: 24px; padding: 0 2px; margin-top: -5px;" :value="$t('adm.adm_fhlb')"
@click="isTree=false"/>
</p>
<el-tree :data="allList" node-key="id" :props="defaultProps" @node-drag-start="handleDragStart"
......@@ -151,24 +151,24 @@
{{node.label}}<span v-show="data.DType==2"
style="background: #E95252; font-size: 12px; height: 16px; line-height: 16px; color:#fff; padding: 0 4px; border-radius: 4px; display: inline-block; margin-left: 5px;">{{data.PostName}}</span>
<span class="spanIcon" v-if="data.DType==1">
<el-tooltip class="item" effect="dark" content="添加子部门" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('adm.adm_addzibumen')" placement="top">
<i class="iconfont icon-tianjia"
@click="treeLayerShow=true;treeLayerShowUser=false,treeLayerTitle='添加部门',resetForm('addMsg'),addTreeData(data)"></i>
@click="treeLayerShow=true;treeLayerShowUser=false,resetForm('addMsg'),addTreeData(data)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加员工" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('adm.adm_addyuangong')" placement="top">
<i class="iconfont icon-tianjiayuangong"
@click="treeLayerShow=false,treeLayerShowUser=true,treeLayerUserTitle='添加员工',resetForm('addMsg1'),addTreeUerData(data)"></i>
@click="treeLayerShow=false,treeLayerShowUser=true,resetForm('addMsg1'),addTreeUerData(data)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<i class="iconfont icon-xiugai"
@click="treeLayerShow=true,treeLayerShowUser=false,treeLayerTitle='部门信息编辑',resetForm('addMsg'),updateData(data.DepartmentID)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top">
<i class="iconfont icon-shanchu" @click='deleteDeparment(data.DepartmentID)'></i>
</el-tooltip>
</span>
<span class="spanIcon" v-if="data.DType==2">
<el-tooltip class="item" effect="dark" content="员工修改" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('adm.adm_edityuangong')" placement="top">
<i class="iconfont icon-xiugai"
@click="treeLayerShow=false,treeLayerShowUser=true,treeLayerUserTitle='修改员工信息',resetForm('addMsg1'),updateDataUser(data)"></i>
</el-tooltip>
......@@ -181,31 +181,31 @@
<el-form :model="addMsg1" :rules="rules1" ref="addMsg1" label-width="90px">
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="公司" prop="RB_Branch_id">
<el-select filterable v-model='addMsg1.RB_Branch_id' @change='layerLinkageDepartment' placeholder="请选择">
<el-form-item :label="$t('system.table_company')" prop="RB_Branch_id">
<el-select filterable v-model='addMsg1.RB_Branch_id' @change='layerLinkageDepartment' :placeholder="$t('pub.unlimitedSel')">
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="部门" prop="RB_Department_Id">
<el-select filterable v-model='addMsg1.RB_Department_Id' @change='layerLinkagePost' placeholder="请选择">
<el-form-item :label="$t('admin.admin_Department')" prop="RB_Department_Id">
<el-select filterable v-model='addMsg1.RB_Department_Id' @change='layerLinkagePost' :placeholder="$t('pub.unlimitedSel')">
<el-option v-for='item in layerDepartMentList' :label='item.DepartmentName' :value='item.DepartmentID' :key="item.DepartmentID">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="岗位" prop="RB_Post_Id">
<el-select filterable v-model='addMsg1.RB_Post_Id' placeholder="请选择">
<el-form-item :label="$t('admin.admin_Post')" prop="RB_Post_Id">
<el-select filterable v-model='addMsg1.RB_Post_Id' :placeholder="$t('pub.unlimitedSel')">
<el-option v-for='item in layerPostList' :label='item.PostName' :value='item.PostId' :key="item.PostId">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="姓名" prop="EmName">
<el-form-item :label="$t('system.query_name')" prop="EmName">
<el-input maxlength='20' type="text" v-model="addMsg1.EmName"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
......@@ -213,20 +213,20 @@
</el-row>
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="身份证" prop="EmCard">
<el-form-item :label="$t('system.table_IDcard')" prop="EmCard">
<el-input type="text" v-model="addMsg1.EmCard" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="性别" prop="EmSex">
<el-select filterable v-model='addMsg1.EmSex' placeholder="请选择">
<el-option label='男' value='0'></el-option>
<el-option label='女' value='1'></el-option>
<el-form-item :label="$t('leader.leader_Sex')" prop="EmSex">
<el-select filterable v-model='addMsg1.EmSex' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.man')" value='0'></el-option>
<el-option :label="$t('pub.woman')" value='1'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="学历" prop="EmEducation">
<el-form-item :label="$t('adm.adm_xueli')" prop="EmEducation">
<el-input maxlength='20' type="text" v-model="addMsg1.EmEducation"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
......@@ -245,18 +245,18 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="地址" prop="EmAddress">
<el-form-item :label="$t('admin.admin_address')" prop="EmAddress">
<el-input maxlength='50' type="text" v-model="addMsg1.EmAddress"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="手机号" prop="EmMobile">
<el-form-item :label="$t('pub.mbPhoneNum')" prop="EmMobile">
<el-input type="text" v-model="addMsg1.EmMobile" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="座机" prop="EmTel">
<el-form-item :label="$t('pub.telphone')" prop="EmTel">
<el-input maxlength='20' type="text" v-model="addMsg1.EmTel"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
......@@ -274,7 +274,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账号" prop="EmAccount">
<el-form-item :label="$t('system.table_acc')" prop="EmAccount">
<el-input type="text" v-model="addMsg1.EmAccount" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
......@@ -286,9 +286,9 @@
</el-row>
<el-row :gutter="10">
<el-col :span="24">
<input type="button" value="取消" class="hollowFixedBtn"
<input type="button" :value="$t('pub.cancelBtn')" class="hollowFixedBtn"
@click="resetForm('addMsg1'),treeLayerShowUser=false"></input>
<input type="button" class="normalBtn" value="保存" @click="submitForm1('addMsg1')"></input>
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')"></input>
<button v-if='isleaveBtn' class="normalBtn" @click="setIsLeave(leaveId)">{{leaveBtn}}</button>
</el-col>
</el-row>
......@@ -302,7 +302,7 @@
<el-row :gutter="10">
<el-col :span="6">
<el-form-item :label="$t('admin.admin_company')" prop="RB_Branch_Id">
<el-select filterable clearable v-model='addMsg.RB_Branch_Id' placeholder="请选择"
<el-select filterable clearable v-model='addMsg.RB_Branch_Id' :placeholder="$t('pub.unlimitedSel')"
@change='getDeparmentTierByBranch'>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option>
......@@ -422,7 +422,7 @@
<tr>
<td>
<el-form-item :label="$t('admin.admin_company')" prop="RB_Branch_Id">
<el-select class='w200' filterable clearable v-model='addMsg.RB_Branch_Id' placeholder="请选择"
<el-select class='w200' filterable clearable v-model='addMsg.RB_Branch_Id' :placeholder="$t('pub.unlimitedSel')"
@change='getDeparmentTierByBranch'>
<el-option v-for='item in layercompanyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option>
......@@ -544,17 +544,17 @@
rules: { //表单验证
RB_Branch_Id: [{
required: true,
message: '请选择公司',
message: this.$t('rule.company'),
trigger: 'change'
}],
DepartmentName: [{
required: true,
message: '请输入部门名称',
message: this.$t('rule.qsrbmmingchen'),
trigger: 'blur'
}],
Tier: [{
required: true,
message: '请选择部门层级',
message: this.$t('rule.qxzbmcengji'),
trigger: 'change'
}],
ParentId: [{
......@@ -563,22 +563,22 @@
}],
DepartmentManager: [{
required: false,
message: '请选择负责人',
message: this.$t('rule.qxzfuzeren'),
trigger: 'change'
}],
PostIdArr: [{
required: true,
message: '请选择绑定岗位',
message: this.$t('rule.qsrbdgangwei'),
trigger: 'change'
}],
DepartmentTel: [{
pattern: /^((0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$/,
message: '请输入正确的部门电话'
message: this.$t('rule.qsrzqdbmdianhua')
}],
Sort: [{
required: true,
pattern: /^(-|\+)?\d+$/,
message: '请输整数'
message: this.$t('rule.qszhengshu')
}],
IsLeader: [{
required: false,
......@@ -609,22 +609,22 @@
rules1: {
RB_Branch_id: [{
required: true,
message: '请选择公司',
message: this.$t('rule.company'),
trigger: 'change'
}],
RB_Department_Id: [{
required: true,
message: '请选择部门',
message: this.$t('tips.qxzbumen'),
trigger: 'change'
}],
RB_Post_Id: [{
required: true,
message: '请选择岗位',
message: this.$t('tips.qxzgangwei'),
trigger: 'change'
}],
EmName: [{
required: true,
message: '请输入姓名',
message: this.$t('rule.qsrname'),
trigger: 'blur'
}],
EmEntry: [{
......@@ -634,7 +634,7 @@
}],
EmAccount: [{
required: true,
message: '请输入账号',
message: this.$t('login.login_account'),
trigger: 'blur'
},
{
......@@ -644,7 +644,7 @@
],
EmPassword: [{
required: true,
message: '请输入密码',
message: this.$t('login.login_password'),
trigger: 'blur'
}],
EmQQ: [{
......@@ -653,11 +653,11 @@
}],
EmMobile: [{
pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
message: '请输入正确的手机'
message: this.$t('rule.qsrtelphone'),
}],
EmCard: [{
pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
message: '请输正确的身份证号'
message: '请输正确的身份证号459258'
}],
},
//请求数据
......@@ -947,6 +947,7 @@
})
},
getCompany() { //公司
this.dialogTitle=this.$t('adm.adm_xzbumen');
this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
if (this.outerVisible) {
this.layercompanyList = res.data.data
......@@ -1041,6 +1042,7 @@
})
},
addTreeData(obj) {
this.treeLayerTitle=this.$t('adm.adm_addbumen');
this.getCompany()
this.layerDepartmentMsg.BranchId = this.layerTierMsg.BranchId = this.addMsg.RB_Branch_Id = obj.RB_Branch_Id
this.layerDepartmentMsg.Tier = obj.Tier + 1;
......@@ -1052,6 +1054,7 @@
},
addTreeUerData(obj) {
this.isleaveBtn = false;
this.treeLayerUserTitle=this.$t('adm.adm_addyuangong');
this.getCompany()
this.getDepartmentMsg.RB_Branch_Id = this.addMsg1.RB_Branch_id = obj.RB_Branch_Id
this.getDerpartMent();
......
src/components/busManagement/BusInfo.vue
View file @ f5bb4aa4
......@@ -82,7 +82,9 @@
text-decoration: underline;
cursor: pointer;
}
.BusTyleFirst .w150{
margin-right:22px;
}
</style>
<template>
<div class="flexOne busInfo">
......@@ -192,11 +194,14 @@
</div>
</td>
<td>
<div class="w180">
<div class="w180" :class="{'BusTyleFirst':index==0}">
<el-select clearable class="w150" filterable placeholder="请选择" v-model="item.BusType" :disabled="forbidInput" @change='getBusPrice(item)'>
<el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id">
</el-option>
</el-select>
<el-tooltip class="item" effect="dark" content="同上" placement="top">
<i class="iconfont icon-tongshang" style="cursor:pointer;" v-if="index!=0" @click="getBeforeInfo(index)"></i>
</el-tooltip>
</div>
</td>
<td>
......@@ -515,6 +520,7 @@ export default {
x.BookGroup = this.$route.query.NewCombinationNum;
}
})
console.log(this.PlanTableData,'plandata');
}
},
null
......@@ -695,6 +701,29 @@ export default {
2
);
this.PostData.CostPrice = CoastPrice;
},
//获取同上信息
getBeforeInfo(index){
let oldPlanData = this.PlanTableData[index-1];
let newPlanData = this.PlanTableData[index];
newPlanData.PlanDateStr = oldPlanData.PlanDateStr;
newPlanData.HotelName = oldPlanData.HotelName;
newPlanData.IsHavearking = oldPlanData.IsHavearking;
newPlanData.AirportPickUp = oldPlanData.AirportPickUp;
newPlanData.UseType = oldPlanData.UseType;
newPlanData.UseTime = oldPlanData.UseTime;
newPlanData.BookGroup = oldPlanData.BookGroup;
newPlanData.DriverName = oldPlanData.DriverName;
newPlanData.DriverTel = oldPlanData.DriverTel;
newPlanData.AccommodationType = oldPlanData.AccommodationType;
newPlanData.AccommodationRemark = oldPlanData.AccommodationRemark;
newPlanData.BusType = oldPlanData.BusType;
// newPlanData.UseNum = oldPlanData.UseNum;
// newPlanData.BusNum = oldPlanData.BusNum;
// newPlanData.BusCompany = oldPlanData.BusCompany;
// newPlanData.ParkExplain = oldPlanData.ParkExplain;
// newPlanData.CostPrice = oldPlanData.CostPrice;
// newPlanData.TransferNum = oldPlanData.TransferNum;
}
},
mounted() {
......
src/components/platformModule/companyManagement.vue
View file @ f5bb4aa4
......@@ -23,22 +23,22 @@
</span>
</li>-->
<li>
<span><em>{{$t('admin.admin_company')}}</em><el-input @keyup.enter.native="getList" v-model="msg.BName" placeholder="请输入内容"></el-input></span>
<span><em>{{$t('admin.admin_company')}}</em><el-input @keyup.enter.native="getList" v-model="msg.BName" :placeholder="$t('pub.pleaseImport')"></el-input></span>
</li>
<li>
<span><em>{{$t('admin.admin_domain')}}</em><el-input @keyup.enter.native="getList" v-model="msg.Domain" placeholder="请输入内容"></el-input></span>
<span><em>{{$t('admin.admin_domain')}}</em><el-input @keyup.enter.native="getList" v-model="msg.Domain" :placeholder="$t('pub.pleaseImport')"></el-input></span>
</li>
<li>
<span><em>{{$t('admin.admin_status')}}</em><el-select v-model="msg.Status" placeholder="不限">
<el-option label='不限' value=''></el-option>
<el-option label='开启' value='0'></el-option>
<el-option label='关闭' value='1'></el-option>
<span><em>{{$t('admin.admin_status')}}</em><el-select v-model="msg.Status" :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value=''></el-option>
<el-option :label="$t('pub.openSel')" value='0'></el-option>
<el-option :label="$t('pub.closeSel')" value='1'></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> &nbsp;
<input type="button" class="normalBtn" value="新增" @click="outerVisible = true,dialogTitle='新增公司'" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> &nbsp;
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="outerVisible = true,dialogTitle='新增公司'" />
</li>
</ul>
......@@ -49,8 +49,8 @@
<th width="300">{{$t('admin.admin_company')}}</th>
<!-- <th>{{$t('admin.admin_domain')}}</th> -->
<!-- <th>{{$t('admin.admin_leader')}}</th> -->
<th>联系人</th>
<th>联系电话</th>
<th>{{$t('hotel.suplier_contact')}}</th>
<th>{{$t('restaurant.res_ContactNumber')}}</th>
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('admin.admin_isshow')}}</th>
<th>公司类型</th>
......@@ -63,7 +63,7 @@
<!-- <td>{{item.BranchManagerName}}</td> -->
<td>{{item.ContactPersion}}</td>
<td>{{item.MobilePhone}}</td>
<td>{{item.Status==0?'开启':'关闭'}}</td>
<td>{{item.Status==0? $t('pub.openSel'): $t('pub.closeSel')}}</td>
<td>{{item.is_show==0?'显示':'不显示'}}</td>
<td>{{item.IsParentCompany=='1'?'总公司':'分公司'}}</td>
<td>
......@@ -92,7 +92,7 @@
<!-- <el-form-item class='w400' :label="$t('admin.admin_domain')" prop="Domain">
<el-input type="text" v-model="addMsg.Domain" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> -->
<el-form-item label="省份" prop="Province">
<el-form-item :label="$t('system.table_pvrg')" prop="Province">
<el-select class='w280' :placeholder="$t('pub.pleaseSel')" filterable v-model="addMsg.Province" @change="getCityList(addMsg.Province,1)">
<el-option :label="$t('pub.unlimitedSel')" :value='commonDefaultSelect'></el-option>
<el-option v-for='item in ProvinceList'
......@@ -147,10 +147,10 @@
<el-input type="text" v-model="addMsg.GatheringAddress" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> -->
<el-form-item class='w400' label='状态' prop="Status" >
<el-form-item class='w400' :label='$t("admin.admin_status")' prop="Status" >
<el-switch v-model="addMsg.Status" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item class='w400' label='是否显示' prop="is_show">
<el-form-item class='w400' :label='$t("admin.admin_isshow")' prop="is_show">
<el-switch v-model="addMsg.is_show" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item class='w400' label='是否为总公司' prop="IsParentCompany">
......@@ -159,9 +159,9 @@
<el-form-item class='w400' label='部门初始层级' prop="BeginTier">
<el-input type="text" v-model="addMsg.BeginTier" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item class='w400' label='负责人' prop="BranchManager">
<el-select filterable clearable v-model='addMsg.BranchManager' placeholder="请选择">
<el-option label='不限' value='0'></el-option>
<el-form-item class='w400' :label='$t("admin.admin_leader")' prop="BranchManager">
<el-select filterable clearable v-model='addMsg.BranchManager' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('admin.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in employeeList' :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId">
</el-option>
</el-select>
......@@ -197,9 +197,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">取 消</button>
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
&nbsp;
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button>
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
......@@ -221,10 +221,10 @@
return {
options: [{
value: '0',
label: '开启'
label: this.$t('pub.openSel')
}, {
value: '1',
label: '关闭'
label: this.$t('pub.closeSel')
}],
ProvinceList:[],
CityList:[],
......
src/components/scenicSpot/admissionStatistics.vue
View file @ f5bb4aa4
<template>
<div>
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<!--<li><span><em>线路</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList(msg.LineId)">
<el-option label="不限" value='-1'></el-option>
<el-option
v-for="item in LineList"
:label='item.LineName'
:value='item.LineID'
:key='item.LineID'>
</el-option>
</el-select>
</span>
</li>-->
<li><span><em>系列</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" value='-1'></el-option>
<el-option
v-for="item in LineTeamList"
:label='item.LtName'
:value='item.LtID'
:key='item.LtID'>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>团号</em><el-input v-model='msg.TCNUM' ></el-input>
<em>团号</em>
<el-input v-model='msg.TCNUM'></el-input>
</span>
</li>
<li><span><em>日期</em><el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()"/>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
</li>
</ul>
</div>
......@@ -53,17 +39,20 @@
<th>备注</th>
<th class="w80">操作</th>
</tr>
<tbody v-for="(outItem,outindex) in list" :class="{admissionStatisticsSplitTrCss:outindex%2!=0}" >
<tbody v-for="(outItem,outindex) in list" :class="{admissionStatisticsSplitTrCss:outindex%2!=0}">
<template v-for="(item,index) in outItem.StaticsReportList">
<tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div>
<div v-if='outItem.StaticsReportList.length>1' class="w100">合团号：{{outItem.NewCombinationNum}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w100">{{outItem.NewCombinationNum}}</div>
</td>
<td><div class="w80">
<td>
<div class="w80">
{{item.StartCityNames}}
</div></td>
<td><div class="w80">
</div>
</td>
<td>
<div class="w80">
{{item.FlightDate}}
<el-popover popper-class="admissionStatistics_tripDetails" width="550" trigger="click">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
......@@ -78,7 +67,8 @@
<td class="_d_name _color_666">
<span v-if="din==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="din==item.FlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span v-else-if="din>0 && din!=item.FlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
<span
v-else-if="din>0 && din!=item.FlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td>
<td>
<div>{{ds.Flight_number}}</div>
......@@ -95,19 +85,28 @@
<td>{{ds.StopoverName}}</td>
</tr>
</table>
<el-button slot="reference" class="normalBtn mt5" style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button>
<el-button slot="reference" class="normalBtn mt5"
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button>
</el-popover>
</div></td>
<td><div class="w120 link">
</div>
</td>
<td>
<div class="w120 link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}</p>
</div></td>
<td><div class="w120 link">
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}</p>
</div></td>
</div>
</td>
<td>
<div class="w120 link">
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">
{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}
</p>
</div>
</td>
<td v-for="x in item.CommonReport.ScenicList" style="vertical-align: top;">
<div style="width: 100%;">
<p class="pDateStyle" v-if="x.UseTimeStr">{{x.UseTimeStr}}</p>
<p @click="goUrlR('scenicSpotList',s.ID,'景区列表')" class="pMsgStyle phoverStype" v-for="s in x.ScenicStatisticsList">{{s.ScenicName}}</p>
<p @click="goUrlR('scenicSpotList',s.ID,'景区列表')" class="pMsgStyle phoverStype"
v-for="s in x.ScenicStatisticsList">{{s.ScenicName}}</p>
</div>
</td>
<td>
......@@ -118,7 +117,7 @@
<td>
<div class="link">
<div class="w80">
<p @click="goUrl('admissionStatisticsDetails',item,'门票详情')">详情</p>
<p @click="goUrl('admissionStatisticsDetails',item,outItem,'门票详情')">详情</p>
</div>
</div>
</td>
......@@ -127,7 +126,8 @@
<td :colspan="colspanTotal" style="text-align: left!important;padding-left: 20px;">
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252">地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252">
地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
</div>
</td>
</tr>
......@@ -135,35 +135,36 @@
</tbody>
</table>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total></el-pagination>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total></el-pagination>
</div>
</template>
<script>
export default {
data () {
export default {
data() {
return {
loading:false,
currentPage:1,
total:0,
msg:{
pageIndex:1,
pageSize:5,
SelectType:3,
loading: false,
currentPage: 1,
total: 0,
msg: {
pageIndex: 1,
pageSize: 5,
SelectType: 3,
LineId: 14,
LineteamId: "-1",
StartDate:'',
EndDate:''
StartDate: '',
EndDate: ''
},
LineList: [],
LineTeamList: [],
thLengthTitle:[],
list:[],
colspanTotal:0,
thLengthTitle: [],
list: [],
colspanTotal: 0,
}
},
methods: {
stringToArr(str){
stringToArr(str) {
return str.split(',')
},
getLineList() {
......@@ -179,8 +180,7 @@ export default {
getLineTeamList(lineId) {
this.LineTeamList = [];
this.apipost(
"team_post_GetList",
{
"team_post_GetList", {
lineID: 14,
isTOOP: 1
},
......@@ -192,16 +192,39 @@ export default {
}
);
},
goUrlR(path,obj,title){
this.$router.push({ name:path,query:{"ID":obj,blank:'y',tab:title}})
goUrlR(path, obj, title) {
this.$router.push({
name: path,
query: {
"ID": obj,
blank: 'y',
tab: title
}
})
},
goUrlT(path,obj,title){
this.$router.push({ name:path,query:{"id":obj,blank:'y',tab:title}})
goUrlT(path, obj, title) {
this.$router.push({
name: path,
query: {
"id": obj,
blank: 'y',
tab: title
}
})
},
goUrl(path,obj,title){
console.log(obj)
// return
this.$router.push({ name:path,query:{"id":obj.TCIDS,'TCNUM':obj.TCNUMS,'flightTotal':obj.TotalSeat,'GuestNum':obj.CommonReport.HouseStatistics.RealityNum,'NewCombinationNum':obj.NewCombinationNum,blank:'y',tab:title}})
goUrl(path, obj,outItem, title) {
this.$router.push({
name: path,
query: {
"id": obj.TCIDS,
'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y',
tab: title
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
......@@ -211,55 +234,36 @@ export default {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
getList(){
this.loading=true
this.apipost('dmcstatistics_post_GetUniteCombinationNumService',this.msg,res=>{
if(res.data.resultCode==1){
this.loading=false
this.total=res.data.data.count
this.list=res.data.data.pageData.data
this.thLengthTitle=[]
this.colspanTotal=res.data.data.pageData.columnsCount+6
for(let i=1;i<=res.data.data.pageData.columnsCount;i++){
this.thLengthTitle.push('第'+i+'天')
getList() {
this.loading = true
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
this.loading = false
if (res.data.resultCode == 1) {
this.total = res.data.data.count
this.list = res.data.data.pageData.data;
this.thLengthTitle = []
this.colspanTotal = res.data.data.pageData.columnsCount + 6
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
this.thLengthTitle.push('第' + i + '天')
}
// this.list.forEach(item=>{
// console.log(item)
// if(item.CommonReport.ScenicList.length<res.data.data.pageData.columnsCount){
// let _cha=res.data.data.pageData.columnsCount-item.CommonReport.ScenicList.length
// let _chaArr=new Array()
// for (let i=0;i<_cha;i++) {
// _chaArr.push({'HotelName':''})
// }
// item.CommonReport.ScenicList=item.CommonReport.ScenicList.concat(_chaArr)
// }else{
//
// }
// })
//
this.list.forEach(outItem=>{
outItem.StaticsReportList.forEach(item=>{
if(item.CommonReport.ScenicList.length<res.data.data.pageData.columnsCount){
let _cha=res.data.data.pageData.columnsCount-item.CommonReport.ScenicList.length
let _chaArr=new Array()
for (let i=0;i<_cha;i++) {
_chaArr.push({'HotelName':''})
this.list.forEach(outItem => {
outItem.StaticsReportList.forEach(item => {
if (item.CommonReport.ScenicList.length < res.data.data.pageData.columnsCount) {
let _cha = res.data.data.pageData.columnsCount - item.CommonReport.ScenicList.length
let _chaArr = new Array()
for (let i = 0; i < _cha; i++) {
_chaArr.push({
'HotelName': ''
})
}
item.CommonReport.ScenicList=item.CommonReport.ScenicList.concat(_chaArr)
}else{
item.CommonReport.ScenicList = item.CommonReport.ScenicList.concat(_chaArr)
}
})
})
}else{
this.loading=false
} else {
this.$message.error(res.data.message)
}
},err=>{})
}, err => {})
},
},
mounted() {
......@@ -273,28 +277,108 @@ export default {
this.msg.StartDate = nowDate;
this.getList()
},
}
}
</script>
<style>
.admissionStatisticsSplitTrCss td{background: #eee!important;}
.admissionStatisticsTalbe{ background: #ccc;}
.admissionStatisticsTalbe tr th{background: #E6E6E6;height:40px; font-size: 12px; color: #333;}
.admissionStatisticsTalbe tr{background: #fff;text-align: center; height: 40px;}
.admissionStatisticsTalbe tr td{font-size: 12px;}
.admissionStatisticsTalbe tr td .pHouseStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px;}
.admissionStatisticsTalbe tr td .pHouseStyle:last-child{border-bottom: none;}
.admissionStatisticsTalbe tr td .pDateStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px; margin-top: 0;}
.admissionStatisticsTalbe tr td .pMsgStyle{padding: 0 10px; line-height: 20px;}
.admissionStatisticsTalbe tr td .link p:hover{text-decoration: underline; cursor: pointer;}
.admissionStatisticsTalbe tr td .phoverStype:hover{text-decoration: underline; cursor: pointer;}
.admissionStatistics_tripDetails {padding: 0; box-shadow: 0px 1px 3px 0px #dedede; max-height: 400px;overflow-y: auto;}
.admissionStatistics_tripDetails .popper__arrow::after {border-bottom-color: #ededed !important;}
.admissionStatistics_tripDetails table { padding: 10px 0 0 20px; background-color: #ededed; border-collapse: collapse; border: 1px solid #d2d2d2; font-size: 12px;}
.admissionStatistics_tripDetails table th { background-color: #ededed; padding: 5px;}
.admissionStatistics_tripDetails table td { background-color: #ffffff; padding: 9px 15px;color: #333333;border: 1px solid #d2d2d2;}
.admissionStatistics_tripDetails table td._d_name {background-color: #ededed;}
.admissionStatistics_tripDetails table ._color_666 {color: #666666;}
.admissionStatistics_tripDetails table tr._color_666 th { padding: 9px 15px;}
.admissionStatisticsSplitTrCss td {
background: #eee !important;
}
.admissionStatisticsTalbe {
background: #ccc;
}
.admissionStatisticsTalbe tr th {
background: #E6E6E6;
height: 40px;
font-size: 12px;
color: #333;
}
.admissionStatisticsTalbe tr {
background: #fff;
text-align: center;
height: 40px;
}
.admissionStatisticsTalbe tr td {
font-size: 12px;
}
.admissionStatisticsTalbe tr td .pHouseStyle {
border-bottom: 1px solid #ccc;
height: 20px;
line-height: 20px;
}
.admissionStatisticsTalbe tr td .pHouseStyle:last-child {
border-bottom: none;
}
.admissionStatisticsTalbe tr td .pDateStyle {
border-bottom: 1px solid #ccc;
height: 20px;
line-height: 20px;
margin-top: 0;
}
.admissionStatisticsTalbe tr td .pMsgStyle {
padding: 0 10px;
line-height: 20px;
}
.admissionStatisticsTalbe tr td .link p:hover {
text-decoration: underline;
cursor: pointer;
}
.admissionStatisticsTalbe tr td .phoverStype:hover {
text-decoration: underline;
cursor: pointer;
}
.admissionStatistics_tripDetails {
padding: 0;
box-shadow: 0px 1px 3px 0px #dedede;
max-height: 400px;
overflow-y: auto;
}
.admissionStatistics_tripDetails .popper__arrow::after {
border-bottom-color: #ededed !important;
}
.admissionStatistics_tripDetails table {
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.admissionStatistics_tripDetails table th {
background-color: #ededed;
padding: 5px;
}
.admissionStatistics_tripDetails table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.admissionStatistics_tripDetails table td._d_name {
background-color: #ededed;
}
.admissionStatistics_tripDetails table ._color_666 {
color: #666666;
}
.admissionStatistics_tripDetails table tr._color_666 th {
padding: 9px 15px;
}
</style>
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ f5bb4aa4
......@@ -12,7 +12,6 @@
<table border="0" cellspacing="1" cellpadding="0" class="admissionStatisticsDetailsTalbe">
<tr>
<th width="120">公司团号</th>
<th width="120">定团号</th>
<th width="120">游览时间</th>
<th width="200">景点名称</th>
<th width="100">总人数</th>
......@@ -34,9 +33,6 @@
<td :rowspan="list.length" v-if="index==0">
<div class="w120">{{TCNUM}}</div>
</td>
<td :rowspan="list.length" v-if="index==0">
<div class="w120">{{NewCombinationNum}}</div>
</td>
<td>
<div class="w120">
{{item.UseTimeStr}}
......@@ -158,7 +154,6 @@
TCNUM: '',
flightTotal: 0,
GuestNum: 0,
NewCombinationNum: ''
}
},
methods: {
......@@ -197,6 +192,9 @@
item.ScenicStatisticsList.forEach(x => {
x.PayStyle = x.PayStyle.toString();
this.calculationPrice(x);
if(x.CombinationNum==''||x.CombinationNum==null){
x.CombinationNum = this.$route.query.NewCombinationNum;
}
})
})
} else {
......@@ -232,7 +230,6 @@
this.TCNUM = this.$route.query.TCNUM;
this.flightTotal = this.$route.query.flightTotal;
this.GuestNum = this.$route.query.GuestNum;
this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.getList()
},
}
......
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