Skip to content

S
SuperMan
Commit 3a9864ce authored by 罗超's avatar 罗超
Browse files
Options

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

parents 0251e0e8 44bb7e42
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 351 additions and 220 deletions
src/components/DomesticModule/FinancialOrder.vue
View file @ 3a9864ce
......@@ -213,7 +213,6 @@ export default {
}
this.apipost('Financial_post_GetTicketFinanceList',msg,r=>{
if(r.data.resultCode==1){
this.total = r.data.data.count;
if(this.total>0){
this.noData =false;
}else{
......
src/components/DomesticModule/SettlementOrder.vue
View file @ 3a9864ce
......@@ -149,8 +149,8 @@
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:total=total>
:page-size='msg.pageSize'
:total='total'>
</el-pagination>
</div>
</div>
......
src/components/FinancialModule/CapitalAllocation.vue
View file @ 3a9864ce
......@@ -206,8 +206,8 @@
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:total=total>
:page-size='msg.pageSize'
:total='total'>
</el-pagination>
</div>
</div>
......
src/components/FinancialModule/CapitalAllocationDetail.vue
View file @ 3a9864ce
......@@ -320,7 +320,6 @@
<div class="clearfix Ca_comLinediv">
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">{{item.Description}}</div>
<!-- <input type="button" class="hollowFixedBtn Co_oderRight" style="margin-top:25px;" value="上传凭证"/> -->
<input type="button" class="hollowFixedBtn Co_oderRight" style="margin-top:25px;" @click="showFileList(item)" :value="item.comText"/>
<div class="Cafujian clearfix" v-if="item.isShow">
<template v-for="(file,fIndex) in item.vorcherInos">
......@@ -328,19 +327,16 @@
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Content" @click="showImg(file.Content)">
</div>
<!-- <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> -->
</div>
<div v-if="file.Type==1">
<div class="iconfont " :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFile(file)">
</div>
<!-- <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> -->
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
<!-- <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> -->
</div>
</template>
</div>
......@@ -376,7 +372,6 @@
<div class="clearfix Ca_comLinediv" style="width:100%;padding:0 20px;">
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">{{item.Description}}</div>
<!-- <input type="button" class="hollowFixedBtn Co_oderRight Ca_payBtn" style="margin-top:25px;" @click="upSbankfile(item)" value="上传凭证"/> -->
<input type="button" class="hollowFixedBtn Co_oderRight Ca_payBtn" style="margin-top:25px;" @click="showFuFileList(item)" :value="item.comText"/>
<div class="Cafujian clearfix" v-if="item.isShow">
<template v-for="(file,fIndex) in item.vorcherInos">
......@@ -384,19 +379,16 @@
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Content" @click="showImg(file.Content)">
</div>
<!-- <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> -->
</div>
<div v-if="file.Type==1">
<div class="iconfont _wenjian_P" :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFileT(file)">
</div>
<!-- <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> -->
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
<!-- <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> -->
</div>
</template>
</div>
......@@ -413,17 +405,6 @@
</div>
</div>
</div>
<!-- <div class="Ca_rightFile">
<div class="_addUpload_box" v-for="item in dataList.SBankList">
<div style="width:100%;" v-if="item.vorcherInos.length>0">
<el-carousel trigger="click" height="293px" width="440px" :interval="5000">
<el-carousel-item style="height: 293px;" v-for="subItem in item.vorcherInos" v-if="subItem.Type==3">
<img @click="showImg(subItem)" :src="subItem.Content" alt="" style="width: 100%;">
</el-carousel-item>
</el-carousel>
</div>
</div>
</div> -->
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src.subCode">
......@@ -442,19 +423,6 @@
</div>
<div class="_process clearfix">
<!-- <el-popover
popper-class="detailsIT_Journal"
width="600"
placement="right"
trigger="click">
<div class="InfoChangeLog" >
<div class="changLog">
<p class="_log_t">收款流程</p>
<my-FlowChartModule :data="AuditListData"></my-FlowChartModule>
</div>
</div>
<span slot="reference" class="_flow_chart">流程图</span>
</el-popover> -->
<div class="_process_box">
<template v-for="(item,index) in GetDetail.AuditSteps">
<div class="_pb_son" :class="{_none_after:(item.NextStep==1||item.Status==4),_bohui_after:(GetDetail.Status==3 && !IsBoHui && index===GetDetail.AuditSteps.length-1)}" v-if="item.Sort==0 || (item.Status==1 && item.NextStep==1) || (item.Status==2 && item.Sort!=0) || (item.Status==4)">
......@@ -654,6 +622,7 @@ export default {
GetDetail:{
AuditSteps:[]
},
endDate: ''
}
},
create(){
......@@ -667,7 +636,17 @@ export default {
getList(){
this.apipost('Financial_get_GetFundTransfer', this.msg, res => {
if(res.data.resultCode == 1) {
this.dataList=res.data.data;
this.dataList = res.data.data;
this.GetDetail = JSON.parse(JSON.stringify(this.dataList));
this.GetDetail.AuditSteps = [];
if(this.dataList.Status==2){
let len = this.dataList.AuditSteps.length - 1;
let sLen = this.dataList.AuditSteps[len].AuditRecordList[this.dataList.AuditSteps[len].AuditRecordList.length-1];
let begTime = this.dataList.AuditSteps[0].AuditRecordList[0].AduitDate;
let enTime = sLen && sLen.AduitDate ? sLen.AduitDate : begTime;
let newTime = this.$commonUtils.formatMsgTime2(begTime,enTime);
this.endDate = newTime.replace("前","");
}
this.dataList.AuditSteps.forEach(y=>{
if(y.Sort>0){
y.contentTips = y.AuditDescription+(y.AuditWay=='2'? this.$t('fnc.huiqian') : this.$t('fnc.huoqian'));
......@@ -696,9 +675,8 @@ export default {
}, err => {})
},
AuditOrRefund(){
this.MsgBus.$emit('msg');
// this.$router.push({name:'FinancialDocuments',query:{"returnCode":this.returnCode,"pageIndex":this.pageIndex,blank:'y'}});
},
this.MsgBus.$emit('msg');
},
//点击显示附件
showFileList(item){
if(item.comText== this.$t('fnc.ycfujian')){
......
src/components/FinancialModule/invoicesManagerDetail.vue
View file @ 3a9864ce
......@@ -3,6 +3,7 @@
width: 830px;
background-color: white;
padding: 10px;
position: relative;
}
.page_iisMgdetail > p {
font-size: 18px;
......@@ -30,6 +31,18 @@
.page_iisMgdetail .cursorpointer{
text-decoration: underline;
}
.imd_img_box {
position: absolute;
right: -400px;
top: 0;
width: 400px;
background-color: #eaeaea;
}
.imd_img_box>p{
padding: 10px 25px 15px 25px;
font-size: 14px;
}
</style>
<template>
<div class="page_iisMgdetail" v-loading="loading">
......@@ -160,6 +173,16 @@
<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>
</div>
<div class="imd_img_box">
<p v-if="detail.ConfirmFileList && detail.ConfirmFileList.length>0">确认函</p>
<div style="width:100%;" v-if="detail.ConfirmFileList && detail.ConfirmFileList.length>0">
<el-carousel trigger="click" height="293px" width="440px" :interval="5000">
<el-carousel-item style="height: 293px;" v-for="(item, index) in detail.ConfirmFileList" :key="index">
<img @click="showImg(item.Url)" :src="domainManager().ViittoFileUrl + item.Url" alt="" style="width: 100%;">
</el-carousel-item>
</el-carousel>
</div>
</div>
<el-dialog title="提示信息" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie" >
<el-form label-width="110px">
<el-form-item label="拒绝理由">
......@@ -171,6 +194,9 @@
<button class="normalBtn" type="primary" @click="setStatus(4)">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
</div>
</template>
<script>
......@@ -191,9 +217,31 @@ export default {
},
noDetail: false,
EmployeeId: 0,
images: [],
imageOptions:{
navbar:false,
title:false
},
};
},
methods: {
inited (viewer){
this.$viewer = viewer
},
showImg(src){
src = this.domainManager().ViittoFileUrl + src;
let isExsit=false
this.images.forEach(x=>{
if(x==src)
isExsit=true
})
if(!isExsit) {
this.images.push(src)
} else {
this.$viewer.view(this.images.indexOf(src))
}
this.$viewer.show()
},
goUrlO: function (OrderId) {
this.$router.push({ name: 'enrollTotal', query: { id: OrderId, blank: 'y', tab: '报名统计'} });
},
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 3a9864ce
......@@ -638,9 +638,10 @@
let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.98
let totailMoney = 0
this.nav.forEach(x=>{
totailMoney += x.LeaderGetPriceT
totailMoney += parseFloat(x.LeaderGetPriceT)
})
if ((allMoney - totailMoney)<=0) return this.$message.error('总制单金额已大于等于总金额，无法制单！')
console.log(allMoney, totailMoney)
if ((allMoney - totailMoney)<0) return this.$message.error('总制单金额已大于等于总金额，无法制单！')
if (!obj.LeaderGetPriceT || obj.LeaderGetPriceT<=0) return this.$message.error('请输入金额！')
let TCIDARR = [obj.TCIDS]
let orderObj = {
......
src/components/administrative/outWorkApproval.vue
View file @ 3a9864ce
......@@ -59,8 +59,8 @@
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:total=total>
:page-size='msg.pageSize'
:total='total'>
</el-pagination>
<el-dialog custom-class='w500' :title="dialogTitle" :visible.sync="outerVisible" center >
......
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