Skip to content

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

‘领队用款计划，酒店，景点，页面优化’

parent 0bbdd31f
Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 302 deletions
src/assets/common/lang/H/h-invoicesManager.js
View file @ 1776c3c9
export const obj = {
qbfapiao: '全部发票'
qbfapiao: '全部发票',
wfqide: '我发起的',
dwspide: '待我审批的',
wspide: '我审批的',
wzfeide: '我作废的',
bbhuide: '被驳回的',
csgwode: '抄送给我的',
shenpi: '审批',
tonggei: '通过',
jujue: '拒绝',
bohui: '驳回',
qrenhan: '确认函',
gongji: '共计',
tdqdi: '条，当前第',
tiao: '条。',
shwanbi: '审核完毕',
yi: '已',
fpkjsqdan: '发票开具申请单',
bumen: '部门',
sqren: '申请人',
kjjine: '开具金额',
dzjine: '到账金额',
dzyinhang: '到账银行',
sqriqi: '申请日期',
dzriqi: '到账日期',
tuanhao: '团号',
ddanhao: '订单号',
cwdanju: '财务单据',
zanwu: '暂无',
kjneirong: '开具内容',
shuihao: '税号',
khuhang: '开户行',
shuihao2: '税号：',
qsrshuihao: '请输入税号',
sfxianshi: '是否显示',
yjshzqbyjxqtcz: '一键审核中请不要进行其他操作。',
}
export default obj;
\ No newline at end of file
src/assets/common/lang/zh.js
View file @ 1776c3c9
......@@ -1745,4 +1745,4 @@ export const visaT = {
v_Othervisas:'其他'
}
import invoicesManager from './H/h-invoicesManager'
export const invoices = invoicesManager
\ No newline at end of file
export const ios = invoicesManager
\ No newline at end of file
src/assets/css/cssReset.css
View file @ 1776c3c9
......@@ -48,6 +48,7 @@ input:-webkit-autofill{-webkit-box-shadow: 0 0 0px 1000px white inset;}
.colorccc{color: #ccc!important;}
.colorE95252{color: #E95252!important;}
.cursorpointer{cursor: pointer;}
.text-decoration{text-decoration: underline;}
.fbold{font-weight: bold!important}
.fwnormal{font-weight: normal!important}
.fnormal{font-style: normal;}
......
src/components/Details.vue
View file @ 1776c3c9
......@@ -63,7 +63,7 @@
<div class="resource-ttop" style="font-family:PingFangSC-Semibold" v-if="rootName!=''">
{{rootName}}<i class="iconfont icon-weibiaoti102"></i>{{parentName}}<i class="iconfont icon-weibiaoti102"></i><span class="active">{{currentName}}</span>
</div>
<div class="frame-box">
<div class="frame-box" ref="frameBox" name="frameBox">
<router-view></router-view>
</div>
</div>
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 1776c3c9
......@@ -32,7 +32,7 @@
<li :class="active==3?'_active':''" v-else>挂账单</li>
</ul>
<ul class="_conten">
<li v-for="(item,index) in GetList">
<li v-for="(item,index) in GetList" v-if="item.IsShow === 1">
<div class="_left">
<span class="_Icon">{{item.Name.substring(0,1)}}</span>
<div>
......@@ -125,7 +125,7 @@
let newList = [];
if (this.templateID) {
this.templateID.forEach(x=>{
this.GetList.forEach(y=>{
this.payList.forEach(y=>{
if(x === y.Id) {
newList.push(y)
}
......@@ -133,7 +133,6 @@
})
this.GetList = newList
}
},
Financial_post_GetList(){ //获取
this.apipost('Financial_post_GetList',{},res=>{
......@@ -174,7 +173,7 @@
this.showTab = this.$route.query.Type?this.$route.query.Type:0;
if(this.showTab==1){
this.GetList = this.collectList;
} else if(this.showTab==1){
} else if(this.showTab==3){
this.GetList = this.GZList;
}else{
this.GetList = this.payList;
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 1776c3c9
......@@ -112,12 +112,12 @@
<div class="page_fnDm" @keyup.enter="resetPageIndex(),getPageList()">
<ul class="_nav clearfix">
<!-- <li :class="active==5?'_active':''" @click="active=5,msg.Conditon=5,getPageList()">全部</li> -->
<li :class="active==1?'_active':''" @click="active=1, msg.Conditon=1, BOSSBtn = false, getPageList()">我发起的</li>
<li :class="active==3?'_active':''" @click="active=3, msg.Conditon=3, getPageList()">待我审批的</li>
<li :class="active==2?'_active':''" @click="active=2, msg.Conditon=2, BOSSBtn = false, getPageList()" >我审批的</li>
<li :class="active==6?'_active':''" @click="active=6, msg.Conditon=6, BOSSBtn = false, getPageList()">我作废的</li>
<li :class="active==7?'_active':''" @click="active=7, msg.Conditon=7, BOSSBtn = false, getPageList()">被驳回的</li>
<li :class="active==4?'_active':''" @click="active=4, msg.Conditon=4, BOSSBtn = false, getPageList()">抄送给我的</li>
<li :class="active==1?'_active':''" @click="active=1, msg.Conditon=1, BOSSBtn = false, getPageList()">{{$t('ios.wfqide')}}</li>
<li :class="active==3?'_active':''" @click="active=3, msg.Conditon=3, getPageList()">{{$t('ios.dwspide')}}</li>
<li :class="active==2?'_active':''" @click="active=2, msg.Conditon=2, BOSSBtn = false, getPageList()" >{{$t('ios.wspide')}}</li>
<li :class="active==6?'_active':''" @click="active=6, msg.Conditon=6, BOSSBtn = false, getPageList()">{{$t('ios.wzfeide')}}</li>
<li :class="active==7?'_active':''" @click="active=7, msg.Conditon=7, BOSSBtn = false, getPageList()">{{$t('ios.bbhuide')}}</li>
<li :class="active==4?'_active':''" @click="active=4, msg.Conditon=4, BOSSBtn = false, getPageList()">{{$t('ios.csgwode')}}</li>
</ul>
<div class="query-box">
<ul class="clearfix">
......@@ -384,7 +384,7 @@
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
<button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
<button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1)" v-if="msg.Conditon === 3 && !userMenuCode">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
<button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn" @click="BOSSBtnClick">审批</button>
<button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn" @click="BOSSBtnClick">{{$t('ios.shenpi')}}</button>
</li>
</ul>
</div>
......@@ -497,7 +497,7 @@
</template>
<template v-if='item.Type===4'>
<span class="_color_gar">{{$t('fnc.no')}}</span>
</template>
</template>
</td>
<td valign="middle">
<img class="_head_img" :src="item.EmPhoto" alt="">
......@@ -634,8 +634,8 @@
</el-form>
<el-form>
<div style=" text-align: center;">
<el-radio v-model="AuditOrRefundMsg.Status" label="5">通过</el-radio>
<el-radio v-model="AuditOrRefundMsg.Status" label="3">驳回</el-radio>
<el-radio v-model="AuditOrRefundMsg.Status" label="5">{{$t('ios.tonggei')}}</el-radio>
<el-radio v-model="AuditOrRefundMsg.Status" label="3">{{$t('ios.bohui')}}</el-radio>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -644,8 +644,8 @@
</div>
</template>
<template v-else>
<p class="boss_btn">共计 {{checkList.length}} 条，当前第 <span>{{bossLen}}</span> 条。</p>
<p class="boss_btn_tips">一键审核中请不要进行其他操作。</p>
<p class="boss_btn">{{$t('ios.gongji')}} {{checkList.length}} {{$t('ios.tdqdi')}} <span>{{bossLen}}</span> {{$t('ios.tiao')}}</p>
<p class="boss_btn_tips">{{$t('ios.yjshzqbyjxqtcz')}}</p>
</template>
</el-dialog>
</div>
......@@ -850,7 +850,7 @@ export default {
this.BOSSDialogText = false;
this.BOSSDialog = false;
this.checkList = [];
this.$message.success('审核完毕');
this.$message.success(this.$t('ios.shwanbi'));
this.loading = false;
this.getPageList(1)
}
......@@ -1018,7 +1018,7 @@ export default {
}).catch(() => {
this.$message({
type: 'info',
message: '已' + this.$t('pub.cancelBtn')
message: this.$t('ios.yi') + this.$t('pub.cancelBtn')
});
});
},
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 1776c3c9
......@@ -351,6 +351,7 @@
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
<td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 42" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
</tr>
</table>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
......@@ -397,36 +398,6 @@
<span slot="reference" style="text-decoration: underline;cursor: pointer;" @click="Financial_post_GetFinancLogList()">单据操作日志</span>
</el-popover>
</div>
<!-- <p class="_TCIDAndTCNUMList">
<span>
团队编号：
</span>
<template v-if="GetDetail.TCIDAndTCNUMList.length>0">
<p class="_TCIDAndTCNUMList_item">
<span v-for="(i,ix) in GetDetail.TCIDAndTCNUMList" class="_jump_page _font_bold" @click="jumpPage('productQuery',i.TCID,1)">
{{i.TCNUM}}（{{i.TCID}}）
<span v-if="ix!=GetDetail.TCIDAndTCNUMList.length-1"></br></span>
</span>
</p>
</template>
<template v-else>
<span>无</span>
</template>
</p>
<p v-if="GetDetail.TCIDAndTCNUMList.length==1" @click="jumpPage('TeamBalancePayment',GetDetail.TCIDAndTCNUMList,5)" class="_jump_page _font_bold">团队收支</p>
<p v-if="GetDetail.TCIDAndTCNUMList.length>1" @click="jumpPage('TeamBalancePayment',GetDetail.TCIDAndTCNUMList,6)" class="_jump_page _font_bold">团队收支</p>
<p v-if="OrderSource==9&&GetDetail.SourceID>0">国内票务：<span class="_jump_page _font_bold" @click="jumpPage('SettlementOrder',GetDetail,2)">{{GetDetail.SourceID}}</span></p>
<p v-if="OrderSource==10&&GetDetail.SourceID>0">签证：<span class="_jump_page _font_bold" @click="jumpPage('VisaProductCopy',GetDetail,3)">{{GetDetail.SourceID}}</span></p>
<p v-if="OrderSource==4&&GetDetail.SourceID>0" class="_TCIDAndTCNUMList">
<span>机票收支：</span>
<span class="_TCIDAndTCNUMList_item">
<template v-for="(i,ix) in GetDetail.TCIDAndTCNUMList">
<span class="_jump_page _font_bold" @click="jumpPage('FinancialOrder',GetDetail,4)">{{i.TCNUM}}（{{GetDetail.SourceID}}）</span>
<span v-if="ix!=GetDetail.TCIDAndTCNUMList.length-1"></br></span>
</template>
</span>
</p>
<p class="_jump_page _font_bold" @click="jumpPage('RegistrationList',GetDetail,7)">报名清单</p> -->
</div>
</div>
<my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill>
......@@ -911,6 +882,12 @@ export default {
window.open(routeData.href, "_blank");
}
},
jumpPlanPage(path, id){
this.$router.push({
name: path,
query: { id: id, isUpdate: false, blank: 'y'}
})
},
jumpPage(path,id,type){
if(type==1){
// let routeData = this.$router.resolve({
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 1776c3c9
......@@ -1021,8 +1021,14 @@ export default {
if(x.ID == i){
if (t>=0) {
this.msg.detailList[t].CostTypeName = x.Name;
if (x.ID === 56) {
this.msg.detailList[t].Remark = `地接费领取自动生成：${this.orderObj.TCNUMS}`;
}
}else{
this.detailList.CostTypeName = x.Name;
if (x.ID === 56) {
this.detailList.Remark = `地接费领取自动生成：${this.orderObj.TCNUMS}`;
}
}
}
})
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ 1776c3c9
......@@ -326,6 +326,10 @@
<el-radio v-model="addMsg.IsUploadPic" :label="0">{{$t('fnc.buqiyong')}}</el-radio>
<el-radio v-model="addMsg.IsUploadPic" :label="1">{{$t('fnc.qiyong')}}</el-radio>
</el-form-item>
<el-form-item :label="$t('ios.sfxianshi')">
<el-radio v-model="addMsg.IsShow" :label="1">{{$t('pub.yes')}}</el-radio>
<el-radio v-model="addMsg.IsShow" :label="2">{{$t('pub.no')}}</el-radio>
</el-form-item>
<el-form-item :label="$t('fnc.syfeiyong')" v-if="addMsg.TemplateType==8" class="_treeselect">
<!-- <el-select filterable multiple v-model='CostIdS' class="w200" @change="disabledOption2">
<el-option label='通用' value='0' key='0'></el-option>
......@@ -517,6 +521,7 @@ export default {
AuditList:[],
AuditUserList:[],
},
IsShow: 1,
},
AuditUserList:{
EmName:'',
......@@ -713,6 +718,7 @@ export default {
this.addMsg.DescribeInfo = data.DescribeInfo;
this.addMsg.TempLateClass = data.TempLateClass;
this.addMsg.IsUploadPic = data.IsUploadPic;
this.addMsg.IsShow = data.IsShow;
if (data.list && data.list[0] !== -1) {
this.accListMsg = data.list;
}
......
src/components/FinancialModule/invoicesManagerAdd.vue
View file @ 1776c3c9
......@@ -79,7 +79,7 @@
</td>
</tr>
<tr>
<td>平台ID</td>
<td>订单号</td>
<td colspan="3" class="w600 text-align-left">
{{msg.OrderId}}
</td>
......
src/components/FinancialModule/invoicesManagerDetail.vue
View file @ 1776c3c9
......@@ -46,7 +46,7 @@
</style>
<template>
<div class="page_iisMgdetail" v-loading="loading">
<p>发票开具申请单</p>
<p>{{$t('ios.fpkjsqdan')}}</p>
<table
data-v-ca5157c2
border="1"
......@@ -54,106 +54,106 @@
style="border-collapse: collapse;"
>
<tr>
<td width="130">部门</td>
<td width="130">{{$t('ios.bumen')}}</td>
<td>{{detail.deptName}}</td>
<td width="130">申请人</td>
<td width="130">{{$t('ios.sqren')}}</td>
<td>{{detail.CreateBy}}</td>
</tr>
<tr>
<td>开具金额</td>
<td>{{$t('ios.kjjine')}}</td>
<td>
{{detail.ApplyMoney}}
</td>
<td>到账金额</td>
<td>{{$t('ios.dzjine')}}</td>
<td @click="goSaleFinacial" class="cursorpointer">
{{orderList.moneyStr}}
</td>
</tr>
<tr class="page_iisMgadd_bank">
<td>到账银行</td>
<td>{{$t('ios.dzyinhang')}}</td>
<td colspan="3" class="_bank_td">
{{orderList. AccountNumber}}
</td>
</tr>
<tr>
<td>申请日期</td>
<td>{{$t('ios.sqriqi')}}</td>
<td>
{{detail.CreateDateStr}}
</td>
<td>到账日期</td>
<td>{{$t('ios.dzriqi')}}</td>
<td>
{{orderList.TradeDateStr}}
</td>
</tr>
<tr>
<td>团号</td>
<td>{{$t('ios.tuanhao')}}</td>
<td colspan="3" class="w600 text-align-left font-weight cursorpointer" @click="goUrlT('productQuery', detail.TCNUM, '产品查询')">
{{detail.TCNUM}}({{detail.TCID}})
</td>
</tr>
<tr>
<td>订单号</td>
<td>{{$t('ios.ddanhao')}}</td>
<td colspan="3" class="w600 text-align-left font-weight cursorpointer">
<span @click="goUrlO(detail.OrderId)">{{detail.OrderId}}</span>
</td>
</tr>
<tr>
<td>财务单据</td>
<td>{{$t('ios.cwdanju')}}</td>
<td colspan="3" class="w600 text-align-left font-weight cursorpointer">
<template v-for="item in orderList.FrIDs">
<span @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', detail.OrderId, detail.TCNUM, detail.TCID)">{{item}}</span>
</template>
<span v-if="orderList.FrIDs && orderList.FrIDs.length<1">暂无</span>
<span v-if="orderList.FrIDs && orderList.FrIDs.length<1">{{$t('ios.zanwu')}}</span>
</td>
</tr>
<tr>
<td rowspan="6">开具内容</td>
<td>公司名称</td>
<td rowspan="6">{{$t('ios.kjneirong')}}</td>
<td>{{$t('admin.admin_company')}}</td>
<td colspan="2" class="font-weight">
{{detail.CompanyName}}
</td>
</tr>
<tr>
<td>税号</td>
<td>{{$t('ios.shuihao')}}</td>
<td colspan="2" class="font-weight">
{{detail.DutyParagraph}}
</td>
</tr>
<tr>
<td>地址</td>
<td>{{$t('admin.admin_address')}}</td>
<td colspan="2">
{{detail.Address}}
</td>
</tr>
<tr>
<td>电话</td>
<td>{{$t('hotel.table_tel')}}</td>
<td colspan="2">
{{detail.CompanyPhone}}
</td>
</tr>
<tr>
<td>开户行</td>
<td>{{$t('ios.khuhang')}}</td>
<td colspan="2">
{{detail.OpeningBank}}
</td>
</tr>
<tr>
<td>账号</td>
<td>{{$t('system.table_acc')}}</td>
<td colspan="2">
{{detail.BankNo}}
</td>
</tr>
<tr>
<td>备注</td>
<td>{{$t('hotel.hotel_remark')}}</td>
<td colspan="3">
{{detail.Remarks}}
</td>
</tr>
</table>
<el-dialog title="提示信息" width="400px" :visible.sync="dialogFormVisible2" center :before-close="closeChangeMachie" >
<el-dialog :title="$t('pub.hintMsg')" width="400px" :visible.sync="dialogFormVisible2" center :before-close="closeChangeMachie" >
<el-form label-width="110px">
<el-form-item label="税号：">
<el-input class="" v-model="msg.InvoiceNo" placeholder="请输入税号"></el-input>
<el-form-item :label="$t('ios.shuihao2')">
<el-input class="" v-model="msg.InvoiceNo" :placeholder="$t('ios.qsrshuihao')"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" >
......@@ -163,12 +163,12 @@
</el-dialog>
<div style="padding:20px 0">
<el-row v-if="detail.InvoiceNo">
税号：{{detail.InvoiceNo}}
{{$t('ios.shuihao2')}}{{detail.InvoiceNo}}
</el-row>
</div>
<div class="iis_save" v-if="!noDetail && detail.InvoiceApplyState===1">
<button class="normalBtn" @click="dialogFormVisible2 = true">通过</button>
<button class="hollowFixedBtn" @click="dialogFormVisible = true">拒绝</button>
<button class="normalBtn" @click="dialogFormVisible2 = true">{{$t('ios.tonggei')}}</button>
<button class="hollowFixedBtn" @click="dialogFormVisible = true">{{$t('ios.jujue')}}</button>
</div>
<div class="iis_save" v-else-if="noDetail && detail.InvoiceApplyState===1 && EmployeeId === detail.CreateBy && EmployeeId === 1">
<button class="normalBtn" @click="setStatus(2)">{{$t('pub.cancelBtn')}}</button>
......
src/components/Hotel/roomReservations.vue
View file @ 1776c3c9
......@@ -28,7 +28,7 @@
</li>
</ul>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle" :style="{height: boxHeight + 'px'}">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading='loading'>
<tr>
<th width="w100">序号</th>
......@@ -208,6 +208,7 @@
thLengthTitle: [],
list: [],
colspanTotal: 0,
boxHeight: 0,
}
},
methods: {
......@@ -306,6 +307,7 @@
y.colNum = 9 + y.CommonReport.newHotel.length;
})
})
this.$forceUpdate()
} else {
this.loading = false
this.$message.error(res.data.message)
......@@ -333,6 +335,11 @@
} else {
this.msg.StartDate = nowDate;
}
let width = window.innerWidth - 50
let height = window.innerHeight - 65 - 164
console.log(height)
this.boxHeight = height;
this.offsetwidth = width
this.getList()
this.getLineTeamList()
},
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 1776c3c9
......@@ -4,11 +4,10 @@
<ul>
<li>
<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>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}" class="ownScrollbarStyle" ref="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe">
<tr>
<th class="fz14" colspan="8">团队信息</th>
......@@ -40,7 +39,7 @@
<th width="80">操作</th>
</tr>
<template v-for="(item,index) in list">
<tr v-for="(subItem,subIndex) in item.HotelOrderList">
<tr v-for="(subItem,subIndex) in item.HotelOrderList" v-loading="loading">
<td :rowspan="item.HotelOrderList.length" v-if="subIndex==0">
<div class="w100">{{item.UseTimeStr}}</div>
</td>
......@@ -97,6 +96,12 @@
<span style="float: right; color:red; font-size: 13px">{{itemHotel.Inventory }}</span>
</el-option>
</el-select>
<p style="padding-top: 5px;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p>
<el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
<el-button size="small" type="danger" @click='getItem(index, subIndex)'>{{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
</el-upload>
</div>
</td>
<td>
......@@ -210,6 +215,9 @@
</template>
</table>
</div>
<div>
</div>
</div>
</template>
<script>
......@@ -231,9 +239,33 @@
CreateByName: '',
//点击项
ClickItem: {},
offsetwidth: 0,
parentEle: '',
checkedIndex: '',
checkedsubIndex: '',
loading: false,
boxHeight: 0,
}
},
methods: {
getItem (index, subIndex) {
this.checkedIndex = index
this.checkedsubIndex = subIndex
},
uploadFileBtnS (file) { //手配书上传
let that = this
let newArr = []
newArr.push(file.file)
let path = '/Upload/Temporary/'
this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => {
this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl = this.domainManager().ViittoFileUrl + x.data.FilePath
this.$message.success(x.data.Message)
let newlist = JSON.parse(JSON.stringify(this.list))
this.list = newlist
this.$forceUpdate()
})
},
//添加酒店
AddHotel(item, subIndex) {
var subItem = JSON.parse(JSON.stringify(item.HotelOrderList[subIndex]));
......@@ -318,17 +350,18 @@
})
},
getList() {
this.loading = true
this.apipost('dmcstatistics_get_GetHotelStaticsDetail', {
TCIDs: this.$route.query.id,
NewCombinationNum: this.$route.query.NewCombinationNum
}, res => {
if (res.data.resultCode == 1) {
this.list = res.data.data.HotelOrderListReport;
let list = res.data.data.HotelOrderListReport;
this.CreateBy = res.data.data.CreateBy;
this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount;
if (this.list != null && this.list.length > 0) {
this.list.forEach(item => {
if (list != null && list.length > 0) {
list.forEach(item => {
item.HotelOrderList.forEach(subItem => {
subItem.hotelList.push({
Name: subItem.NewHotelName,
......@@ -351,10 +384,13 @@
}
})
});
this.list = list;
this.$forceUpdate()
}
} else {
this.$message.error(res.data.message);
}
this.loading = false
}, err => {})
},
calculationPrice(obj) {
......@@ -417,11 +453,13 @@
})
});
})
this.loading = true
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.getList();
this.Success(res.data.message);
} else {
this.loading = false
this.Error(res.data.message);
}
}, err => {})
......@@ -464,8 +502,26 @@
this.TCNUM = this.$route.query.TCNUM;
this.flightTotal = this.$route.query.flightTotal;
this.GuestNum = this.$route.query.GuestNum;
let width = window.innerWidth - 50
let height = window.innerHeight - 65 -55
console.log(height)
this.boxHeight = height;
this.offsetwidth = width
this.getList();
},
watch: {
// list:{
// handler: function(val, oldVal) {
// this.$nextTick(function(){
// let ele = this.$parent.$refs.frameBox
// this.parentEle = ele;
// console.log(ele.scrollHeight > ele.height)
// console.log(ele.teamReimbursement)
// });
// },
// deep: true
// }
}
}
</script>
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 1776c3c9
......@@ -11,7 +11,7 @@
<th width="">出团人数</th>
<th width="">领队</th>
<th width="">导游</th>
<th width="120">操作</th>
<!-- <th width="120">操作</th> -->
</tr>
<tr v-for='item in nav'>
<td>{{item.StartCityNames}}</td>
......@@ -25,11 +25,11 @@
<td>{{item.TotalSeat}}人</td>
<td>{{item.LeaderName}}</td>
<td>{{item.GuideName}}</td>
<td class="_go_detail">
<!-- <td class="_go_detail">
<p @click="goHotelDetail(item.TCIDS, item.NewCombinationNum, item.TCNUMS, 'roomReservationsDetails')">酒店</p>
<p @click="goHotelDetail(item.TCIDS, item.NewCombinationNum, item.TCNUMS, 'bookDinnerStatisticsDetails')">餐食</p>
<p @click="goHotelDetail(item.TCIDS, item.NewCombinationNum, item.TCNUMS, 'admissionStatisticsDetails')">景点</p>
</td>
</td> -->
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -44,6 +44,7 @@
<td width="60">用车方式</td>
<td width="60">车费</td>
<td width="80">高速公路费</td>
<td width="120">高速费用付款方式</td>
<td width="60">停车费</td>
<td width="60">金额小计</td>
<td width="60">总金额</td>
......@@ -63,6 +64,11 @@
<td>
{{moneyFormat(item.CostPrice)}}
</td>
<td>
<span v-if="item.HighSpeedPayType === 1">现付</span>
<span v-if="item.HighSpeedPayType === 2">公司结算</span>
<span v-if="item.HighSpeedPayType === 3">预付</span>
</td>
<td>
{{moneyFormat(item.HighSpeedPrice)}}
</td>
......@@ -88,9 +94,13 @@
</tr>
<tr>
<td>总金额</td>
<td colspan="12">
<td colspan="6">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="6">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingIncomeTotalPrice)}}
</td>
</tr>
</tbody>
</table>
......@@ -104,11 +114,12 @@
<td width="80">实际用房数</td>
<td width="">房间类型</td>
<td width="">房间数</td>
<td width="">免费人数</td>
<td width="80">免费人数</td>
<td width="">单价/人</td>
<td width="">金额小计</td>
<td width="">返佣</td>
<td width="">总金额</td>
<td width="">付款方式</td>
<td width="100">备注</td>
</tr>
......@@ -117,6 +128,9 @@
<td>
<div v-for="subItem in outItem.HotelOrderList" style="line-height: inherit;">
{{subItem.HotelName}}
<p class="cursorpointer" style="margin-top:5px;color: blue;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p>
</div>
</td>
<td>
......@@ -161,7 +175,7 @@
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.OrderDetailsList">
<p v-for="childItem in subItem.OrderDetailsList" class="cursorpointer text-decoration" @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
{{moneyFormat(childItem.UnitPrice)}}
</p>
</div>
......@@ -192,6 +206,13 @@
</div>
</div>
</td>
<td>
<div v-for="subItem in outItem.HotelOrderList">
<span v-if="subItem.HighSpeedPayType === 1">现付</span>
<span v-if="subItem.HighSpeedPayType === 2">公司结算</span>
<span v-if="subItem.HighSpeedPayType === 3">预付</span>
</div>
</td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
......@@ -204,9 +225,13 @@
</tr>
<tr>
<td>总金额</td>
<td colspan="12">
<td colspan="6">
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="6">
{{moneyFormat(TotalNav.reimburseTotalPrice.BalanceTotalPrice)}}
</td>
</tr>
</tbody>
......@@ -219,11 +244,12 @@
<td width="180" style="line-height: inherit;">餐厅名称</td>
<td width="100">类别</td>
<td width="">用餐人数</td>
<td width="">免费人数</td>
<td width="80">免费人数</td>
<td width="">单价</td>
<td width="">金额小计</td>
<td width="">返佣</td>
<td width="">总金额</td>
<td width="">付款方式</td>
<td width="100">备注</td>
</tr>
<tr class="splitP ScenicTr" v-for='(item,index) in list.DiningList'>
......@@ -247,14 +273,14 @@
</td>
<td>
<div v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList">
<p v-for="childItem in subItem.DiningPriceList" >
{{childItem.Discount}}
</p>
</div>
</td>
<td>
<div v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList">
<p v-for="childItem in subItem.DiningPriceList" class="cursorpointer text-decoration" @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')">
{{moneyFormat(childItem.PeoplePrice)}}
</p>
</div>
......@@ -278,15 +304,26 @@
{{diningTotalPrice(subItem.DiningPriceList)}}
</div>
</td>
<td>
<div v-for="subItem in item.DiningSummaryList">
<span v-if="subItem.HighSpeedPayType === 1">现付</span>
<span v-if="subItem.HighSpeedPayType === 2">公司结算</span>
<span v-if="subItem.HighSpeedPayType === 3">预付</span>
</div>
</td>
<td>
{{item.Remarks}}
</td>
</tr>
<tr>
<td>总金额</td>
<td colspan="10">
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.TipTotalPrice)}}
</td>
</tr>
</tbody>
</table>
......@@ -298,17 +335,18 @@
<td width="180" style="line-height: inherit;">景点名称</td>
<td width="100">总人数</td>
<td width="">门票类别</td>
<td width="">免费人数</td>
<td width="80">免费人数</td>
<td width="">单价</td>
<td width="">金额小计</td>
<td width="">返佣</td>
<td width="">总金额</td>
<td width="">付款方式</td>
<td width="100">备注</td>
</tr>
<tr class="splitP ScenicTr" v-for='(item,index) in list.ScenicList'>
<td>{{item.UseTimeStr}}</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
<div style="line-height: inherit; height: auto;" v-for="subItem in item.ScenicStatisticsList">
{{subItem.ScenicName}}
</div>
</td>
......@@ -333,7 +371,7 @@
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
<p v-for="o in subItem.TicketPriceList">
<p v-for="o in subItem.TicketPriceList" class="cursorpointer text-decoration" @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'admissionStatisticsDetails')">
{{moneyFormat(o.PeoplePrice)}}
</p>
</div>
......@@ -357,18 +395,28 @@
{{scenicTotalPrice(subItem.TicketPriceList)}}
</div>
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
<span v-if="subItem.HighSpeedPayType === 1">现付</span>
<span v-if="subItem.HighSpeedPayType === 2">公司结算</span>
<span v-if="subItem.HighSpeedPayType === 3">预付</span>
</div>
</td>
<td>
<div style="padding: 0 10px;" v-for="subItem in item.ScenicStatisticsList">
{{item.Remarks}}
</div>
</td>
</tr>
<tr>
<td>总金额</td>
<td colspan="10">
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.PlanTotalPrice)}}
</td>
</tr>
</tbody>
</table>
......@@ -383,207 +431,14 @@
<td rowspan="2" width="180" v-if="index===0">总金额： {{moneyFormat(TotalNav.reimburseTotalPrice.PlanPrice * 0.98)}}</td>
<td>{{item.TCNUMS}}</td>
<td>
<span v-if="item.LeaderGetPrice>0">{{moneyFormat(item.LeaderGetPrice)}}</span>
<el-input v-else class="w300" type="number" v-model="item.LeaderGetPriceT"></el-input>
<p v-if="item.LeaderGetPrice>0">已领款：{{moneyFormat(item.LeaderGetPrice)}}</p>
<el-input v-if="item.LeaderGetPrice>0 || item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.98)" class="w300" type="number" v-model="item.LeaderGetPriceT"></el-input>
</td>
<td width="80" class="_zhidan">
<input type="button" v-if="isUpdate=='true'" value="制单" class="normalBtn" @click="goZhiDan(item)" />
</td>
</tr>
</table>
<!-- <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody>
<tr class="title">
<td width="80" class="bgwhite" :rowspan="list.OtherOrderReportList.OtherList.length+1">其他费用</td>
<td width="120">使用时间</td>
<td width="150">费用项目</td>
<td width="80">总人数</td>
<td width="80">单价</td>
<td width="80">金额小计</td>
<td width="80">返佣</td>
<td width="80">总金额</td>
<td>备注</td>
<td width="80">
<input type="button" value="添加" class="normalBtn" @click="addOtherList(1,1)" />
</td>
</tr>
<tr v-for='(item,index) in list.OtherOrderReportList.OtherList'>
<td>
<el-date-picker v-model='item.UseDate' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</td>
<td>
<el-select class='w120 sel' v-model='item.CostProject' :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-select>
</td>
<td>
<el-input v-model='item.TotalNum' @keyup.native="checkInteger(item,'TotalNum')" class='w50'></el-input>
</td>
<td>
<el-input v-model='item.UnitPrice' @keyup.native="checkPrice(item,'UnitPrice')" class='w50'></el-input>
</td>
<td>
{{item.TotalNum*item.UnitPrice}}
</td>
<td>
<el-input v-model='item.Rebate' class='w50' @keyup.native="checkInteger(item,'Rebate')"></el-input>%
</td>
<td v-if='index==0' :rowspan='list.OtherOrderReportList.OtherList.length'>
{{otherTotalPrice(list.OtherOrderReportList.OtherList)}}
</td>
<td style="padding: 0 10px;">
<el-input v-model='item.Remark' type="textarea" autosize></el-input>
</td>
<td>
<p @click="deleteOtherListItem(1,index)">删除</p>
</td>
</tr>
</tbody>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody>
<tr class="title">
<td width="80" class="bgwhite" rowspan="2">小费收入</td>
<td width="120">人数</td>
<td width="120">单价</td>
<td width="80">总金额</td>
<td>备注</td>
</tr>
<tr v-for='(item,index) in list.OtherOrderReportList.TipList'>
<td>
<el-input class='w80' @keyup.native="checkInteger(item,'TotalNum')" v-model='item.TotalNum'></el-input>
</td>
<td>
<el-input class='w80' @keyup.native="checkPrice(item,'UnitPrice')" v-model='item.UnitPrice'></el-input>
</td>
<td>{{item.TotalNum*item.UnitPrice}}</td>
<td style="padding: 0 10px;">
<el-input v-model='item.Remark' type="textarea" autosize></el-input>
</td>
</tr>
</tbody>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody>
<tr class="title">
<td width="80" class="bgwhite" rowspan="2">团费小计</td>
<td width="120">金额</td>
<td>备注</td>
</tr>
<tr v-for='(item,index) in list.OtherOrderReportList.TeamList'>
<td>
<el-input class='w80' @keyup.native="checkPrice(item,'UnitPrice')" v-model='item.UnitPrice'></el-input>
</td>
<td style="padding: 0 10px;">
<el-input v-model='item.Remark' type="textarea" autosize></el-input>
</td>
</tr>
</tbody>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody>
<tr class="title">
<td width="80" class="bgwhite" :rowspan="list.OtherOrderReportList.SelfPlayingIncomeList.length+1">自费收入</td>
<td width="120">使用时间</td>
<td width="80">人数</td>
<td width="80">单价</td>
<td width="80">金额小计</td>
<td width="80">总金额</td>
<td>备注</td>
<td width="80">
<input type="button" value="添加" class="normalBtn" @click="addSelfPlayingIncomeList(outIndex,0)" />
</td>
</tr>
<tr v-for='(item,index) in list.OtherOrderReportList.SelfPlayingIncomeList'>
<td>
<el-date-picker v-model='item.UseDate' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</td>
<td>
<el-input class='w50' @keyup.native="checkInteger(item,'TotalNum')" v-model='item.TotalNum'></el-input>
</td>
<td>
<el-input class='w50' @keyup.native="checkPrice(item,'UnitPrice')" v-model='item.UnitPrice'></el-input>
</td>
<td>{{item.TotalNum*item.UnitPrice}}</td>
<td v-if='index==0' :rowspan="list.OtherOrderReportList.SelfPlayingIncomeList.length">
{{otherTotalPrice(list.OtherOrderReportList.SelfPlayingIncomeList)}}
</td>
<td style="padding: 0 10px;">
<el-input v-model='item.Remark' type="textarea" autosize></el-input>
</td>
<td>
<span @click="deleteSelfPlayingIncomeListItem(1,index)">删除</span>
</td>
</tr>
</tbody>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody>
<tr class="title">
<td width="80" class="bgwhite" :rowspan="list.OtherOrderReportList.SelfPlayingExpendList.length+1">自费支出</td>
<td width="120">使用时间</td>
<td width="80">人数</td>
<td width="80">单价</td>
<td width="80">金额小计</td>
<td width="80">返佣</td>
<td width="80">总金额</td>
<td>备注</td>
<td width="80">
<input type="button" value="添加" class="normalBtn" @click="addSelfPlayingExpendList(outIndex,outItem.TCID)" />
</td>
</tr>
<tr v-for='(item,index) in list.OtherOrderReportList.SelfPlayingExpendList'>
<td>
<el-date-picker v-model='item.UseDate' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</td>
<td>
<el-input class='w50' @keyup.native="checkInteger(item,'TotalNum')" v-model='item.TotalNum'></el-input>
</td>
<td>
<el-input class='w50' @keyup.native="checkPrice(item,'UnitPrice')" v-model='item.UnitPrice'></el-input>
</td>
<td>{{item.TotalNum*item.UnitPrice}}</td>
<td>
<el-input class='w50' v-model='item.Rebate'></el-input>%</td>
<td v-if='index==0' :rowspan="list.OtherOrderReportList.SelfPlayingExpendList.length">
{{otherTotalPrice(list.OtherOrderReportList.SelfPlayingExpendList)}}
</td>
<td style="padding: 0 10px;">
<el-input v-model='item.Remark' type="textarea" autosize></el-input>
</td>
<td>
<span @click="deleteSelfPlayingExpendList(1,index)">删除</span>
</td>
</tr>
</tbody>
</table> -->
<!-- <p class="alcenter">
<input type="button" v-if="isUpdate=='true'" value="保存" class="normalBtn" @click="saveData()" />
</p> -->
<div v-if='picIsShow' class="viewBigPicLayer">
<i class="el-icon-circle-close-outline clolseViewBigPicLayer" @click="picIsShow=false,picObj=[]"></i>
<el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
......@@ -635,6 +490,7 @@
});
},
goZhiDan: function (obj) {
console.log(obj)
let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.98
let totailMoney = 0
this.nav.forEach(x=>{
......@@ -652,15 +508,18 @@
TCIDList: TCIDARR,
CostType: 56,
Money: obj.LeaderGetPriceT,
TCNUMS: obj.TCNUMS
}
let id = [42]
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type":2,
"companyID":obj.OutBranchId,
"Type": 2,
"templateID": JSON.stringify(id),
"companyID": obj.OutBranchId,
"path": "",
'blank':'y',
'orderObj':JSON.stringify(orderObj),
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
}
});
},
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ 1776c3c9
......@@ -27,7 +27,7 @@
</li>
</ul>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle" :style="{height: boxHeight + 'px'}">
<table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe" v-loading='loading'>
<tr>
<th width="50">序号</th>
......@@ -175,6 +175,7 @@
thLengthTitle: [],
list: [],
colspanTotal: 0,
boxHeight: 0,
}
},
methods: {
......@@ -283,6 +284,7 @@
}
});
});
this.$forceUpdate()
} else {
this.$message.error(res.data.message);
}
......@@ -298,6 +300,11 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
let width = window.innerWidth - 50
let height = window.innerHeight - 65 - 164
console.log(height)
this.boxHeight = height;
this.offsetwidth = width
this.getList()
},
}
......
src/components/busManagement/BusInfo.vue
View file @ 1776c3c9
......@@ -178,6 +178,8 @@
<th width="200">订团号</th>
<th width="250">司机住宿</th>
<th>泊车说明</th>
<th width="120">高速费用</th>
<th width="120">高速费用付款方式</th>
<th width="120">使用人数</th>
<th>成本价</th>
<th width="120">备注</th>
......@@ -286,6 +288,21 @@
<el-input class="w135" v-model="item.ParkExplain" placeholder="请输入说明"></el-input>
</div>
</td>
<td>
<div class="w150">
<el-input class="w135" @blur='getBusPrice(item)' v-model="item.HighSpeedPrice" placeholder="请输入费用"></el-input>
</div>
</td>
<td>
<div class="w120">
<el-select class='w100 sel' v-model='item.HighSpeedPayType' :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-select>
</div>
</td>
<td>
<div class="w80">
<el-input class="w50" v-model="item.UseNum" @keyup.native="checkPrice(item,'UseNum')"></el-input>
......@@ -473,7 +490,7 @@
if (checkObj) {
money = checkObj.AllDayPrice;
}
obj.CostPrice = money;
obj.CostPrice = money + parseFloat(obj.HighSpeedPrice);
}
},
AddSubItem(item) {
......
src/components/dmc/manager/teamReimbursement.vue
View file @ 1776c3c9
......@@ -465,6 +465,14 @@
<span>出团公司</span>
{{item.OutBranchName}}
</p>
<p>
<span>领队</span>
{{item.LeaderName}}
</p>
<p>
<span>导游</span>
{{item.GuideName}}
</p>
</div>
</td>
<td>
......
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