Skip to content

C
confucius
Commit 83b0a6f6 authored by Mac's avatar Mac
Browse files
Options

1

parent 5daef726
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 37 deletions
src/api/finance/index.js
View file @ 83b0a6f6
......@@ -2,7 +2,7 @@ import request from '../../utils/request'
/**
* 获取收支明细数据
*
*
*/
export function GetClassBalanceSheet(data) {
return request({
......@@ -10,4 +10,15 @@ export function GetClassBalanceSheet(data) {
method: 'post',
data
})
}
\ No newline at end of file
}
/**
* 根据 班级ids 获取班级信息
*
*/
export function getClassNameList(data) {
return request({
url: '/order/GetClassNameList',
method: 'post',
data
})
}
src/pages/course/classManage.vue
View file @ 83b0a6f6
......@@ -173,7 +173,7 @@
ClassStatus: 0, //班级状态
TeacherName: '', //带班老师
CourseName: '', //学习课程
School_Id: 0, //关联校区
School_Id: 0, //关联校区
},
//班级状态
classStatusList: [],
......@@ -185,6 +185,9 @@
}
},
created() {
if(this.$route.query){
this.msg.ClassName=this.$route.query.ClassName
}
this.getClassStatus();
this.getSchool();
},
......@@ -200,11 +203,11 @@
},
//跳转到收支明细
goPayment(item){
this.$router.push({
this.$router.push({
path:'paymentDetail',
query:{
ClassId:item.ClassId,
School_Id:item.School_Id,
School_Id:item.School_Id,
blank:'y'
}
})
......
src/pages/financial/components/BillModule.vue
View file @ 83b0a6f6
......@@ -104,7 +104,7 @@
<i v-if="name===1">{{$t('fnc.yewulian')}}</i>
<i v-if="name===2">{{$t('fnc.kuaijilian')}}</i>
</p>
<p class="_yewudanju" v-if="GetDetail.OrderSource==8&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:$t('fnc.no')}}</span></p>
<p class="_yewudanju" v-if="GetDetail.OrderID>0">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:$t('fnc.no')}}</span></p>
<p class="_yewudanju" v-if="isPrintPage">{{$t('fnc.dayinshijian')}}：<span >{{printTime}}</span></p>
<div class="rb_top_row _r_mb5">
<p v-if="GetDetail.Type==1 || GetDetail.Type==5">{{$t('fnc.hnrdanwei')}}：<span class="_r_name">{{GetDetail.RemitterName}}</span></p>
......
src/pages/financial/financalDocument/BasicDocuments.vue
View file @ 83b0a6f6
......@@ -45,7 +45,7 @@
.page_bdm ._process_box{border-top: 1px dashed #BFBFBF;padding-top: 30px;padding-bottom: 40px;}
.page_bdm ._flow_chart{position:absolute;display: inline-block;right: 15px;top: 7px;padding:5px 25px;font-size: 12px;color: #FFFFFF;background-color: #E95252;border-radius: 14px;cursor: pointer;}
.page_bdm ._pb_son{position: relative;padding-left: 65px;min-height: 100px;margin-bottom: 30px}
.page_bdm ._left_radius{width: 40px;height: 40px;border-radius: 50%;text-align: center;line-height: 40px;background-color: #2BBB7E;color: white;font-size: 12px;position: absolute;left: 0}
.page_bdm ._left_radius{width: 40px;height: 40px;border-radius: 50%;text-align: center;line-height: 40px;background-color: #2BBB7E;color: white;font-size: 12px;position: absolute;left: 0;z-index:2}
.page_bdm ._left_radius_err{background-color: #E95252;}
.page_bdm ._left_radius_sus{background-color: #1273BC;}
.page_bdm ._right_content{padding-left: 0}
......@@ -299,6 +299,23 @@
cursor:pointer;
text-decoration: underline;
}
.detailsIT_Journal_bdm .changLogList_l {
border-left: 1px solid #e9e9e9;
position: relative;
padding-bottom: 10px;
padding-left: 20px;
padding-top: 10px;
}
.detailsIT_Journal_bdm ._radius_green {
background-color: #47bf8c;
width: 7px;
height: 7px;
border-radius: 50%;
display: inline-block;
position: absolute;
left: -4px;
top: 19px;
}
</style>
<template>
......@@ -398,7 +415,7 @@
<p v-if="GetDetail.Type!==7">费用归属部门：<span>{{GetDetail.DepartName}}</span></p>
<div>
<el-popover
popper-class="detailsIT_Journal"
popper-class="detailsIT_Journal_bdm"
width="250"
trigger="click">
<div class="InfoChangeLog" >
......@@ -2304,9 +2321,9 @@
this.$message.success(res.data.message);
// let _this = this;
if (this.$route.query.ISGZ){
this.$router.push({name:'FinancialAccounting',query:{}})
this.$router.push({path:'FinancialDocuments',query:{}})
} else {
this.$router.push({name:'FinancialDocuments',query:{'returnCode':3,"pageIndex":this.pageIndex}})
this.$router.push({path:'FinancialDocuments',query:{'returnCode':3,"pageIndex":this.pageIndex}})
}
// setTimeout(function () {
// _this.MsgBus.$emit('msg');
......
src/pages/financial/financalDocument/FinancialDocuments.vue
View file @ 83b0a6f6
......@@ -889,7 +889,7 @@
<div class="_TCIDAndTCNUMList">
<span>{{$t('visa.v_tuanhao')}}：</span>
<template v-if="item.TCIDAndTCNUMList&&item.TCIDAndTCNUMList.length>0">
<p><span v-for="(i,ix) in item.TCIDAndTCNUMList">{{i.TCNUM}}（{{i.TCID}}） <span
<p><span v-for="(i,ix) in item.TCIDAndTCNUMList">{{i.ClassName}}（{{i.ClassId}}） <span
v-if="ix!=item.TCIDAndTCNUMList.length-1">,<br /></span></span></p>
</template>
<template v-else>
......@@ -1239,6 +1239,7 @@
import {
getSchoolPage
} from '../../../api/school/index'
import {getClassNameList} from '../../../api/finance/index'
export default {
data() {
......@@ -1961,18 +1962,46 @@
data = res.data.data.pageData;
}
this.total = res.data.data.count;
this.loading = false;
this.noData = false;
let da = []
if (this.total == 0) {
this.DataList = [];
this.noData = true;
} else {
data.forEach(x => {
x.modelShow = false;
this.checkAllList.push(x.FrID)
if(x.TCIDList.length>0){
da =da.concat(x.TCIDList)
}
})
this.DataList = data;
this.noData = false;
if(da.length>0){
let str = da.join(',')
getClassNameList({ClassIds:str}).then(res => {
this.DataList.forEach(x=>{
if(x.TCIDList.length>0){
x.TCIDList.forEach(z=>{
res.Data.forEach(j=>{
if(z == j.ClassId){
x.TCIDAndTCNUMList.push(j)
}
})
})
}
})
}).catch(() => {
})
}
}
this.loading = false;
} else {
this.loading = false;
this.$message.error(res.data.message);
......
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @ 83b0a6f6
......@@ -416,8 +416,8 @@
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
<tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
<td :colspan="4" v-if="GetDetail.Is_Merge===1">单据号：{{o.FinanceId}}</td>
<td :colspan="3">
{{o.TCNUM}}（{{o.TCID}}）
<td :colspan="3" class="_jump_page" @click="getClassInfo(o)">
{{o.ClassName}}（{{o.ClassId}}）
<span v-if="GetDetail.IsShowGuestUrl && GetDetail.IsShowGuestUrl===1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见
<span>{{o.GuestSurveyNum?o.GuestSurveyNum:0}}</span>/
<span>{{o.GuestTotalNum?o.GuestTotalNum:0}}</span>份
......@@ -427,8 +427,9 @@
</span>
<span v-if="GetDetail.IsShowDiJieChargeUrl==1" style="margin-left:10px;cursor:pointer;" @click="jumpHotelContract('HotelContract',o)">手配费详情</span>
</td>
<td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
<td @click="jumpbjPage('classManage',o)"> <span class="_jump_page _font_bold">查看班级</span> </td>
<td @click="jumpbjPage('classorder',o)"> <span class="_jump_page _font_bold">查看报名</span> </td>
<td @click="jumpbjPage('paymentDetail',o)"> <span class="_jump_page _font_bold">班级收支</span> </td>
<td v-if="qjGroupId==userInfo.Group_Id || TeamShouZhi" @click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)"> <span class="_jump_page _font_bold">团队收支</span> </td>
<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>
......@@ -575,22 +576,6 @@
<myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" />
<huijiBill :ID="ID" :disabled="true" :loopNumN="1" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.AccountantMergeDetailList && GetDetail.AccountantMergeDetailList.length>0" />
</div>
<template v-if="sonTCIDList">
<div class="w890px">
<div class="_tit _tit2 w890px _border_bottom_none">
<p>
<span class="_text">团队</span>
<span class="_btn" v-if="tableShowTeam" @click="tableShowTeam=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShowTeam=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</p>
<div v-show="tableShowTeam">
<div>
<teamProductModule :ID="sonTCIDList"></teamProductModule>
</div>
</div>
</div>
</div>
</template>
<div class="w890px">
<SaleOrderModule v-if="OrderSource==10&&SourceID&&OrderID" :SourceID='SourceID' :OrderID='OrderID'/>
<TicketFinace v-if="OrderSource==4&&SourceID&&Callback&&ID" :SourceID='SourceID' :Callback='Callback' :id='ID'/>
......@@ -854,6 +839,8 @@
</template>
</el-dialog>
<a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass">
</classinfo-form>
</div>
</template>
<script>
......@@ -876,6 +863,8 @@
import czBillModule from "../components/czBillModule.vue";
import {UploadSelfFile} from '../../../api/common/common'
import {getClassNameList} from '../../../api/finance/index'
import classinfoForm from '../../../components/course/classinfo-form';
export default {
data(){
......@@ -954,6 +943,8 @@
showModel: false,
CostTypeState:false,
huijiShow:true,
classObjOption: null,
isShowClassInfo: false, //是否显示课程信息
}
},
components:{
......@@ -973,7 +964,8 @@
'myJiPiaoBill': myJiPiaoBill,
'huijiBill': huijiBill,
"czBillModule":czBillModule
"czBillModule":czBillModule,
'classinfo-form':classinfoForm,
},
created(){
this.ID = this.$route.query.id;
......@@ -1432,7 +1424,7 @@
},
AuditOrRefund(){
this.MsgBus.$emit('msg');
// this.$router.push({name:'FinancialDocuments',query:{"returnCode":this.returnCode,"pageIndex":this.pageIndex,blank:'y'}});
this.$router.push({path:'FinancialDocuments',query:{"returnCode":this.returnCode,"pageIndex":this.pageIndex,blank:'y'}});
},
deleteImg(i){ // 删除
this.uploadImgList.splice(i,1)
......@@ -1536,8 +1528,15 @@
data.TCIDList.forEach(x=>{
str = str + x + ',';
})
str = str.slice(0,str.length-1);
getClassNameList({ClassIds:str}).then(res => {
data.TCIDAndTCNUMList = res.Data
}).catch(() => {
})
}
str = str.slice(0,str.length-1);
this.sonTCIDList = str==''?null:str;
if(data.URL){
// if(this.OrderSource==9){ // 国内票务订单
......@@ -1591,7 +1590,31 @@
blank:'y'
},
})
}
},
getClassInfo(obj){
this.classObjOption = null;
this.isShowClassInfo = false;
this.classObjOption = obj;
this.isShowClassInfo = true;
},
//关闭班级信息弹窗
closeClass() {
this.isShowClassInfo = false
},
//刷新
refreshClass() {
},
jumpbjPage(path,item){
if(path=='classManage'){
this.$router.push({path:'/course/'+path,query:{'ClassName':item.ClassName}})
}else if(path=='paymentDetail'){
this.$router.push({path:'/course/'+path,query:{'ClassId':item.ClassId,'School_Id':item.School_Id}})
}else {
this.$router.push({path:'/course/'+path,query:{'ClassId':item.ClassId}})
}
},
},mounted(){
// document.onkeydown = this.KeyDown
// document.onkeyup = this.KeyUp
......
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