Skip to content

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

跳转带的名称

parent aa7e8d59
Show whitespace changes
Inline Side-by-side
Showing with 235 additions and 112 deletions
src/pages/course/classManage.vue
View file @ f92f8e1e
......@@ -441,8 +441,7 @@
query: {
ClassId: item.ClassId,
School_Id: item.School_Id,
ClassName: item.ClassName,
ClassName: encodeURI(item.ClassName),
blank: 'y'
}
})
......
src/pages/financial/EasyReport.vue
View file @ f92f8e1e
......@@ -856,7 +856,7 @@
}
})
},
GoUrlFan(path, month, year, BranchId, ids) {
GoUrlFan(path, startDate,endDate, year, BranchId, ids) {
// this.$router.push({
// path: "/financial/" + path,
// query: {
......@@ -869,7 +869,8 @@
// });
this.OpenNewUrl('/financial/'+ path, {
year: year,
month: month,
startDate: startDate,
endDate: endDate,
BranchId: BranchId,
CostIds: ids,
});
......@@ -905,11 +906,9 @@
this.OpenNewUrl('/financial/reportform/RecPayQueryTeam', {
StartTime: startDate,
EndTime: endDate,
SchoolId:this.msg.BranchId
});
}
} else {
if (rowData.ZhaiYao == "员工提成") {
if (Number(this.year) == 2019) {
......@@ -918,17 +917,17 @@
let CostTypeIds = "";
CostTypeIds = rowData.CostTypeIds.replace('112,', '');
CostTypeIds = CostTypeIds.replace('16,', '');
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, CostTypeIds)
that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, CostTypeIds)
} else {
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
}
} else if (Number(this.year) > 2019) {
let CostTypeIds = "";
CostTypeIds = rowData.CostTypeIds.replace('112,', '');
CostTypeIds = CostTypeIds.replace('16,', '');
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, CostTypeIds)
that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, CostTypeIds)
} else {
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
}
} else if (rowData.ZhaiYao == "歐洲與南亞損失分攤") {
that.goUrl("AirTicketLoss", startDate, endDate, BranchId, "机票分摊")
......@@ -961,13 +960,13 @@
});
} else {
if(rowData.CostTypeIds && rowData.CostTypeIds !=''){
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
}
}
} else {
if(rowData.CostTypeIds && rowData.CostTypeIds !=''){
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
}
}
}
......
src/pages/financial/JumpReport.vue
View file @ f92f8e1e
<style scoped>
@import "css/cssReset.css";
.page_fnDm{background-color: white}
.query-box{overflow: inherit}
/* .page_fnDm{background-color: white} */
.page_fnDm{padding: 20px;}
.query-box{overflow: inherit;}
._nav{margin: 20px 0 0 0 ;background-color: #f5f5f5;}
._nav li{float: left;font-size: 14px;color: #666666;padding: 15px 20px;cursor: pointer;position: relative;background-color: #f1f1f1;margin-right: 5px}
._nav li._active{background-color:#FFFFFF;color: #333333 }
......@@ -108,7 +109,7 @@
<template >
<div class="page_fnDm page_RecPayQuery" @keyup.enter="resetPageIndex(),getPageList()">
<div class="query-box">
<div class="query-box" style="background: #FFFFFF;border-radius: 6px;">
<el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;">
<!-- <el-col :span="4">
......@@ -298,19 +299,21 @@
</template>
</el-row>
</el-form>
<ul class="clearfix">
<ul class="clearfix" style="padding-right:20px ;">
<li class="hight_query">
<!-- <span>
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
</span> -->
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<!-- <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()" style="margin: 0;">{{$t('pub.searchBtn')}}</button> -->
<q-btn color="primary" size="11px" label="查询" @click="resetPageIndex(),getPageList()" style="marginRight:10px"/>
<!-- <button class="normalBtn" @click="method5()">导出</button> -->
</li>
</ul>
<div class="JumpDivTitleOne">应收金额：{{SumYingShou}} <span class="JumpSpan">实收金额：{{SumShiShou}}</span> 待收金额：{{SumDaiShou}}</div>
<div class="JumpDivTitleTwo">应付金额：{{SumYingFu}} <span class="JumpSpan">实付金额：{{SumShiFu}}</span> 待付金额：{{SumDaiFu}}</div>
</div>
<div class="_fnDm_content" v-loading='loading'>
<div class="_fnDm_content" v-loading='loading' style="padding: 20px;background: #FFFFFF;">
<!-- <v-table-->
<!-- is-horizontal-resize-->
<!-- column-width-drag-->
......@@ -330,7 +333,7 @@
<el-table
:data="DataList"
border
style="width: 100%;font-size: 12px">
style="width: 100%;font-size: 12px;padding: ;">
<el-table-column prop="FrID" label="单号" width="80">
<template slot-scope='scope'>
<el-popover
......@@ -547,6 +550,7 @@
path: '/' + path,
query: {id:this.rowData.FrID,blank:'y',tab:this.rowData.FrID+'单据详情'}
})
},
}
})
......@@ -1069,6 +1073,12 @@
this.transactionDate[0]=this.msg.sTradeDate;
this.transactionDate[1]= this.msg.eTradeDate;
}
if(this.$route.query.startDate && this.$route.query.endDate){//7月8号新加 因为从简易报表跳转过来的 季度那种情况时间带不过来 然后从新处理了
this.msg.sTradeDate=this.$route.query.startDate;
this.msg.eTradeDate=this.$route.query.endDate;
this.transactionDate[0]=this.msg.sTradeDate;
this.transactionDate[1]= this.msg.eTradeDate;
}
if(this.$route.query.BranchId){
this.msg.RB_Branch_Id=parseInt(this.$route.query.BranchId);
}
......@@ -1546,7 +1556,11 @@
this.currentPage = 1;
},
goUrl(path,rowData,){
this.$router.push({ path:'/financial/financalDocument/'+ path,query:{"id":rowData.FrID,blank:'y',tab:'单据详情'} })
// this.$router.push({ path:'/financial/financalDocument/'+ path,query:{"id":rowData.FrID,blank:'y',tab:'单据详情'} })
this.OpenNewUrl('/financial/financalDocument/'+ path, {
"id":rowData.FrID,
tab:'单据详情'
});
},
goEit(path,type,id,edit,Conditon,pageIndex){
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex} })
......
src/pages/financial/reportform/RecPayQueryTeam.vue
View file @ f92f8e1e
......@@ -69,10 +69,15 @@
<div class="page-body RecPayQueryTeam">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-select filled stack-label use-input input-debounce="0" option-value="ClassId" @input="getList"
option-label="ClassName" v-model="msg.ClassId" :options="ClassList" label="班级" :dense="false" emit-value
<div class="col-3">
<q-select filled stack-label @input="getList()" option-value="SId"
option-label="SName" v-model="msg.SchoolId" ref="SId" :options="schoolList" label="校区"
:dense="false" emit-value map-options />
</div>
<div class="col-3">
<q-select filled stack-label use-input input-debounce="0" option-value="ClassId" @input="getclassName"
option-label="ClassName" v-model="choiceClass" :options="ClassList" label="班级" :dense="false" emit-value
map-options @filter="filterFn">
<template v-slot:no-option>
<q-item>
......@@ -83,10 +88,6 @@
</template>
</q-select>
</div>
<div class="col-3">
<q-input @input="getList()" clearable standout="bg-primary text-white" v-model="msg.ClassNo" label="班号"
@clear="getList()" maxlength="20" />
</div>
<div class="col-3" >
<q-field filled>
 <template v-slot:control>
