Commit e4d96064 authored by 华国豪's avatar 华国豪 🙄

财务单据审核 详情新增关联表,修改财务单据审核、详情渲染机制

parent dbb46eb1
......@@ -137,7 +137,6 @@ export default {
document.querySelectorAll('.frame-box').forEach(x=>{
if(x.style.display!='none'){
let opContents=x.querySelectorAll(".query-box ul li");
console.log(opContents)
if(opContents && opContents.length>0){
this.navWidth=document.querySelector(".flexParent").offsetWidth-opContents[opContents.length-1].offsetWidth-50
}else{
......
......@@ -298,21 +298,21 @@
<p class="_tit">{{GetDetail.FinanceName}}</p>
<div class="_conten">
<template v-if="!otherTable">
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4">
<my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4 && showModel">
<my-Bill :GetDetail="GetDetail" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
</template>
<template v-else-if="GetDetail.Type===4">
<new-Bill :ID="GetDetail.FrID"></new-Bill>
<template v-else-if="GetDetail.Type===4 && showModel">
<new-Bill :GetDetail="GetDetail"></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>
<template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7 && showModel">
<my-RVB-Bill :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-RVB-Bill>
</template>
<template v-else-if="GetDetail.Type===7">
<my-GZ-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-GZ-Bill>
<template v-else-if="GetDetail.Type===7 && showModel">
<my-GZ-Bill :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-GZ-Bill>
</template>
</template>
<template v-else>
<my-DJ-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-DJ-Bill>
<template v-else-if="showModel">
<my-DJ-Bill :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-DJ-Bill>
</template>
<div class="_explain">
......@@ -433,9 +433,12 @@
</div>
</div>
<div class="w890px">
<my-HB-Bill v-if="GetDetail.Is_Merge===1" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill>
<my-HB-Bill v-if="GetDetail.Is_Merge===1" :GetDetail="GetDetail" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill>
</div>
<p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p>
<div class="_tit _tit2 w890px">
<myGuanBill :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" />
</div>
<template v-if="sonTCIDList">
<div class="w890px">
<div class="_tit _tit2 w890px _border_bottom_none">
......@@ -1310,7 +1313,7 @@ import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
import TicketingModule from "../commonPage/TicketingModule.vue";
import ChongDiPage from "../commonPage/ChongDiPage.vue";
import { truncate } from 'fs';
import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue";
// import MsgBus from '../../assets/utils/msgBus.js';
export default {
data(){
......@@ -1456,7 +1459,8 @@ export default {
ChongDiMoney: 0,
ChongDiList: [],
isChongDi: false,
danjuType: ''
danjuType: '',
showModel: false,
}
},components:{
"my-FlowChartModule": myFlowChartModule,
......@@ -1471,6 +1475,7 @@ export default {
'TicketFinace':TicketFinace,
'my-HB-Bill':myhrBill,
'ChongDiPage': ChongDiPage,
'myGuanBill': myGuanBill,
},
methods:{
// 单选计算
......@@ -2255,6 +2260,7 @@ export default {
}
this.chongJudge(data)
this.GetDetail = data;
this.showModel = true
console.log(this.GetDetail,'GetDetail.OrderId');
this.ChongDiMsg.Types = ''
this.ChongDiMsg.ClientType = data.Type === 2 ? data.ClientType : ''
......
......@@ -375,9 +375,9 @@
<span v-if="GetDetail.TemplateId==48 || (GetDetail.TemplateId==43&&GetDetail.IsPublic==4)" class="sqs" @click="goUrl('Application',GetDetail.FrID)">申请书下载</span>
<p class="_tit">{{GetDetail.FinanceName}} <span :class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span></p>
<div class="_conten">
<my-Bill v-if="GetDetail.Type===2 && GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
<my-RVB-Bill v-else-if="GetDetail.Type===1" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-RVB-Bill>
<my-GZ-Bill v-else-if="GetDetail.Type===7" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-GZ-Bill>
<my-Bill v-if="GetDetail.Type===2 && GetDetail.Type!==5 && showModel" :isPrintPage="false" :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-Bill>
<my-RVB-Bill v-else-if="GetDetail.Type===1 && showModel" :GetDetail="GetDetail" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-RVB-Bill>
<my-GZ-Bill v-else-if="GetDetail.Type===7 && showModel" :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-GZ-Bill>
<div class="_explain">
<p>附加说明: <span class="fr" v-if="GetDetail.ComplainID > 0" @click="goComplain('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号:</span> <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span> </p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
......@@ -441,7 +441,7 @@
</div>
</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>
<my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :GetDetail="GetDetail" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill>
<!-- <myDJieBill v-if="GetDetail.DijieBathFinanceList && GetDetail.DijieBathFinanceList.length" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"/> -->
<!--<my-C-Bill v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&GetDetail.Type!=1" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-C-Bill>-->
<div class="_fujian_box" v-if="(GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0) || saveMsg.length>0">
......@@ -522,6 +522,9 @@
</div>
</div>
<p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p>
<div class="_tit _tit2 w890px">
<myGuanBill :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" />
</div>
<template v-if="sonTCIDList">
<div class="w890px">
<div class="_tit _tit2 w890px _border_bottom_none">
......@@ -816,6 +819,7 @@ import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
import TicketingModule from "../commonPage/TicketingModule.vue";
import ChongDiPage from "../commonPage/ChongDiPage.vue";
import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue";
export default {
data(){
return{
......@@ -883,7 +887,8 @@ export default {
},
isChongDi: false,
ChongDiList: [],
danjuType: ''
danjuType: '',
showModel: false
}
},components:{
'my-FlowChartModule': myFlowChartModule,
......@@ -898,6 +903,7 @@ export default {
'TicketFinace':TicketFinace,
'myDJieBill': myDJieBill,
'ChongDiPage': ChongDiPage,
'myGuanBill': myGuanBill,
},
created(){
this.ID = this.$route.query.id;
......@@ -1276,6 +1282,7 @@ export default {
}
this.chongJudge(data)
this.GetDetail = data;
this.showModel = true
// 截取掉驳回后面的审核步骤
this.ZhiDanRen = this.GetDetail.CreatBy;
let list = [];
......
......@@ -307,11 +307,10 @@
</template>
<script>
export default {
props:["ID","width","color","isPrintPage","name","OrderSource"], //接收参数 ID width color
props:["ID","width","color","isPrintPage","name","OrderSource","GetDetail"], //接收参数 ID width color
data(){
return{
loading:true,
GetDetail:{DetailList:null},
loading:false,
EmployeeId:'',
EndDate:'',
StartDate:'',
......@@ -395,23 +394,23 @@ export default {
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(this.ID);
// this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化
GetDetail: {
handler: function(val, oldVal) {
// console.log(val)
// console.log(oldVal)
},
deep: true
},
ID:{
handler: function(val, oldVal) {
this.ID = val
this.Financial_post_GetDetail(this.ID)
// console.log(val)
},
deep: true
}
// GetDetail: {
// handler: function(val, oldVal) {
// // console.log(val)
// // console.log(oldVal)
// },
// deep: true
// },
// ID:{
// handler: function(val, oldVal) {
// this.ID = val
// this.Financial_post_GetDetail(this.ID)
// // console.log(val)
// },
// deep: true
// }
}
}
</script>
......@@ -121,13 +121,12 @@
</template>
<script>
export default {
props:["ID","width","color"], //接收参数 ID width color
props:["ID","width","color","GetDetail"], //接收参数 ID width color
data(){
return{
picObj:[],
loading:true,
picIsShow:false,
GetDetail:{DetailList:[]},
allMoney:0,
cnAllMoney:'',
}
......@@ -163,22 +162,22 @@ export default {
}, err => {})
},
},mounted(){
this.Financial_post_GetDetail(this.ID)
// this.Financial_post_GetDetail(this.ID)
},watch: { // 监听参数变化
GetDetail: {
handler: function(val, oldVal) {
// console.log(val)
// console.log(oldVal)
},
deep: true
},
ID:{
handler: function(val, oldVal) {
this.ID = val
this.Financial_post_GetDetail(this.ID)
},
deep: true
}
// GetDetail: {
// handler: function(val, oldVal) {
// // console.log(val)
// // console.log(oldVal)
// },
// deep: true
// },
// ID:{
// handler: function(val, oldVal) {
// this.ID = val
// this.Financial_post_GetDetail(this.ID)
// },
// deep: true
// }
}
}
</script>
......@@ -277,11 +277,10 @@
</template>
<script>
export default {
props:["ID","width","color","isPrintPage","name"], //接收参数 ID width color
props:["ID","width","color","isPrintPage","name","GetDetail"], //接收参数 ID width color
data(){
return{
loading:true,
GetDetail:{DetailList:null},
EmployeeId:'',
EndDate:'',
StartDate:'',
......@@ -376,23 +375,23 @@
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(this.ID);
// this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化
GetDetail: {
handler: function(val, oldVal) {
// console.log(val)
// console.log(oldVal)
},
deep: true
},
ID:{
handler: function(val, oldVal) {
this.ID = val
this.Financial_post_GetDetail(this.ID)
// console.log(val)
},
deep: true
}
// GetDetail: {
// handler: function(val, oldVal) {
// // console.log(val)
// // console.log(oldVal)
// },
// deep: true
// },
// ID:{
// handler: function(val, oldVal) {
// this.ID = val
// this.Financial_post_GetDetail(this.ID)
// // console.log(val)
// },
// deep: true
// }
}
}
</script>
......@@ -324,11 +324,10 @@
</template>
<script>
export default {
props:["ID","width","color","isPrintPage","name","OrderSource"], //接收参数 ID width color
props:["ID","width","color","isPrintPage","name","OrderSource","GetDetail"], //接收参数 ID width color
data(){
return{
loading:true,
GetDetail:{DetailList:null},
loading:true,
EmployeeId:'',
EndDate:'',
StartDate:'',
......@@ -411,23 +410,23 @@ export default {
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(this.ID);
// this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化
GetDetail: {
handler: function(val, oldVal) {
// console.log(val)
// console.log(oldVal)
},
deep: true
},
ID:{
handler: function(val, oldVal) {
this.ID = val
this.Financial_post_GetDetail(this.ID)
// console.log(val)
},
deep: true
}
// GetDetail: {
// handler: function(val, oldVal) {
// // console.log(val)
// // console.log(oldVal)
// },
// deep: true
// },
// ID:{
// handler: function(val, oldVal) {
// this.ID = val
// this.Financial_post_GetDetail(this.ID)
// // console.log(val)
// },
// deep: true
// }
}
}
</script>
<style>
@import url('../../../assets/css/domestic/TicketingModule.css');
.sanjiao-box{
position: relative;
}
._sanjiao_{
position: absolute;
top: 0px;
left: 0px;
width: 0px;
height: 0px;
border-top: 20px solid #e73828;
border-bottom: 20px solid transparent;
border-left: 20px solid #e73828;
border-right: 20px solid transparent;
}
.sanjiao-box ._sanjiao_:after{
content: '关';
position: absolute;
top: -15px;
left: -14px;
white-space: nowrap;
color: #FFFFFF;
font-size: 12px;
}
.sanjiao-box .Receipt_table td{
padding: 0 10px;
}
</style>
<template>
<div class="m_TicketingModule" >
<div class="_tit">
<span class="_text">{{tit}}</span>
<div>
<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>
</div>
</div>
<div v-show="tableShow" class="sanjiao-box _padding_20_15">
<div class="_sanjiao_"></div>
<table border="1" class="_border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
<tr>
<th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.fyshuoming')}}</th>
<th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th rowspan="2">{{$t('fnc.zhidanren')}}</th>
</tr>
<tr>
<th width="88">{{$t('fnc.yuanbi')}}</th>
<th width="50">{{$t('hotel.hotel_CurrentRate')}}</th>
<th width="68">{{$t('fnc.bweibi')}}</th>
</tr>
<template v-if="details&&details.length">
<tr v-for="(item) in details" class="_color_b">
<td height="34px">{{item.BName}}</td>
<td height="34px">{{item.FinanceId}}</td>
<td height="34px">{{item.CostTypeName}}</td>
<td height="34px">{{item.CurrencyName}}</td>
<td height="34px">{{item.OriginalMoney}}</td>
<td height="34px">{{item.Rate}}</td>
<td height="34px">{{item.Money}}</td>
<td height="34px" style="max-width: 120px;">{{item.Remark}}</td>
<td height="34px">{{item.EmName}}</td>
</tr>
</template>
<tr v-if="details&&details.length<2">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="details&&details.length<3">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="details&&details.length<4">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
</table>
</div>
</div>
</div>
</template>
<script>
export default {
props:["FrID", "TemplateId"],
data(){
return{
tableShow: true,
tit: '',
details: [],
loading: true,
}
},watch:{
},created(){
if (this.TemplateId == 59 || this.TemplateId == 63) {
this.tit = '相关地接报账单据'
}
if (this.TemplateId == 43 || this.TemplateId == 48 || this.TemplateId == 53 || this.TemplateId == 56) {
this.tit = '相关领队用款单据'
}
this.getDetails()
},mounted(){
},methods:{
getDetails(){
this.loading = true
this.apipost('Financial_post_GetLeaderFinaceRelevance', {FrId: this.FrID}, res=>{
if(res.data.resultCode == 1) {
this.loading = false
let data= res.data.data;
this.details = data;
}
}, null)
}
}
}
</script>
......@@ -249,11 +249,11 @@
</template>
<script>
export default {
props:["ID","width","color","isPrintPage","name"], //接收参数 ID width color
props:["ID","width","color","isPrintPage","name","GetDetail"], //接收参数 ID width color
data(){
return{
loading:true,
GetDetail:{DetailList:null},
loading:false,
// GetDetail:{DetailList:null},
EmployeeId:'',
EndDate:'',
StartDate:'',
......@@ -306,7 +306,7 @@
}, err => {})
},
},mounted(){
// console.log(this.ID+"mounted")
console.log(this.GetDetail,"mounted")
const myDate = new Date();
let yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
let month = myDate.getMonth()+1; //获取当前月份(0-11,0代表1月)
......@@ -315,23 +315,23 @@
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(this.ID);
// this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化
GetDetail: {
handler: function(val, oldVal) {
// console.log(val)
// console.log(oldVal)
},
deep: true
},
ID:{
handler: function(val, oldVal) {
this.ID = val
this.Financial_post_GetDetail(this.ID)
// console.log(val)
},
deep: true
}
// GetDetail: {
// handler: function(val, oldVal) {
// // console.log(val)
// // console.log(oldVal)
// },
// deep: true
// },
// ID:{
// handler: function(val, oldVal) {
// this.ID = val
// this.Financial_post_GetDetail(this.ID)
// // console.log(val)
// },
// deep: true
// }
}
}
</script>
......@@ -284,11 +284,10 @@
</template>
<script>
export default {
props:["ID","width","color","isPrintPage","name","Num","OrderSource"], //接收参数 ID width color isPrintPage
props:["ID","width","color","isPrintPage","name","Num","OrderSource","GetDetail"], //接收参数 ID width color isPrintPage
data(){
return{
loading:true,
GetDetail:{DetailList:null},
loading:false,
EmployeeId:'',
EndDate:'',
StartDate:'',
......@@ -378,24 +377,24 @@ export default {
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(this.ID);
// this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化
GetDetail: {
handler: function(val, oldVal) {
// console.log(val)
// console.log(oldVal)
},
deep: true
},
ID:{
handler: function(val, oldVal) {
this.ID = val
// console.log(val+"watch")
this.Financial_post_GetDetail(this.ID)
// console.log(val)
},
deep: true
},
// GetDetail: {
// handler: function(val, oldVal) {
// // console.log(val)
// // console.log(oldVal)
// },
// deep: true
// },
// ID:{
// handler: function(val, oldVal) {
// this.ID = val
// // console.log(val+"watch")
// this.Financial_post_GetDetail(this.ID)
// // console.log(val)
// },
// deep: true
// },
num: {
handler: function(val, oldVal) {
console.log(val)
......
......@@ -6,7 +6,7 @@
</el-upload>
<el-button-group>
<el-button v-if='notFileList.length==1&&fileList.length<1' type="danger" icon="el-icon-download" @click='dowloadSingle()'>下载</el-button>
<!-- <el-button v-if='notFileList.length==1&&fileList.length<1' type="danger" icon="el-icon-download" @click='dowloadSingle()'>下载</el-button> -->
<el-button v-if='fileList.length>0||notFileList.length>0' type="danger" icon="el-icon-download" @click='yzmVisible=true,createCode()'>压缩下载</el-button>
<el-button type="danger" @click='openAddFilesDialog'>新键文件夹</el-button>
<el-button v-if='fileList.length>0||notFileList.length>0' type="danger" icon="el-icon-delete" @click='deleteFiles'>{{$t('system.table_delete')}}</el-button>
......@@ -218,7 +218,7 @@
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="downloadTotal()" />
</div>
</el-dialog >
<a target="_blank" style="display:none" id="blankLink"></a>
</div>
</template>
......
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