Skip to content

C
confucius
Commit f109db85 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent cc8e665e
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 234 deletions
src/api/finance/index.js
View file @ f109db85
......@@ -800,15 +800,14 @@ export function GetPersonnelPeriodDetails(data) {
}
/**
* 获取收支明细数据
*
*/
export function GetReserveClassBalanceSheet(data) {
return request({
url: '/Finance/GetReserveClassBalanceSheet',
method: 'post',
data
});
}
\ No newline at end of file
src/components/schedul/reservelist.vue
View file @ f109db85
......@@ -67,11 +67,11 @@
<q-item-label>学员名单</q-item-label>
</q-item-section>
</q-item>
<!-- <q-item clickable v-close-popup @click="goAuditPayment(props.row)">
<q-item clickable v-close-popup @click="goAuditPayment(props.row)">
<q-item-section>
<q-item-label>收支明细</q-item-label>
</q-item-section>
</q-item> -->
</q-item>
<q-item clickable v-close-popup @click="editVisitor(props.row)">
<q-item-section>
<q-item-label>修改</q-item-label>
......@@ -238,7 +238,7 @@
//跳转收支明细
goAuditPayment(obj) {
this.OpenNewUrl('../../sale/AudiopaymentDetail', {
Id: 0
ReserveClassId: obj.ReserveClassId
})
},
//删除试听课
......
src/components/system/menu-form.vue
View file @ f109db85
......@@ -41,7 +41,6 @@
</q-item>
</template>
</q-select>
<q-input stack-label maxlength="60" :dense="false" v-model="objOption.MenuIcon" class="col-6 q-pr-lg q-pb-lg"
label="图标" />
<q-input filled stack-label maxlength="10" :dense="false" v-model="objOption.SortNum"
......
src/pages/sale/AudiopaymentDetail.vue
View file @ f109db85
......@@ -132,94 +132,42 @@
.p_titleList {
position: relative;
}
</style>
<template>
<div class="page-body paymentDetail">
<div class="page-search items-center">
<div class="p_titleList">
<div class="p_title">班级收支明细</div>
<div class="p_title">试听班级收支明细</div>
<div style="display: flex;align-items: center;position:absolute;right:0;top:0">
<q-btn label="返回报名清单" color="accent q-px-md" size="sm"
style="font-weight:400 !important;margin-right: 15px;" @click="goclasslist2('orderStatistics')" />
<q-btn label="返回产品列表" color="accent q-px-md" size="sm"
style="font-weight:400 !important;margin-right: 15px;" @click="goclasslist2('japaneseTrain')" />
<q-btn label="返回班级列表" color="accent q-px-md" size="sm"
style="font-weight:400 !important;margin-right: 15px;" @click="goclasslist" />
<q-btn label="导出" color="accent q-px-md" size="sm"
style="font-weight:400 !important;" @click="exportOrder" />
<q-btn label="导出" color="accent q-px-md" size="sm" style="font-weight:400 !important;" @click="exportOrder" />
</div>
</div>
<div class="row">
<div class="col paymentList" v-if="dataList&&dataList.ClassInfo">
<div class="col paymentList" v-if="dataList">
<div class="pay_topList">
<img src="../../assets/images/myimg/bjqk.png" alt="" />
<span class="pay_Title">班级情况</span>
<span class="pay_Title">试听班级情况</span>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">班级名称</div>
<div class="pay_Inner">{{dataList.ClassInfo.ClassName}}</div>
<div class="pay_Inner">{{dataList.ReserveClassName}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">课程名称</div>
<div class="pay_Inner">{{dataList.ClassInfo.CourseName}}</div>
<div class="pay_Inner">{{dataList.LessonName}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">开课时间</div>
<div class="pay_Inner">{{dataList.ClassInfo.OpenTime}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">带课老师</div>
<div class="pay_Inner">{{dataList.ClassInfo.TeacherName}}</div>
</div>
</div>
<div class="col paymentList">
<div class="pay_topList">
<img src="../../assets/images/myimg/bjsr.png" alt="" />
<span class="pay_Title">班级收入</span>
<div class="pay_Inner">{{dataList.ClassTime}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">应收</div>
<div class="pay_Inner">¥{{dataList.IncomeReceive}}</div>
<div class="pay_ListOne">试讲老师</div>
<div class="pay_Inner">{{dataList.TeacherName}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">实收</div>
<div class="pay_Inner orangeStyle">¥{{dataList.IncomeActual}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">待收</div>
<div class="pay_Inner orangeStyle">¥{{getShiShou(dataList.IncomeReceive,dataList.IncomeActual)}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">注</div>
<div class="pay_Inner">应收=订单应收总额，实收=订单 实收总额</div>
</div>
</div>
<div class="col paymentList">
<div class="pay_topList">
<img src="../../assets/images/myimg/qt.png" alt="" />
<span class="pay_Title">其他</span>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">应收</div>
<div class="pay_Inner">¥{{dataList.OtherIncomeReceive}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">实收</div>
<div class="pay_Inner orangeStyle">¥{{dataList.OtherIncomeActual}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">待收</div>
<div class="pay_Inner orangeStyle">¥{{getShiShou(dataList.OtherIncomeReceive,dataList.OtherIncomeActual)}}
</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">注</div>
<div class="pay_Inner">此处不进入"利润"计算，单纯只统计除班级费外的其他总收入</div>
</div>
</div>
<div class="col paymentList">
<div class="pay_topList">
<img src="../../assets/images/myimg/zc.png" alt="" />
......@@ -237,46 +185,6 @@
<div class="pay_ListTwo">待付</div>
<div class="pay_Inner orangeStyle ">¥{{getShiShou(dataList.PayReceive,dataList.PayActual)}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">注</div>
<div class="pay_Inner">成本单据总额(含退款)+销售提成+ 课时费</div>
</div>
</div>
<div class="col paymentList">
<div class="pay_topList">
<img src="../../assets/images/myimg/lr.png" alt="" />
<span class="pay_Title">利润</span>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">实际利润</div>
<div class="pay_Inner">¥{{dataList.ProfitActual}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">当前利润</div>
<div class="pay_Inner orangeStyle">¥{{dataList.ProfitNow}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">注</div>
<div class="pay_Inner">实收-(应付/实付)+其他收入-总支出</div>
</div>
</div>
<div class="col paymentList">
<div class="pay_topList">
<img src="../../assets/images/myimg/tc.png" alt="" />
<span class="pay_Title">提成</span>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">销售提成</div>
<div class="pay_Inner">¥{{dataList.SaleCommission}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">课时费</div>
<div class="pay_Inner">¥{{dataList.TeacherProfitNow}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">绩效奖励</div>
<div class="pay_Inner orangeStyle ">¥{{dataList.MeritsProfit}}</div>
</div>
</div>
</div>
<div class="pay_InorOut">
......@@ -285,9 +193,6 @@
<q-btn label="新增收款" v-if="isShowBtn" color="accent q-px-md" size="sm" style="font-weight:400 !important;"
@click="goShoukuan(1)" />
</div>
<div class="pay_TopTitle" style="margin:15px 0 15px 20px;font-size:12px;">
<span class="Pay_Line" style="background-color:#02C499;"></span>学费收入
</div>
<table class="payTable">
<tr>
<th width="180">单号</th>
......@@ -299,67 +204,16 @@
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<tr v-if="dataList && dataList.FiniceReciveList==0">
<tr v-if="dataList && dataList.incomeList==0">
<td :colspan="8" align="center">暂无数据</td>
</tr>
<tr v-for="(item,index) in dataList.FiniceReciveList" :key="index">
<td>
<span class="finince_Order" @click="goOrderDetail('FinancialDocumentsDetail',item)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td style="text-align:left;">
<div v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}<span class="TB_Rate"> 币种：{{childItem.CurrencyName}}</span>
<span class="Team_Coins orangeStyle">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate" style="margin-left:10px;">汇率：{{childItem.Rate}}</span>
</div>
</td>
<td>
<div class="financeYing">
应收：{{item.Money}}<br />
实收：{{item.PayMoney}}
</div>
</td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.RB_CreateByName}}</div>
<div>{{item.CreateDate}}</div>
</td>
<td>
<div class="finice_pass">{{item.StatusStr}}</div>
</td>
<td>
<div v-for="AuditItem in item.AuditList">
{{AuditItem.AuditEmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
</td>
</tr>
</table>
<div class="pay_TopTitle" style="margin:30px 0 15px 20px;font-size:12px;">
<span class="Pay_Line" style="background-color:#02C499;"></span>其他收入
</div>
<table class="payTable">
<tr>
<th width="180">单号</th>
<th width="200">费用类型</th>
<th width="500">交易明细</th>
<th width="300">金额</th>
<th width="200">交易日期</th>
<th width="250">制单人员</th>
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<tr v-if="dataList && dataList.OtherFiniceReciveList==0">
<td :colspan="8" align="center">暂无数据</td>
</tr>
<tr v-for="(item,index) in dataList.OtherFiniceReciveList" :key="index">
<tr v-for="(item,index) in dataList.incomeList" :key="index">
<td>
<span class="finince_Order">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td style="text-align:left;">
<div v-for="childItem in item.TradeWayList">
<div v-for="(childItem,childIndex) in item.TradeWayList" :key="childIndex">
支付方式：{{childItem.Alias}}<span class="TB_Rate"> 币种：{{childItem.CurrencyName}}</span>
<span class="Team_Coins orangeStyle">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate" style="margin-left:10px;">汇率：{{childItem.Rate}}</span>
......@@ -380,7 +234,7 @@
<div class="finice_pass">{{item.StatusStr}}</div>
</td>
<td>
<div v-for="AuditItem in item.AuditList">
<div v-for="(AuditItem,auditIndex) in item.AuditList" :key="auditIndex">
{{AuditItem.AuditEmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
......@@ -393,9 +247,6 @@
<q-btn label="新增付款" v-if="isShowBtn" color="accent q-px-md" size="sm" style="font-weight:400 !important;"
@click="goShoukuan(2)" />
</div>
<div class="pay_TopTitle" style="margin:15px 0 15px 20px;font-size:12px;">
<span class="Pay_Line" style="background-color:#F28C1D;"></span>其他支出
</div>
<table class="payTable">
<tr>
<th width="180">单号</th>
......@@ -407,16 +258,16 @@
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<tr v-if="dataList && dataList.OtherFinicePayList==0">
<tr v-if="dataList && dataList.outList==0">
<td :colspan="8" align="center">暂无数据</td>
</tr>
<tr v-for="(item,index) in dataList.OtherFinicePayList" :key="index">
<tr v-for="(item,index) in dataList.outList" :key="index">
<td>
<span class="finince_Order" @click="goOrderDetail('FinancialDocumentsDetail',item)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td style="text-align:left;">
<div v-for="childItem in item.TradeWayList">
<div v-for="(childItem,childIndex) in item.TradeWayList" :key="childIndex">
支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
<span class="Team_Coins orangeStyle">-{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate" style="margin-left:10px;">汇率：{{childItem.Rate}}</span>
......@@ -437,7 +288,7 @@
<div class="finice_pass">{{item.StatusStr}}</div>
</td>
<td>
<div v-for="AuditItem in item.AuditList">
<div v-for="(AuditItem,auditIndex) in item.AuditList" :key="auditIndex">
{{AuditItem.AuditEmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
......@@ -451,7 +302,7 @@
<script>
import {
GetClassBalanceSheet,
GetReserveClassBalanceSheet,
} from '../../api/finance/index';
import {
EduDownLoad,
......@@ -463,32 +314,22 @@
return {
dataList: [], //数据
msg: {
ClassId: 0,
School_Id: 0
ReserveClassId: 0,
},
ClassName:'',
isShowBtn:true
isShowBtn: true
}
},
created() {},
mounted() {
if (this.$route.query && this.$route.query.ClassId) {
this.msg.ClassId = this.$route.query.ClassId;
}
if (this.$route.query && this.$route.query.School_Id) {
this.msg.School_Id = this.$route.query.School_Id;
}
if (this.$route.query && this.$route.query.ClassName) {
this.ClassName = this.$route.query.ClassName;
}
if(this.$route.query && this.$route.query.isFromMyClass){
this.isShowBtn = false
created() {
if (this.$route.query && this.$route.query.ReserveClassId) {
this.msg.ReserveClassId = this.$route.query.ReserveClassId;
}
},
mounted() {
this.getData();
},
methods: {
getData() {
GetClassBalanceSheet(this.msg).then(res => {
GetReserveClassBalanceSheet(this.msg).then(res => {
if (res.Code == 1) {
this.dataList = res.Data;
}
......@@ -504,63 +345,51 @@
},
//跳转到订单详情
goOrderDetail(path, item) {
this.$router.push({
path: '/financial/financalDocument/' + path,
query: {
this.OpenNewUrl('/financial/financalDocument/' + path, {
"id": item.FrID,
blank: 'y',
tab: '单据详情'
}
})
},
//导出单据
exportOrder() {
var msg = JSON.parse(JSON.stringify(this.msg));
EduDownLoad("/Finance/GetClassBalanceSheetToExcel", msg, "收支明细.xls")
EduDownLoad("/Finance/GetReserveClassBalanceSheetToExcel", msg, "试听班级收支明细.xls")
},
//跳转到收款单
goShoukuan(type) {
let TCIDARR = []
TCIDARR.push(this.msg.ClassId)
TCIDARR.push(this.msg.ReserveClassId)
let orderObj = {
OrderID: 0,
OrderSource: 17,
OrderSource: 19,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR
}
this.$router.push({
path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
query: {
this.OpenNewUrl('/financial/financalDocument/ChoiceAddFinancialDocuments', {
"Type": type,
"companyID": this.msg.School_Id,
"companyID": 0,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
'tradeWay': '',
}
});
})
},
goclasslist(){
goclasslist() {
this.$router.push({
path: 'classManage',
});
},
goclasslist2(path){
goclasslist2(path) {
this.$router.push({
path:'/sale/'+ path,
query:{
ClassName:this.ClassName
path: '/sale/' + path,
query: {
ClassName: this.ClassName
}
});
}
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
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