......@@ -100,7 +101,7 @@
</div>
<div class="page-search row items-center" style="justify-content: space-between;">
<span style="font-size: 20px;font-weight: 400;">月度班级收支统计 <span style="font-size: 16px;"></span> </span>
<q-btn  color="primary"  size="11px"  label="导出"  @click="txexport"  style="margin-left:10px" />
<!-- <q-btn  color="primary"  size="11px"  label="导出"  @click="txexport"  style="margin-left:10px" /> -->
</div>
<template>
......@@ -110,9 +111,9 @@
<tr >
<th rowspan="2">班号</th>
<th rowspan="2">班级名称</th>
<th rowspan="2">总课时</th>
<th rowspan="2">总学生数量</th>
<th rowspan="2">收入金额</th>
<th rowspan="2">上课课时</th>
<th rowspan="2">上课学生</th>
<th rowspan="2">当期收入</th>
<th colspan="3">学生列表</th>
<th rowspan="2">老师课时费</th>
<th rowspan="2">老师绩效金额</th>
......@@ -128,12 +129,31 @@
</tr>
<tr v-for=" ( item , index ) in tableData ">
<td><span style="cursor: pointer;text-decoration: underline;" @click="goUrlClassNo('/sale/japaneseTrain',item.ClassNo)">{{item.ClassNo}}</span></td>
<td><span style="cursor: pointer;text-decoration: underline;" @click="goUrlclass('/course/classManage',item.ClassName)">{{item.ClassName}}</span> <span>({{item.ClassType==1?'培':'留'}})</span> </td>
<td><span>{{item.THoursNum}}</span></td>
<td><span>{{item.TStuNum}}</span></td>
<td><span>{{item.TStuMoney}}</span></td>
<td>
<span v-if="item.ClassNo=='合计'">{{item.ClassNo}}</span>
<span v-else style="cursor: pointer;text-decoration: underline;" @click="goUrlClassNo('/sale/japaneseTrain',item.ClassNo)">{{item.ClassNo}}</span>
</td>
<td>
<span style="cursor: pointer;text-decoration: underline;" @click="goUrlclass('/course/classManage',item.ClassName)">{{item.ClassName}}</span>
<span v-if="item.ClassType!=undefined && item.ClassType == 1" style="color: #409EFF;">(培)</span>
<span v-if="item.ClassType!=undefined && item.ClassType == 2" style="color: #F56C6C;">(留)</span>
<span v-if="item.ClassType!=undefined " style="cursor: pointer;text-decoration: underline;margin-left: 5px;" @click="lookshouzhi(item)">查看收支</span>
<span v-if="!item.ClassType">-</span>
</td>
<td>
<span v-if='item.THoursNum!=undefined'>{{item.THoursNum}}</span>
<span v-else>-</span>
</td>
<td>
<span v-if='item.TStuNum!=undefined'>{{item.TStuNum}}</span>
<span v-else>-</span>
</td>
<td>
<span v-if='item.TStuMoney!=undefined'>{{item.TStuMoney}}</span>
<span v-else>-</span>
</td>
<td>
<div v-if='item.StuList && item.StuList.length>0'>
<span v-if='item.show == true'>
<p v-for="( son , sIndex ) in item.StuList"><span style="cursor: pointer;text-decoration: underline;" @click="gourlteacher2('studentsClassfee',son,item)">{{son.StuName}}</span>
</p>
......@@ -143,8 +163,12 @@
style="cursor: pointer;text-decoration: underline;" @click="gourlteacher2('studentsClassfee',son,item)">{{son.StuName}}</span></span>
</p>
</span>
</div>
<div v-else>-</div>
</td>
<td>
<div v-if='item.StuList && item.StuList.length>0'>
<span v-if='item.show == true'>
<p v-for="( son , sIndex ) in item.StuList">{{son.KSNum}}</p>
</span>
......@@ -152,8 +176,12 @@
<p v-for="( son , sIndex ) in item.StuList"> <span
v-if='sIndex<3'>{{son.KSNum}}</span></p>
</span>
</div>
<div v-else>-</div>
</td>
<td style="position: relative;">
<div v-if='item.StuList && item.StuList.length>0'>
<span v-if='item.show == true'>
<p v-for="( son , sIndex ) in item.StuList">{{son.Money}}
<span
......@@ -177,17 +205,18 @@
</span>
</p>
</span>
</div>
<div v-else>-</div>
</td>
<td><span>{{item.BonusMoney}}</span></td>
<td><span>{{item.PerfMoney}}</span></td>
<td><span>{{item.SellMoney}}</span></td>
<td><span>{{item.OtherIncome}}</span></td>
<td><span>{{item.OtherCost}}</span></td>
<td><span v-if='item.BonusMoney!=undefined'>{{item.BonusMoney}}</span><span v-else>-</span></td>
<td><span v-if='item.PerfMoney!=undefined'>{{item.PerfMoney}}</span><span v-else>-</span></td>
<td><span v-if='item.SellMoney!=undefined'>{{item.SellMoney}}</span><span v-else>-</span></td>
<td><span v-if='item.OtherIncome!=undefined'>{{item.OtherIncome}}</span><span v-else>-</span></td>
<td><span v-if='item.OtherCost!=undefined'>{{item.OtherCost}}</span><span v-else>-</span></td>
</tr>
</table>
<div v-if='tableData.length==0'
style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;">
<div v-if='tableData.length==0' style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;">
暂无数据
</div>
</div>
......@@ -198,6 +227,7 @@
<script>
import {
getClassDropDownList,
getSchoolDropdown
} from '../../../api/school/index'
import {
getAllClassNowMonthStatistics,
......@@ -220,12 +250,16 @@
ClassId: 0,
ClassNo: '',
SchoolId:-1,
StartTime: '',
EndTime: '',
},
tableData: [],
ClassList: [],
alltableData:[],
schoolList: [],
ClassList:[],
allClassList: [],
choiceClass:0,
}
},
......@@ -234,13 +268,16 @@
if(this.$route.query.StartTime && this.$route.query.EndTime ){
this.valuemonth = [this.$route.query.StartTime,this.$route.query.EndTime]
}
if(this.$route.query.SchoolId){
this.msg.SchoolId = Number(this.$route.query.SchoolId)
}
}
},
mounted() {
this.getList();
this.setClass()
// this.setClass()
this.getBranchList()
},
methods: {
getList() {
......@@ -263,24 +300,100 @@
x.show = true
}
});
this.alltableData = JSON.parse(JSON.stringify(this.tableData))
this.ClassList = [{ ClassId:0, ClassName:'全部' }]
this.allClassList = [{ ClassId:0, ClassName:'全部' }]
this.alltableData.forEach(x=>{
let obj = {
ClassId:x.ClassId,
ClassName:x.ClassName
}
this.ClassList.push(obj)
this.allClassList.push(obj)
})
if(this.tableData.length>0){
this.getAskfor()
}
}
})
},
setClass(item) {//班级
this.isShowClass = true;
getClassDropDownList({
CourseId: 0,
IsAddDefault: 1, //添加默认选项
}).then(res => {
if (res.Code == 1) {
var jsonData = res.Data;
if (jsonData && jsonData.length > 0) {
this.ClassList = JSON.parse(JSON.stringify(jsonData));
this.allClassList = JSON.parse(JSON.stringify(jsonData));;
getAskfor(){//求值
let obj = {
ClassNo:'合计',
THoursNum:0,
TStuNum:0,
TStuMoney:0,
BonusMoney:0,
PerfMoney:0,
SellMoney:0,
OtherIncome:0,
OtherCost:0,
}
this.tableData.forEach((x)=>{
if(x.THoursNum){obj.THoursNum = this.accAdd(x.THoursNum,obj.THoursNum) };
if(x.TStuNum){obj.TStuNum = this.accAdd(x.TStuNum,obj.TStuNum) };
if(x.TStuMoney){obj.TStuMoney = this.accAdd(x.TStuMoney,obj.TStuMoney) };
if(x.BonusMoney){obj.BonusMoney = this.accAdd(x.BonusMoney,obj.BonusMoney) };
if(x.PerfMoney){obj.PerfMoney = this.accAdd(x.PerfMoney,obj.PerfMoney) };
if(x.SellMoney){obj.SellMoney = this.accAdd(x.SellMoney,obj.SellMoney)};
if(x.OtherIncome){obj.OtherIncome = this.accAdd(x.OtherIncome,obj.OtherIncome)};
if(x.OtherCost){obj.OtherCost = this.accAdd(x.OtherCost,obj.OtherCost)};
})
this.tableData.push(obj)
},
accAdd(arg1,arg2){//js 加法精确计算
var r1,r2,m;
try {
r1 = arg1.toString().split(".")[1].length;
} catch(e) {
r1 = 0;
}
});
try {
r2 = arg2.toString().split(".")[1].length;
} catch(e) {
r2 = 0;
}
m =Math.pow(10,Math.max(r1,r2));
return (arg1*m+arg2*m)/m;
},
getclassName(){
let data = []
this.alltableData.forEach(x=>{
if(x.ClassId ==this.choiceClass ){
data.push(x)
}
})
if(this.choiceClass == 0){
this.tableData = JSON.parse(JSON.stringify(this.alltableData))
}else{
this.tableData = data
}
if(this.tableData.length>0){
this.getAskfor()
}
},
getBranchList() {//获取校区
getSchoolDropdown({}).then(res => {
this.schoolList = res.Data;
var obj = {
SName: '全部',
SId: -1
}
this.schoolList.unshift(obj);
}).catch(() => {
})
},
//筛选员工
filterFn(val, update) {
update(() => {
......@@ -293,19 +406,8 @@
})
},
txexport() {
let text = '';
if (this.datetype == 2) {
if(new Date(this.msg.StartMonth).getTime() == new Date(this.msg.EndMonth).getTime()){
text = this.msg.StartMonth+'课耗统计.xls'
}else{
text = this.msg.StartMonth+'-'+ this.msg.EndMonth +'课耗统计.xls'
}
} else if (this.datetype == 1) {
text = this.valueyear+'年课耗统计.xls'
}
var msg = JSON.parse(JSON.stringify(this.msg));
EduDownLoad("/finance/GetTeacherConsumptionHoursStatisticsToExcel", msg, text)
EduDownLoad("/finance/GetTeacherConsumptionHoursStatisticsToExcel", msg, '课耗统计.xls')
},
gourlteacher2(path,row,item) {
let StudentName = encodeURI(row.StuName)
......@@ -328,6 +430,15 @@
this.OpenNewUrl(path, {
ClassNo: Name,
});
},
lookshouzhi(item){
console.log(item)
let Name = encodeURI(item.ClassName)
this.OpenNewUrl('/course/paymentDetail', {
ClassId: item.ClassId,
School_Id: this.msg.SchoolId,
ClassName: Name,
});
}
......
src/pages/sale/japaneseTrain.vue
View file @ f92f8e1e
......@@ -364,7 +364,7 @@
this.CourseList();
this.GetTeacherList();
if (this.$route.query && this.$route.query.ClassName) {
this.msg.ClassName = this.$route.query.ClassName;
this.msg.ClassName = decodeURI(this.$route.query.ClassName) ;
}
if (this.$route.query && this.$route.query.ClassNo) {
this.msg.ClassNo = this.$route.query.ClassNo;
......
src/pages/sale/orderStatistics.vue
View file @ f92f8e1e
......@@ -221,7 +221,7 @@
this.msg.EnterID = Number(this.$route.query.EnterID) ;
}
if (this.$route.query.ClassName) {
this.msg.ClassName = this.$route.query.ClassName;
this.msg.ClassName = decodeURI(this.$route.query.ClassName) ;
}
this.getOrderState();
this.getCourseList();
......
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