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
Show 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/BasicDocuments.vue
View file @ 3a9864ce
......@@ -412,7 +412,7 @@
</div>
<div class="_tit _tit2 w890px">
<p>
<span class="_text">审核流程</span>
<span class="_text">审核流程22</span>
<span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</p>
......@@ -422,6 +422,23 @@
</div>
</div>
</div>
<!-- <template>
<div class="w890px">
<div class="_tit _tit2 w890px _border_bottom_none">
<p>
<span class="_text">原始退款</span>
<span class="_btn" v-if="tableShowTuikuan" @click="tableShowTuikuan=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShowTuikuan=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</p>
<div v-show="tableShowTuikuan" >
<table>
</table>
</div>
</div>
</div>
</template> -->
<div class="_process clearfix">
<!-- <el-popover
popper-class="detailsIT_Journal"
......@@ -491,11 +508,42 @@
<div v-else-if="item.SpecialNode!==0&&AuditOrRefundMsg.Status=='5'">
<textarea class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea>
</div>
<div class="_radio_lsit">
<div class="_radio_lsit clearfix">
<div style="float:left">
<el-radio v-model="AuditOrRefundMsg.Status" label="5">通过</el-radio>
<el-radio v-model="AuditOrRefundMsg.Status" label="3">驳回</el-radio>
</div>
<div style="float:right" v-if="isShowChoice&&AuditOrRefundMsg.Status=='5'">
<el-radio v-model="choiceMsg.Status" label="1">常规</el-radio>
<el-radio v-model="choiceMsg.Status" label="2">原路退款</el-radio>
</div>
</div>
<!--<div class="_pay_box" v-if="AuditOrRefundMsg.Status=='5'&&item.SpecialNode==2">-->
<div class="_pay_box" v-if="choiceMsg.Status=='2'">
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;" v-if="GetDetail.TradeDetailList&&GetDetail.TradeDetailList.length>0">
<tr>
<th>账户名称</th>
<th>收款总额</th>
<th>收款日期</th>
<th>类型</th>
<th>交易流水号</th>
<th>可退金额</th>
<th>操作</th>
</tr>
<tr v-for="(subItem,index) in GetDetail.TradeDetailList">
<td>{{subItem.AccountName}}</td>
<td>{{subItem.Money}}</td>
<td>{{subItem.Pay_DateStr}}</td>
<td>{{subItem.Pay_WayName}}</td>
<td>{{subItem.Trade_Order}}</td>
<td>{{subItem.CanRefundMoney}}</td>
<td>
<el-checkbox v-model="subItem.isChecked" @change="changeStatus(subItem,index)"></el-checkbox>
<el-input v-if="subItem.isChecked" v-model="subItem.RefundMoney" @blur="addPayList(subItem,index)" @keyup.native="checkPrice(subItem,'RefundMoney')" class="w80" placeholder="请输入退款金额"/>
</td>
</tr>
</table>
</div>
<div class="_pay_box" v-if="AuditOrRefundMsg.Status=='5'&&item.SpecialNode==2">
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;" v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length<1">
<tr>
......@@ -560,7 +608,7 @@
<td>
<el-input v-model="i.Rate" @change="Calculation(1,index)" @blur="addList(2,index)" type="number" class=" _border_b_1"></el-input>
</td>
<td>{{i.allMoney.toFixed(2)}}</td>
<td>{{i.allMoney}}</td>
</tr>
</template>
<tr @keyup.enter="addList()">
......@@ -593,7 +641,7 @@
</td>
<!-- <td>{{payMsg.balance}}</td> -->
<td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation()" @blur="addList()" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation()" @blur="addList()" @keyup.native="checkPrice(payMsg,'OriginalMoney')" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{payMsg.CurrenName}}</p>
......@@ -655,6 +703,7 @@
</el-date-picker>
</div>
</div>
<div class="_upload_box">
<ul class="clearfix">
<li v-for="(img,imgIndex) in uploadImgList">
......@@ -694,9 +743,40 @@
</p>
<textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea>
<!-- <textarea v-if="AuditOrRefundMsg.Status=='3'&&item.SpecialNode!=0" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea> -->
<div class="_radio_lsit">
<div class="_radio_lsit clearfix">
<div style="float:left">
<el-radio v-model="AuditOrRefundMsg.Status" label="5">通过</el-radio>
<el-radio v-model="AuditOrRefundMsg.Status" label="3">驳回</el-radio>
</div>
<div style="float:right" v-if="isShowChoice&&AuditOrRefundMsg.Status=='5'">
<el-radio v-model="choiceMsg.Status" label="1">常规</el-radio>
<el-radio v-model="choiceMsg.Status" label="2">原路退款</el-radio>
</div>
</div>
<div class="_pay_box" v-if="choiceMsg.Status=='2'">
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;" v-if="GetDetail.TradeDetailList&&GetDetail.TradeDetailList.length>0">
<tr>
<th>账户名称</th>
<th>收款总额</th>
<th>收款日期</th>
<th>类型</th>
<th>交易流水号</th>
<th>可退金额</th>
<th>操作</th>
</tr>
<tr v-for="(subItem,index) in GetDetail.TradeDetailList">
<td>{{subItem.AccountName}}</td>
<td>{{subItem.Money}}</td>
<td>{{subItem.Pay_DateStr}}</td>
<td>{{subItem.Pay_WayName}}</td>
<td>{{subItem.Trade_Order}}</td>
<td>{{subItem.CanRefundMoney}}</td>
<td>
<el-checkbox v-model="subItem.isChecked" @change="changeStatus(subItem,index)"></el-checkbox>
<el-input v-if="subItem.isChecked" v-model="subItem.RefundMoney" @blur="addPayList(subItem,index)" @keyup.native="checkPrice(subItem,'RefundMoney')" class="w80" placeholder="请输入退款金额"/>
</td>
</tr>
</table>
</div>
<div class="_pay_box" v-if="AuditOrRefundMsg.Status=='5'&&item.SpecialNode==2">
<!-- <div class="_pay_box"> -->
......@@ -723,7 +803,7 @@
<td>{{i.CurrenName}}</td>
<td>{{i.Rate}}</td>
<!-- <td>{{item.Fee}}</td> -->
<th>{{moneyFormat(i.allMoney)}}</th>
<td>{{moneyFormat(i.allMoney)}}</td>
<!-- <td></td> -->
</tr>
<tr v-else @keyup.enter="addList(2,index)">
......@@ -763,7 +843,7 @@
<td>
<el-input v-model="i.Rate" @change="Calculation(1,index)" @blur="addList(2,index)" type="number" class=" _border_b_1"></el-input>
</td>
<td>{{i.allMoney.toFixed(2)}}</td>
<td>{{i.allMoney}}</td>
</tr>
</template>
<tr @keyup.enter="addList()">
......@@ -1049,6 +1129,8 @@ export default {
}
],
emList:[],
IsRefundAutoGoBack:0,
TradeDetailList:[]
},
AuditListData:{
AuditList:[]
......@@ -1109,6 +1191,13 @@ export default {
userId:0,
RB_Post_Id: 0,
ISGZ: false,
isBook: true,
choiceMsg:{
Status:'1'
},
//是否显示原路退款选项
isShowChoice:false,
// tableShowTuikuan:false
}
},components:{
"my-FlowChartModule": myFlowChartModule,
......@@ -1174,7 +1263,7 @@ export default {
this.payMsgList.forEach(x=>{
allMoney+=x.allMoney
})
this.allMoney = allMoney
this.allMoney = allMoney;
},
Financial_post_GetFinancLogList(){ // 获取单据日志
if(this.checkboxShow) return
......@@ -1586,6 +1675,7 @@ export default {
// }
// }
// });
this.AuditOrRefundMsg.TradeDetailList = this.GetDetail.TradeDetailList;
this.apipost('Financial_post_AuditOrRefund',this.AuditOrRefundMsg,res=>{
if(res.data.resultCode==1){
this.$message.success(res.data.message);
......@@ -1650,11 +1740,13 @@ export default {
this.apipost('Financial_post_GetDetail',{ID:id,Type:2}, res => {
if(res.data.resultCode == 1) {
let data= res.data.data;
console.log(data,'datas');
data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2))
x.Money = x.Money.toFixed(2)
x.OriginalMoney = x.OriginalMoney.toFixed(2)
})
data.Money = this.$commonUtils.addCommas(data.Money.toFixed(2))
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
this.FinancialFlowTemplate_post_GetProcessList(data.FrID,data.TemplateType)
......@@ -1672,6 +1764,16 @@ export default {
this.SourceID = this.GetDetail.SourceID;
this.Callback = this.GetDetail.Callback;
this.FrID = this.GetDetail.FrID;
let lastSpecialNode = this.GetDetail.AuditSteps[this.GetDetail.AuditSteps.length-1].SpecialNode;
let lastStatus = this.GetDetail.AuditSteps[this.GetDetail.AuditSteps.length-1].Status;
if(lastSpecialNode==2&&lastStatus==1&&this.GetDetail.TradeDetailList.length>0){
this.isShowChoice = true;
}
//遍历默认不勾选
this.GetDetail.TradeDetailList.forEach(x=>{
x.isChecked = false;
})
console.log(this.GetDetail,'getdetails');
// 拼接团号显示团信息
let str = '';
if(data.TCIDList.length>0){
......@@ -1704,6 +1806,45 @@ export default {
}
},err=>{})
},
//点击操作
changeStatus(subItem,index){
this.$forceUpdate();
if(!subItem.isChecked){
this.payMsgList.forEach((x,index)=>{
if(x.Trade_Order==subItem.Trade_Order){
this.payMsgList.splice(index,1);
}
})
}
},
addPayList(subItem,index){
if(subItem.RefundMoney>subItem.CanRefundMoney){
subItem.RefundMoney=0;
this.Error('退款金额不能大于可退金额');
return;
}
var payMsg = {
AccName: subItem.AccountName,
Account: subItem.BackNo,
AccountId: subItem.AccountTypeId,
CurrenName: "人民币",
CurrencyId: 1,
Fee: 0,
FinanceId: "",
ID: 0,
Name: subItem.Pay_WayName,
OriginalMoney: subItem.RefundMoney,
Rate: 1,
Type: subItem.Type,
allMoney: subItem.RefundMoney,
balance: 0,
isChecked:subItem.isChecked,
Trade_Order:subItem.Trade_Order,
show: false
}
this.payMsgList.push(payMsg);
this.Calculation();
},
},created(){
if(this.$route.query.pageIndex){
this.pageIndex = this.$route.query.pageIndex;
......@@ -1721,6 +1862,30 @@ export default {
if(this.$route.query.Conditon){
this.returnCode = this.$route.query.Conditon;
}
},
watch : {
'choiceMsg.Status':function(val) {
if(val==1){
this.payMsgList.forEach((x,index)=>{
if(x.isChecked){
this.payMsgList.splice(index,1);
}
})
this.AuditOrRefundMsg.IsRefundAutoGoBack=0;
}else{
this.AuditOrRefundMsg.IsRefundAutoGoBack=1;
}
},
'AuditOrRefundMsg.Status':function(val){
if(val==3){
this.payMsgList.forEach((x,index)=>{
if(x.isChecked){
this.payMsgList.splice(index,1);
}
})
}
}
}
}
</script>
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'));
......@@ -697,7 +676,6 @@ export default {
},
AuditOrRefund(){
this.MsgBus.$emit('msg');
// this.$router.push({name:'FinancialDocuments',query:{"returnCode":this.returnCode,"pageIndex":this.pageIndex,blank:'y'}});
},
//点击显示附件
showFileList(item){
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 3a9864ce
......@@ -97,18 +97,27 @@
width: 216px;
}
._icon_btn i.icon-tiaozheng{background-color: #1296db;font-size: 16px;}
.boss_btn_tips,.boss_btn{
text-align: center;
}
.boss_btn_tips{
padding-bottom: 25px;
}
.boss_btn span{
color: #2BB87C;
}
</style>
<template >
<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,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,getPageList()">我审批的</li>
<li :class="active==6?'_active':''" @click="active=6,msg.Conditon=6,getPageList()">我作废的</li>
<li :class="active==7?'_active':''" @click="active=7,msg.Conditon=7,getPageList()">被驳回的</li>
<li :class="active==4?'_active':''" @click="active=4,msg.Conditon=4,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>
</ul>
<div class="query-box">
<ul class="clearfix">
......@@ -369,160 +378,13 @@
<span>
<em @click.stop="heightQueryBox=!heightQueryBox">{{$t('fnc.gjchaxun')}} <i class="iconfont icon-gengduo"></i></em>
</span>
<!-- <div class="hight_query_box" @click.stop>
<el-collapse-transition>
<div v-show="heightQueryBox">
<p class="hqb_t">财务单据高级查询</p>
<el-form :model="msg" ref="msg" label-width="100px">
<ul class="clearfix">
<li>
<el-form-item label="所属公司：">
<el-select filterable v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',getDepartment()" class="w135">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="w135">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="制单人员：">
<el-select filterable v-model='msg.UpdateBy' class="w135">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="账户类型：">
<el-select filterable v-model='msg.AccountType' class="w135">
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in AccList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="交易方式：">
<el-select filterable v-model='msg.TradeWay' @change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''" class="w135">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in BranchAccountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="收付款账户：" >
<el-select filterable v-model='msg.BankID' class="w135">
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in accountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</li>
<li v-show="msg.Type==2">
<el-form-item label="对象类型：">
<el-select filterable v-model='msg.ClientType' @change="financeinfo_post_GetClientAccountList(msg.ClientType),msg.ClientID=''" class="w135">
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientTypeList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</li>
<li v-show="msg.Type==2">
<el-form-item label="付款对象：" >
<el-select filterable v-model='msg.ClientID' class="w135">
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientAccountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="团队编号：">
<el-input v-model="msg.TCID" class="w135"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="订单编号：">
<el-input v-model="msg.OrderID" class="w135"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="币种类型：" >
<el-select filterable v-model='msg.CurrencyId' class="w135">
<el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="费用类型：">
<el-select filterable v-model='msg.CostTypeID' class="w135">
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="单据金额：" >
<el-input v-model="msg.sMoney" class="w64d5"></el-input>-<el-input v-model="msg.eMoney" class="w64d5"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="发团日期：">
<el-date-picker class="h34"
v-model="missionDate"
@change="timeAdd(4)"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</li>
<li class="_hqb_btn">
<button class="normalBtn" @click="getPageList()">确定</button>
</li>
</ul>
</el-form>
</div>
</el-collapse-transition>
</div> -->
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="goUrlAdd('ChoiceAddFinancialDocuments')">{{$t('pub.addBtn')}}</button>
<button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">{{$t('fnc.piltijiao')}}</button>
<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>
</li>
</ul>
</div>
......@@ -531,7 +393,7 @@
<div class="_fnDm_content" v-loading='loading' :style="{minHeight:minHeight+'px'}">
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr class="_t_head">
<th v-if="checkboxShow"><input type="checkbox" v-model="isCkedAll" @click='checkedAll()'></th>
<th v-if="checkboxShow || BOSSBtn"><input type="checkbox" v-model="isCkedAll" @click='checkedAll()'></th>
<th width="90">{{$t('system.query_company')}}</th>
<th>{{$t('fnc.danhao')}}</th>
<th width="90">{{$t('fnc.djleixing')}}</th>
......@@ -545,7 +407,7 @@
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr class="_item_list" v-for="(item,index) in DataList">
<td v-if="checkboxShow"><input type="checkbox" :value="item.FrID" v-model="checkList" @change="ckeckedOne"></td>
<td v-if="checkboxShow || BOSSBtn"><input type="checkbox" :value="item.FrID" v-model="checkList" @change="ckeckedOne"></td>
<td>{{item.BranchName}}</td>
<td class="Bill_par">
<el-popover
......@@ -696,7 +558,7 @@
<div class="noData" v-show="noData">
{{$t('system.content_noData')}}
</div>
<div>
<div v-if="!BOSSBtn">
<el-pagination
background
@current-change="handleCurrentChange"
......@@ -763,6 +625,29 @@
<el-button class="normalBtn" type="primary" @click="UpdateTradeDate()">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
<el-dialog title="一键审批" width="400px" :visible.sync="BOSSDialog" center :close-on-press-escape="false" :close-on-click-modal="false" >
<template v-if="!BOSSDialogText">
<el-form label-width="110px">
<el-form-item :label="$t('fnc.shuoming')">
<el-input type="textarea" v-model="AuditOrRefundMsg.Description" class="w216"></el-input>
</el-form-item>
</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>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="BOSSDialog=false">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="bossLen = 1, subBOSSBtnClick()">{{$t('pub.sureBtn')}}</el-button>
</div>
</template>
<template v-else>
<p class="boss_btn">共计 {{checkList.length}} 条，当前第 <span>{{bossLen}}</span> 条。</p>
<p class="boss_btn_tips">一键审核中请不要进行其他操作。</p>
</template>
</el-dialog>
</div>
</template>
<script>
......@@ -879,7 +764,21 @@ export default {
searchList:[],
minHeight:400,
//当前登录用户功能权限
ActionMenuCode:''
ActionMenuCode:'',
BOSSBtn: false,
AuditOrRefundMsg:{
WorkFlowId:'',
Description:'',
Status:'5',
Image: '',
TradeDate:new Date().Format("yyyy-MM-dd"),
tradeWays:[],
emList:[],
},
bossLen: null,
BOSSDialog: false,
userMenuCode: false,
BOSSDialogText: false,
}
},
created(){
......@@ -911,6 +810,8 @@ export default {
"my-HB-Bill":myhrBill,
},mounted(){
let userInfo=this.getLocalStorage();
let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.ActionMenuCode=userInfo.ActionMenuCode;
this.DepartIDs = userInfo.RB_Department_Id;
......@@ -927,7 +828,40 @@ export default {
this.FinancialFlowTemplate_post_GetStatusList();
this.getPageList();
this.AccountType_post_GetList();
},methods:{
},
methods:{
subBOSSBtnClick: function () {
this.loading = true;
if (this.bossLen && this.bossLen <= this.checkList.length) {
this.BOSSDialogText = true;
this.AuditOrRefundMsg.WorkFlowId = this.checkList[this.bossLen-1]
this.apipost('Financial_post_AuditOrRefund',this.AuditOrRefundMsg,res=>{
if(res.data.resultCode==1){
this.bossLen += 1
this.subBOSSBtnClick()
}else{
this.$message.error(res.data.message);
this.loading = false;
this.checkList = [];
this.getPageList(1)
}
},err=>{})
} else {
this.BOSSDialogText = false;
this.BOSSDialog = false;
this.checkList = [];
this.$message.success('审核完毕');
this.loading = false;
this.getPageList(1)
}
},
BOSSBtnClick: function () {
if (this.checkList.length<1) {
this.$message.error(this.$t('rule.qxzygxytjddanju'));
} else {
this.BOSSDialog = true;
}
},
goTicketPage(data) { // 跳转机票
this.$router.push({ name: 'TicketManager',query:{id:data.SourceID,blank:'y',tab:'票务管理'} })
},
......@@ -1022,10 +956,15 @@ export default {
}
},err=>{})
},
getPageList(){ // 获取列表数据
getPageList(t){ // 获取列表数据
this.loading= true
this.checkAllList =[];
this.checkList = [];
if (t) {
this.msg.pageSize = 1000;
} else {
this.msg.pageSize = 6;
}
if(this.msg.Status==0){
this.checkboxShow = true;
}else{
......@@ -1067,7 +1006,6 @@ export default {
this.$message.error(res.data.message);
}
this.queryInfoInit();
this.currentPage = parseInt(this.msg.pageIndex);
},err=>{})
},
financeRemove(id){//作废
......@@ -1406,6 +1344,8 @@ export default {
goEit(path,type,id,edit,Conditon,pageIndex){
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
}
},
watch:{
}
}
</script>
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