Skip to content

S
SuperMan
Commit 5a3c76d6 authored by zhengke's avatar zhengke
Browse files
Options

修改资金调拨单显示

parent c9ff877a
Hide whitespace changes
Inline Side-by-side
Showing with 440 additions and 7 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 5a3c76d6
......@@ -263,7 +263,8 @@
<p class="_tit">{{GetDetail.FinanceName}}</p>
<div class="_conten">
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7">
<my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
<!-- <my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill> -->
<new-Bill :ID="GetDetail.FrID"></new-Bill>
</template>
<template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
<my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
......@@ -1105,6 +1106,8 @@ import teamProductModule from "../commonPage/teamProductModule.vue";
import TicketFinace from "../commonPage/TicketFinace.vue";
import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
import TicketingModule from "../commonPage/TicketingModule.vue";
import newBill from "./FinancialSubmodule/NewBillModule.vue";
// import MsgBus from '../../assets/utils/msgBus.js';
export default {
data(){
......@@ -1237,6 +1240,7 @@ export default {
'SaleOrderModule':SaleOrderModule,
'TicketFinace':TicketFinace,
'my-HB-Bill':myhrBill,
'new-Bill':newBill
},methods:{
payMsgListShow: function (type, index) {
if(this.choiceMsg.Status==1){
......@@ -1784,7 +1788,6 @@ 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)
......@@ -1814,10 +1817,11 @@ export default {
this.isShowChoice = true;
}
//遍历默认不勾选
this.GetDetail.TradeDetailList.forEach(x=>{
x.isChecked = false;
})
console.log(this.GetDetail,'getdetails');
if(this.GetDetail.TradeDetailList&&this.GetDetail.TradeDetailList.length>0){
this.GetDetail.TradeDetailList.forEach(x=>{
x.isChecked = false;
})
}
// 拼接团号显示团信息
let str = '';
if(data.TCIDList.length>0){
......
src/components/FinancialModule/CapitalAllocationDetail.vue
View file @ 5a3c76d6
......@@ -668,7 +668,6 @@ export default {
x.comText = this.$t('fnc.xsfujian');
x.isShow = false;
});
console.log(this.GetDetail)
}else{
this.Error(res.data.message);
}
......
src/components/FinancialModule/FinancialSubmodule/NewBillModule.vue 0 → 100644
View file @ 5a3c76d6
<style>
.newBillModule .Co_oderleft{
float:left;
}
.newBillModule .Co_oderRight{
float:right;
}
.newBillModule .Ca_diaobo{
width:100%;
height:35px;
font-size:12px;
line-height: 35px;
padding:0 20px;
}
.newBillModule .Ca_Span{
display:block;
padding-left: 10px;
font-size:14px;
margin-bottom:20px;
color:#333333;
border-left:3px solid #E95252;
}
.newBillModule .Ca_leftOrder{
width:890px;
height:auto;
padding-top:5px;
background-color: #fff;
}
.newBillModule .Ca_title{
width:190px;
margin:auto;
font-size:16px;
margin-top:20px;
color:#333333;
text-align: center;
}
.newBillModule .Ca_t2{
width:100%;
font-size:14px;
text-align: center;
margin-bottom: -8px;
}
.collection_Table,.pay_Table{
width:96%;
margin:auto;
padding:0 20px;
font-size:14px;
}
.collection_Table th{
font-size:12px;
color:#BE525D;
}
.collection_Table td,.collection_Table th{
border: 1px solid #BE525D;
text-align: center;
height:44px;
padding:0 5px;
}
.pay_Table th{
font-size:12px;
color:#1273BC;
}
.pay_Table td,.pay_Table th{
border: 1px solid #1273BC;
text-align: center;
height:44px;
padding:0 5px;
}
.newBillModule .Ca_comLinediv{
width:96%;
min-height:80px;
margin:auto;
font-size:12px;
border-bottom: 1px dashed #BFBFBF;
}
.newBillModule .Ca_comBlueColor{
color:#1273BC;
}
.newBillModule textarea{
border:none;
border-bottom:1px solid #666666;
}
.newBillModule .Ca_payBtn{
color:#1273BC;
border-color:#1273BC;
}
.newBillModule .Ca_cashier{
width:25%;
float:left;
}
.newBillModule .Ca_popDiv{
width:100%;
height:52px;
line-height: 52px;
padding:0 20px;
font-size:12px;
display: flex;
justify-content: space-between;
}
.Ca_popDiv p{
display: inline-block;
}
.Ca_popDiv p:last-child{
float:right;
margin-right:0;
}
.newBillModule .Cafujian{
width:100%;
min-height: 50px;
margin-top:20px;
}
.Cafujian>div{
float: left;
width: 138px;
height: 92px;
border: 1px dashed rgba(210,210,210,1);
border-radius: 2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.Cafujian>div .icon-guanbi1{
display: inline-block;
margin-left: 15px;
color:#fff;
position: absolute;
right: -6px;
top: -9px;
background-color: #f56c6c;
border-radius: 50%;
height: 20px;
width: 20px;
text-align: center;
line-height: 20px;
}
.Cafujian>div .icon-guanbi1:hover{
color:#c94052;
font-size:12px;
}
.Cafujian>div img{
width:100%;
height:100%;
}
.newBillModule .Ca_rightFile{
float:left;
width:300px;
/* height:500px; */
border:1px solid red;
}
.newBillModule .Ca_description{
width:600px;
min-height: 30px;
display: inline-block;
margin-top:30px;
font-size: 14px;
}
.newBillModule .Ca_remarkSpan{
display: inline-block;
height: 30px;
vertical-align: top;
margin-top: 30px;
}
.Cafujian .icon-excel{
text-align: center;
font-size: 38px;
color: green;
line-height: 75px;
}
.newBillModule .Ca_AccountInfo{
width:100%;
padding:0 20px;
text-align:left;
}
.newBillModule .collection_Order{
width:100%;
height:36px;
font-size:12px;
line-height: 35px;
padding:0 20px;
border-bottom:1px dashed #BFBFBF;
}
</style>
<template>
<div class="newBillModule">
<div class="clearfix">
<div class="Co_oderleft">
<div class="Ca_leftOrder">
<div class="Ca_title">{{dataList.CompanyName}}</div>
<div class="Ca_t2">{{dataList.FinanceName}}</div>
<div class="Ca_line"></div>
<div class="clearfix collection_Order">
<div class="Co_oderleft">
<span>{{$t('hotel.hotel_SerialNumber')}}：</span><span class="Ca_comSize">{{dataList.FrID}}</span>
</div>
<div class="Co_oderRight">
<span>{{$t('fnc.zhibiao')}}：</span><span class="Ca_comSize">{{dataList.CreateDate}}</span>
</div>
</div>
<div v-for="item in dataList.SBankList">
<div class="clearfix Ca_diaobo">
<div class="Co_oderRight" style="margin:10px 0;">
<span class="Ca_comColor">{{$t('fnc.dbriqi')}}：</span><span class="Ca_comSize">{{item.AllotDate}}</span>
</div>
</div>
<table class="collection_Table" style="border-collapse: collapse;">
<tr>
<th width="100">{{$t('fnc.skfangshi')}}</th>
<th width="300">{{$t('fnc.acc')}}</th>
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
<td>{{item.TypeName}}</td>
<td>
<div class="Ca_AccountInfo">{{item.Alias}}-{{item.AccountType}}-{{item.BankNo}}</div>
</td>
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>{{item.Money}}</td>
</tr>
</table>
<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;" @click="showFileList(item)" :value="item.comText"/>
<div class="Cafujian clearfix" v-if="item.isShow">
<template v-for="(file,fIndex) in item.vorcherInos">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Content" @click="showImg(file.Content)">
</div>
</div>
<div v-if="file.Type==1">
<div class="iconfont " :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFile(file)">
</div>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
</div>
</template>
</div>
</div>
</div>
<div v-for="item in dataList.FBankList">
<div class="clearfix Ca_diaobo">
<div class="Co_oderRight" style="margin:10px 0;">
<span class="Ca_comBlueColor">{{$t('fnc.dbriqi')}}：</span><span class="Ca_comSize">{{item.AllotDate}}</span>
</div>
</div>
<table class="pay_Table" style="border-collapse: collapse;">
<tr>
<th width="100">{{$t('fnc.fkfangshi')}}</th>
<th width="300">{{$t('fnc.acc')}}</th>
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
<td>{{item.TypeName}}</td>
<td>
<div class="Ca_AccountInfo">{{item.Alias}}-{{item.AccountType}}-{{item.BankNo}}</div>
</td>
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>{{item.Money}}</td>
</tr>
</table>
<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="showFuFileList(item)" :value="item.comText"/>
<div class="Cafujian clearfix" v-if="item.isShow">
<template v-for="(file,fIndex) in item.vorcherInos">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Content" @click="showImg(file.Content)">
</div>
</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>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
</div>
</template>
</div>
</div>
</div>
<div class="Ca_popDiv" v-if="dataList.AuditSteps!=''">
<template v-for="(item,index) in dataList.AuditSteps">
<p>{{item.AuditDescription}}：
<template v-if="item.Status===2">
<span class="_r_name" v-if="s.AuditStatus==2" v-for="(s,si) in item.AuditRecordList">{{s.AuditName}} </span>
</template>
</p>
</template>
</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">
</viewer>
</div>
</template>
<script>
export default {
props:["ID"], //接收参数 ID width color
data(){
return {
msg:{
ID:0
},
dataList:[],
images:[],
imageOptions:{
navbar:false,
title:false
},
}
},
methods:{
inited (viewer){
this.$viewer = viewer
},
getList(ID){
this.msg.ID = ID ;
this.apipost('Financial_get_GetFundTransfer', this.msg, res => {
if(res.data.resultCode == 1) {
this.dataList = res.data.data;
this.dataList.SBankList.forEach(x => {
x.comText = this.$t('fnc.xsfujian');
x.isShow = false;
});
this.dataList.FBankList.forEach(x => {
x.comText = this.$t('fnc.xsfujian');
x.isShow = false;
});
}else{
this.Error(res.data.message);
}
}, err => {})
},
//点击显示附件
showFileList(item){
if(item.comText== this.$t('fnc.ycfujian')){
item.comText=this.$t('fnc.xsfujian');
}else{
item.comText=this.$t('fnc.ycfujian')
}
if(item.isShow){
item.isShow=false;
}else{
item.isShow=true;
}
this.$forceUpdate();
},
showFuFileList(item){
if(item.comText==this.$t('fnc.ycfujian')){
item.comText=this.$t('fnc.xsfujian');
}else{
item.comText=this.$t('fnc.ycfujian')
}
if(item.isShow){
item.isShow=false;
}else{
item.isShow=true;
}
this.$forceUpdate();
},
//显示大图
showImg(obj){
let isExsit=false
this.images.forEach(x=>{
if(x==obj)
isExsit=true
})
if(!isExsit) {
this.images.push(obj)
} else {
this.$viewer.view(this.images.indexOf(obj))
}
this.$viewer.show()
},
//预览文件
showUpLoadFileT(i){
if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
this.previewPDF(i.Content)
}else{
window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Content)
}
},
},
mounted(){
//this.getList(this.ID);
},
watch: { // 监听参数变化
GetDetail: {
handler: function(val, oldVal) {
},
deep: true
},
ID:{
handler: function(val, oldVal) {
this.ID = val
this.getList(this.ID)
},
deep: true
}
}
}
</script>
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