Skip to content

C
confucius
Commit 2d48459d authored by 罗超's avatar 罗超
Browse files
Options

1

parent 4119b68b
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 77 deletions
src/pages/activity/activeSignUpList.vue
View file @ 2d48459d
......@@ -164,6 +164,12 @@
<span v-if="props.row.IsApplyForCancel===1">是</span>
<span v-if="props.row.IsApplyForCancel===2">否</span>
</q-td>
</template>
<template v-slot:body-cell-ApplyForCancelStatus="props">
<q-td :props="props">
<span v-if="props.row.ApplyForCancelStatus===1">同意</span>
<span v-if="props.row.ApplyForCancelStatus===2">拒绝</span>
</q-td>
</template>
<!-- <template v-slot:body-cell-optioned="props">
<q-td :props="props">
......@@ -256,15 +262,19 @@
label: "是否申请取消",
field:" IsApplyForCancel",
align: "left"
},
{
name: " ApplyForCancelStatus",
label: "申请取消审核状态",
field:" ApplyForCancelStatus",
align: "left"
},
{
name: "Remark",
label: "备注",
field:"Remark",
align: "left"
},
},
// {
// name: 'optioned',
// label: '操作',
......
src/pages/activity/activityList.vue
View file @ 2d48459d
......@@ -204,21 +204,22 @@
<q-item-label>报名列表</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="goUrl('/activity/activeSummary',props.row)">
<q-item clickable v-close-popup @click="goUrl('/activity/payment',props.row)">
<q-item-section>
<q-item-label>活动总结</q-item-label>
<q-item-label>活动收支</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="goUrl('/activity/materialMan',props.row)">
<q-item clickable v-close-popup @click="goUrl('/activity/activeSummary',props.row)" v-if="props.row.ActivityStatus!==2">
<q-item-section>
<q-item-label>活动图片与视频</q-item-label>
<q-item-label>活动总结</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item clickable v-close-popup @click="goUrl('/activity/materialMan',props.row)" v-if="props.row.ActivityStatus!==2">
<q-item-section>
<q-item-label>活动收支</q-item-label>
<q-item-label>活动图片与视频</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
</div>
......
src/pages/activity/materialMan.vue
View file @ 2d48459d
<template>
<div class="ChooseImg materialMan page-body">
<q-btn color="accent" size="sm" class="q-mr-md" label="返回" @click="goBack" />
<div v-loading="loading" style="margin-top:10px;background:#fff;padding:20px">
<div class="TabDiv">
<span :class="commonType==1?'spanActive':''" @click="handleClick(1)">图片</span>
......@@ -9,7 +10,7 @@
<div>
<div style="height: 718px;display:flex;" flex="box:first" >
<div style="margin-right: 15px;width: auto;-webkit-box-flex: 0;flex-shrink: 0;flex-grow: 0;">
<el-button @click="addGroup" style="margin-bottom: 12px;" type="primary" size="small">添加分组</el-button>
<q-btn @click="addGroup" style="margin-bottom: 12px;" color="accent" size="sm">添加分组</q-btn>
<div style="border: 1px solid rgb(227, 227, 227);width:250px">
<div class="el-scrollbar" style="width: 100%;height:670px;">
<div class="el-scrollbar__wrap" style="margin-bottom: -8px; margin-right: -8px;">
......@@ -296,6 +297,9 @@
},
methods: {
goBack(){
this.$router.go(-1)
},
//登录后获取上传配置
getUpConfig(){
......
src/pages/activity/payment.vue
View file @ 2d48459d
<style>
.paymentDetail .p_title {
font-weight: bold;
color: #000000;
font-size: 14px;
margin-bottom: 20px;
font-size: 20px;
height: 30px !important;
display: flex;
align-items: center;
}
.paymentDetail .paymentList {
......@@ -131,6 +132,7 @@
.p_titleList {
position: relative;
margin-bottom: 20px;
}
</style>
......@@ -138,37 +140,38 @@
<div class="page-body paymentDetail">
<div class="page-search items-center">
<div class="p_titleList">
<div class="p_title">活动收支</div>
<q-btn label="导出" color="accent q-px-md" size="sm"
style="font-weight:400 !important;position:absolute;right:0;top:0" @click="exportOrder" />
<div class="p_title">
<q-btn color="accent" size="sm" class="q-mr-sm" label="返回" @click="goBack" />
活动收支</div>
</div>
<div class="row">
<div class="col paymentList" v-if="dataList&&dataList.ClassInfo">
<div class="col paymentList" v-if="dataList.ClassInfo">
<div class="pay_topList">
<img src="../../assets/images/myimg/bjqk.png" alt="" />
<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_ListOne">活动名称</div>
<div class="pay_Inner">{{dataList.ClassInfo.ActivityName}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">课程名称</div>
<div class="pay_Inner">{{dataList.ClassInfo.CourseName}}</div>
<div class="pay_ListOne">开始时间</div>
<div class="pay_Inner">{{dataList.ClassInfo.StartTimeStr}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">开课时间</div>
<div class="pay_Inner">{{dataList.ClassInfo.OpenTime}}</div>
<div class="pay_ListOne">结束时间</div>
<div class="pay_Inner">{{dataList.ClassInfo.EndTimeStr}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListOne">带课老师</div>
<div class="pay_Inner">{{dataList.ClassInfo.TeacherName}}</div>
<div class="pay_ListOne">地址</div>
<div class="pay_Inner">{{dataList.ClassInfo.LocationName}}</div>
</div>
</div>
<div class="col paymentList">
<div class="pay_topList">
<img src="../../assets/images/myimg/bjsr.png" alt="" />
<span class="pay_Title">班级收入</span>
<span class="pay_Title">活动收入</span>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">应收</div>
......@@ -186,12 +189,33 @@
<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/bjsr.png" alt="" />
<span class="pay_Title">活动支出</span>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">应付</div>
<div class="pay_Inner">¥{{dataList.PayReceive}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">实付</div>
<div class="pay_Inner orangeStyle">¥{{dataList.PayActual}}</div>
</div>
<div class="pay_ListMent">
<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/qt.png" alt="" />
<span class="pay_Title">其他</span>
<span class="pay_Title">其他收入</span>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">应收</div>
......@@ -214,19 +238,19 @@
<div class="col paymentList">
<div class="pay_topList">
<img src="../../assets/images/myimg/zc.png" alt="" />
<span class="pay_Title">支出</span>
<span class="pay_Title">其他支出</span>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">应付</div>
<div class="pay_Inner">¥{{dataList.PayReceive}}</div>
<div class="pay_Inner">¥{{dataList.OtherPayReceive}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">实付</div>
<div class="pay_Inner orangeStyle">¥{{dataList.PayActual}}</div>
<div class="pay_Inner orangeStyle">¥{{dataList.OtherPayActual}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">待付</div>
<div class="pay_Inner orangeStyle ">¥{{getShiShou(dataList.PayReceive,dataList.PayActual)}}</div>
<div class="pay_Inner orangeStyle ">¥{{getShiShou(dataList.OtherPayReceive,dataList.OtherPayActual)}}</div>
</div>
<div class="pay_ListMent">
<div class="pay_ListTwo">注</div>
......@@ -251,7 +275,7 @@
<div class="pay_Inner">实收-(应付/实付)+其他收入-总支出</div>
</div>
</div>
<div class="col paymentList">
<!-- <div class="col paymentList">
<div class="pay_topList">
<img src="../../assets/images/myimg/tc.png" alt="" />
<span class="pay_Title">提成</span>
......@@ -268,7 +292,7 @@
<div class="pay_ListOne">绩效奖励</div>
<div class="pay_Inner orangeStyle ">¥{{dataList.MeritsProfit}}</div>
</div>
</div>
</div> -->
</div>
<div class="pay_InorOut">
<div class="pay_TopTitle" style="display:flex;justify-content: space-between;align-items:center;">
......@@ -277,7 +301,7 @@
@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>学费收入
<span class="Pay_Line" style="background-color:#02C499;"></span>活动收入
</div>
<table class="payTable">
<tr>
......@@ -384,6 +408,57 @@
<q-btn label="新增付款" 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:#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.FinicePayList==0">
<td :colspan="8" align="center">暂无数据</td>
</tr>
<tr v-for="(item,index) in dataList.FinicePayList" :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:15px 0 15px 20px;font-size:12px;">
<span class="Pay_Line" style="background-color:#F28C1D;"></span>其他支出
</div>
......@@ -441,39 +516,33 @@
</template>
<script>
import {
GetClassBalanceSheet,
} from '../../api/finance/index';
import {
EduDownLoad,
} from '../../api/common/common';
export default {
props: {},
components: {},
data() {
return {
dataList: [], //数据
dataList: {
ClassInfo:{}
}, //数据
msg: {
ClassId: 0,
School_Id: 0
Id: 0,
},
}
},
created() {},
mounted() {
if (this.$route.query.ClassId && this.$route.query.School_Id) {
this.msg.ClassId = this.$route.query.ClassId;
this.msg.School_Id = this.$route.query.School_Id;
if (this.$route.query.Id) {
this.msg.Id = this.$route.query.Id;
}
this.getData();
},
methods: {
getData() {
GetClassBalanceSheet(this.msg).then(res => {
if (res.Code == 1) {
this.dataList = res.Data;
}
})
this.loading = true;
this.apipostDS("/api/Education/GetActivityBalanceSheet",this.msg,(res)=>{
this.loading = false
if(res.data.resultCode===1){
this.dataList = res.data.data;
console.log(500,this.dataList)
}
})
},
//减法 得实收
getShiShou(num1, num2) {
......@@ -494,35 +563,36 @@
}
})
},
//导出单据
exportOrder() {
var msg = JSON.parse(JSON.stringify(this.msg));
EduDownLoad("/Finance/GetClassBalanceSheetToExcel", msg, "收支明细.xls")
},
//跳转到收款单
goShoukuan(type) {
let TCIDARR = []
TCIDARR.push(this.msg.ClassId)
// let TCIDARR = []
// TCIDARR.push(this.msg.ClassId)
let orderObj = {
OrderID: 0,
// OrderID: 0,
OrderSource: 17,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR
// Obj: {},
// SourceID: 0,
// TCIDList: TCIDARR,
OtherType:41,
ReFinanceId :this.msg.Id
}
this.$router.push({
path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
query: {
"Type": type,
"companyID": this.msg.School_Id,
"path": "",
'blank': 'y',
// "ReFinanceId":this.msg.Id,
// "companyID": this.msg.Id,
// "path": "",
// 'blank': 'y',
'orderObj': JSON.stringify(orderObj),
'tradeWay': '',
// 'tradeWay': '',
}
});
}
},
goBack(){
this.$router.go(-1)
} ,
}
}
......
src/pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue
View file @ 2d48459d
......@@ -104,6 +104,7 @@
platformAccount:'',
Handmsg:{},
czmsg:{},
ReFinanceId:0,//活动id
}
},
computed: {
......@@ -142,7 +143,7 @@
this.$router.push({
path: '/financial/financalDocument/addReceivablesDocuments',
query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单',GuestId:this.$route.query.GuestId}
'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单',GuestId:this.$route.query.GuestId,ReFinanceId:this.ReFinanceId}
});
}
}else if(this.active==2){
......@@ -310,7 +311,9 @@
else if(this.showTab==4){
this.GetList = this.ZRList;
}
if(this.$route.query.ReFinanceId){
this.ReFinanceId=this.$route.query.ReFinanceId
}
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
this.orderObj = this.$route.query.orderObj;
this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg;
......
src/pages/financial/financalDocument/addReceivablesDocuments.vue
View file @ 2d48459d
......@@ -720,7 +720,7 @@
RB_BranchName:'',
RB_DepartName:'',
OrderSource : 17,
GuestId:""
GuestId:"",
},
AccountNumber: '',
queryAccMsg: {
......@@ -1305,7 +1305,7 @@
//从电商过来的参数处理
this.msg.OrderSource = this.orderObj.OrderSource ? this.orderObj.OrderSource : 0;
this.msg.OtherType = this.orderObj.OtherType ? this.orderObj.OtherType : 0;
this.msg.ReFinanceId = this.orderObj.ReFinanceId ? this.orderObj.ReFinanceId : 0;
this.msg.ReFinanceId = this.orderObj.ReFinanceId ? parseInt(this.orderObj.ReFinanceId) : 0;
this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2 ? this.orderObj.ReFinanceId2 : 0;
this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : [];
}
......@@ -1815,8 +1815,6 @@
this.platformAccount = this.$route.query.platformAccount ? this.$route.query.platformAccount : 0;
this.orderObj = this.$route.query.orderObj&& this.$route.query.orderObj!='undefined' ? JSON.parse(this.$route.query.orderObj) : null;
this.Handmsg = this.$route.query.Handmsg && this.$route.query.Handmsg!='undefined' ? JSON.parse(this.$route.query.Handmsg) : null;
if (this.orderObj != null && this.orderObj.OrderSource === 8 && this.orderObj.tipObj == 1) {
that.Description = "旅客名单：";
that.describeList = JSON.parse(sessionStorage.getItem("TipGuestList"));
......
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