Commit ff1264a8 authored by 罗超's avatar 罗超

1

parent 58f45c1c
{
"recommendations": [
"dbaeumer.vscode-eslint",
"octref.vetur"
],
"unwantedRecommendations": [
"hookyqr.beautify",
"dbaeumer.jshint",
"ms-vscode.vscode-typescript-tslint-plugin"
]
}
{
"vetur.validation.template": false,
"vetur.format.enable": false,
"eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
"vetur.experimental.templateInterpolationService": true
}
<style> <style>
@import "css/cssReset.css"; @import "css/cssReset.css";
.page_EasyReport_set { .page_EasyReport_set {
position: relative; position: relative;
padding: 15px padding: 15px;
} }
.page_EasyReport_set .page_EasyReport_export { .page_EasyReport_set .page_EasyReport_export {
position: absolute; position: absolute;
right: 0; right: 0;
top: 15px; top: 15px;
} }
.page_EasyReport_set button.page_EasyReport_search { .page_EasyReport_set button.page_EasyReport_search {
position: absolute; position: absolute;
bottom: 27px; bottom: 27px;
left: 1020px; left: 1020px;
} }
.page_EasyReport_form { .page_EasyReport_form {
width: 1000px; width: 1000px;
float: left; float: left;
} }
.page_EasyReport_form .el-date-editor.el-input, .page_EasyReport_form .el-date-editor.el-input,
.page_EasyReport_form .el-date-editor.el-input__inner { .page_EasyReport_form .el-date-editor.el-input__inner {
width: 100% !important; width: 100% !important;
} }
.easyUpdateTime { .easyUpdateTime {
position: absolute; position: absolute;
top: 55px; top: 55px;
right: 0; right: 0;
} }
.column-cell-class-name-test-lan-s .v-table-body-cell { .column-cell-class-name-test-lan-s .v-table-body-cell {
background-color: #9cf; background-color: #9cf;
} }
.color-red { .color-red {
color: red; color: red;
} }
.color-green { .color-green {
color: green; color: green;
} }
.color-black { .color-black {
color: black !important; color: black !important;
} }
.border-b { .border-b {
border-bottom: 1px solid #999; border-bottom: 1px solid #999;
} }
td .border-b:last-child { td .border-b:last-child {
border: none; border: none;
} }
.orderCompleteStatistics td { .orderCompleteStatistics td {
color: #000; color: #000;
} }
</style> </style>
<template> <template>
<div class="page_EasyReport My_table_tell page-body" v-loading="AALloading"> <div class="page_EasyReport My_table_tell page-body" v-loading="AALloading">
...@@ -413,26 +412,22 @@ ...@@ -413,26 +412,22 @@
</div> </div>
</template> </template>
<script> <script>
import { import {
getSchoolDropdown, //获取校区列表 getSchoolDropdown, //获取校区列表
} from '../../api/school/index'; } from "../../api/school/index";
import { import { queryEmployee } from "../../api/users/user"; //获取业务员
queryEmployee import {
} from '../../api/users/user'; //获取业务员
import {
getOrderCompleteStatisticsPageList, getOrderCompleteStatisticsPageList,
setContractAdjustPrice setContractAdjustPrice,
} from "../../api/report/index" } from "../../api/report/index";
import Vue from "vue"; import Vue from "vue";
import { import {
getEasyReportList, getEasyReportList,
outToExcelEasyReportList outToExcelEasyReportList,
} from '../../api/finance/index' } from "../../api/finance/index";
import { import { EduDownLoad } from "../../api/common/common";
EduDownLoad, export default {
} from '../../api/common/common';
export default {
data() { data() {
return { return {
total: 0, total: 0,
...@@ -449,18 +444,18 @@ ...@@ -449,18 +444,18 @@
TradeWay: 0, //交易方式 TradeWay: 0, //交易方式
AccountId: 0, //账号id AccountId: 0, //账号id
AccountType: 0, //账户类型 AccountType: 0, //账户类型
StartTime: '', //下单时间 StartTime: "", //下单时间
EndTime: '', EndTime: "",
XFStartTime: '', //消费课时时间 XFStartTime: "", //消费课时时间
XFEndTime: '', XFEndTime: "",
}, },
datevalue: [], datevalue: [],
datevalue2: [], datevalue2: [],
data: [], data: [],
DataList: [], DataList: [],
UpdateStaus: 0, UpdateStaus: 0,
UpdateStartTime: '', UpdateStartTime: "",
UpdateEndTime: '', UpdateEndTime: "",
BranchList: [], BranchList: [],
MonthIndex: 0, MonthIndex: 0,
loading: false, loading: false,
...@@ -476,16 +471,15 @@ ...@@ -476,16 +471,15 @@
AdjustPrice: "", //协调金额 AdjustPrice: "", //协调金额
}, },
from: 1, //来源页 from: 1, //来源页
} };
}, },
created() { created() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
}, },
mounted() { mounted() {
if (this.$route.query.from) { if (this.$route.query.from) {
this.from = this.$route.query.from this.from = this.$route.query.from;
this.$forceUpdate(); this.$forceUpdate();
} }
this.getData(); this.getData();
...@@ -495,36 +489,41 @@ ...@@ -495,36 +489,41 @@
this.Financial_post_GetBranchAccountList(); this.Financial_post_GetBranchAccountList();
}, },
methods: { methods: {
handleCurrentChange: function (val) { //翻页 handleCurrentChange: function (val) {
//翻页
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getData(); this.getData();
}, },
exportExcel: function () { exportExcel: function () {
EduDownLoad("/finance/OutToExcelOrderStudentClassHoursList", this.msg, "订单完成统计.xls") EduDownLoad(
"/finance/OutToExcelOrderStudentClassHoursList",
this.msg,
"订单完成统计.xls"
);
}, },
getData() { getData() {
if (this.datevalue && this.datevalue.length > 0) { if (this.datevalue && this.datevalue.length > 0) {
this.msg.StartTime = this.datevalue[0]; this.msg.StartTime = this.datevalue[0];
this.msg.EndTime = this.datevalue[1]; this.msg.EndTime = this.datevalue[1];
} else { } else {
this.msg.StartTime = ''; this.msg.StartTime = "";
this.msg.EndTime = ''; this.msg.EndTime = "";
} }
if (this.datevalue2 && this.datevalue2.length > 0) { if (this.datevalue2 && this.datevalue2.length > 0) {
this.msg.XFStartTime = this.datevalue2[0]; this.msg.XFStartTime = this.datevalue2[0];
this.msg.XFEndTime = this.datevalue2[1]; this.msg.XFEndTime = this.datevalue2[1];
} else { } else {
this.msg.XFStartTime = ''; this.msg.XFStartTime = "";
this.msg.XFEndTime = ''; this.msg.XFEndTime = "";
} }
getOrderCompleteStatisticsPageList(this.msg).then((res) => { getOrderCompleteStatisticsPageList(this.msg).then((res) => {
res.Data.PageData.map((item) => { res.Data.PageData.map((item) => {
item.Progress = item.Progress + "%" item.Progress = item.Progress + "%";
}) });
this.DataList = res.Data.PageData this.DataList = res.Data.PageData;
this.total = res.Data.Count this.total = res.Data.Count;
}) });
}, },
getCompanyList() { getCompanyList() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
...@@ -532,139 +531,168 @@ ...@@ -532,139 +531,168 @@
let msg = { let msg = {
Status: 0, Status: 0,
is_show: 0, is_show: 0,
RB_Group_Id: RB_Group_id RB_Group_Id: RB_Group_id,
}; };
getSchoolDropdown({}).then(res => { getSchoolDropdown({}).then((res) => {
if (res.Code == 1) { if (res.Code == 1) {
var tempArray = res.Data; var tempArray = res.Data;
this.BranchList = tempArray; this.BranchList = tempArray;
} }
}) });
}, },
//获取业务员 //获取业务员
getEmployee(id) { getEmployee(id) {
var qMsg = { var qMsg = {
Dept_Id: 0 Dept_Id: 0,
} };
qMsg.Dept_Id = id; qMsg.Dept_Id = id;
queryEmployee(qMsg).then(res => { queryEmployee(qMsg)
.then((res) => {
if (res.Code == 1) { if (res.Code == 1) {
this.EmployeeList = res.Data; this.EmployeeList = res.Data;
} }
}).catch(() => {
}) })
.catch(() => {});
}, },
//获取账户类型下拉 //获取账户类型下拉
AccountType_post_GetList() { AccountType_post_GetList() {
this.apipost('AccountType_post_GetList', this.queryAccMsg, res => { this.apipost(
"AccountType_post_GetList",
this.queryAccMsg,
(res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.AccList = res.data.data; this.AccList = res.data.data;
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}, err => {}) },
(err) => {}
);
}, },
//获取交易方式列表 //获取交易方式列表
Financial_post_GetBranchAccountList() { Financial_post_GetBranchAccountList() {
this.apipost('Financial_post_GetBranchAccountList', {}, res => { this.apipost(
"Financial_post_GetBranchAccountList",
{},
(res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.BranchAccountList = res.data.data; this.BranchAccountList = res.data.data;
} }
}, err => {}) },
(err) => {}
);
}, },
//账户id //账户id
getAccountList(i, t) { getAccountList(i, t) {
let accountList = []; let accountList = [];
if (t == 1) { // 银行 if (t == 1) {
this.apipost('bankaccount_post_GetList', { // 银行
TypeId: i this.apipost(
}, res => { "bankaccount_post_GetList",
{
TypeId: i,
},
(res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x => { data.forEach((x) => {
let obj = { let obj = {
ID: x.ID, ID: x.ID,
Name: x.Alias, Name: x.Alias,
Nom: 0, Nom: 0,
} };
accountList.push(obj) accountList.push(obj);
}) });
this.accountList = accountList; this.accountList = accountList;
} }
}, err => {}) },
(err) => {}
);
} }
if (t == 2) { //平台账户 if (t == 2) {
//平台账户
let msg = { let msg = {
BackId: 0, BackId: 0,
TypeId: i, TypeId: i,
BranchId: -1, BranchId: -1,
Alias: '' Alias: "",
} };
this.apipost('BankAccount_post_GetPlatformList', msg, res => { this.apipost(
"BankAccount_post_GetPlatformList",
msg,
(res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x => { data.forEach((x) => {
let obj = { let obj = {
ID: x.ID, ID: x.ID,
Name: x.Alias, Name: x.Alias,
Nom: x.PlatformNo Nom: x.PlatformNo,
} };
accountList.push(obj) accountList.push(obj);
}) });
this.accountList = accountList; this.accountList = accountList;
} }
}, err => {}) },
(err) => {}
);
} }
if (t == 3) { //现金账户 if (t == 3) {
//现金账户
let msg = { let msg = {
TypeId: i, TypeId: i,
BranchId: -1, BranchId: -1,
Alias: '' Alias: "",
} };
this.apipost('BankAccount_post_GetCashAccountList', msg, res => { this.apipost(
"BankAccount_post_GetCashAccountList",
msg,
(res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x => { data.forEach((x) => {
let obj = { let obj = {
ID: x.ID, ID: x.ID,
Name: x.Alias, Name: x.Alias,
Nom: 0 Nom: 0,
} };
accountList.push(obj) accountList.push(obj);
}) });
this.accountList = accountList this.accountList = accountList;
} }
}, err => {}) },
(err) => {}
);
} }
if (t == 4) { //资金池账户 if (t == 4) {
//资金池账户
let msg = { let msg = {
TypeId: i, TypeId: i,
BranchId: -1, BranchId: -1,
Alias: '' Alias: "",
} };
this.apipost('BankAccount_post_GetCashPoolList', msg, res => { this.apipost(
"BankAccount_post_GetCashPoolList",
msg,
(res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x => { data.forEach((x) => {
let obj = { let obj = {
ID: x.ID, ID: x.ID,
Name: x.Alias, Name: x.Alias,
Nom: 0 Nom: 0,
} };
accountList.push(obj) accountList.push(obj);
}) });
this.accountList = accountList this.accountList = accountList;
} }
}, err => {}) },
(err) => {}
);
} }
}, },
bodyCellSpan({ bodyCellSpan({ row, column, rowIndex }) {
row,
column,
rowIndex
}) {
if (rowIndex === 1) { if (rowIndex === 1) {
if (column.field === "date") { if (column.field === "date") {
return { return {
...@@ -703,10 +731,12 @@ ...@@ -703,10 +731,12 @@
if (this.$refs.money.hasError) { if (this.$refs.money.hasError) {
this.formHasError = true; this.formHasError = true;
} else { } else {
this.AdjustPriceMsg.ContractId = this.AdjustPriceMsg.ContractId.toString(); this.AdjustPriceMsg.ContractId =
this.AdjustPriceMsg.AdjustPrice = this.AdjustPriceMsg.AdjustPrice.toString(); this.AdjustPriceMsg.ContractId.toString();
this.AdjustPriceMsg.AdjustPrice =
this.AdjustPriceMsg.AdjustPrice.toString();
if (this.AdjustPriceMsg.AdjustPrice == '') { if (this.AdjustPriceMsg.AdjustPrice == "") {
this.AdjustPriceMsg.AdjustPrice = 0; this.AdjustPriceMsg.AdjustPrice = 0;
} }
...@@ -719,40 +749,39 @@ ...@@ -719,40 +749,39 @@
message: res.Message, message: res.Message,
}); });
if (res.Code === 1) { if (res.Code === 1) {
this.getData() this.getData();
} }
this.$refs.dialog.hide(); this.$refs.dialog.hide();
}) });
} }
}, },
goUrl(path, Names) { goUrl(path, Names) {
let Name = encodeURI(Names) let Name = encodeURI(Names);
this.OpenNewUrl(path, { this.OpenNewUrl(path, {
Name: Name, Name: Name,
}); });
}, },
goUrl2(path, Names) { //班级 goUrl2(path, Names) {
let Name = encodeURI(Names) //班级
let Name = encodeURI(Names);
this.OpenNewUrl(path, { this.OpenNewUrl(path, {
ClassName: Name, ClassName: Name,
}); });
}, },
goUrl3(path, ID) { //订单跳转 goUrl3(path, ID) {
//订单跳转
this.OpenNewUrl(path, { this.OpenNewUrl(path, {
OrderId: ID, OrderId: ID,
}); });
}, },
seeClassUseDetail(item){ seeClassUseDetail(item) {
let obj={ let obj = {
StudentId:76, StudentId: item.GuestId,
TeacherId:0, TeacherId: 0,
ClassId:16 // ClassId: 16,
} };
console.log(752,item) this.OpenNewUrl("/teacher/studentsClassSee", obj);
// this.OpenNewUrl("/teacher/studentsClassSee",obj) },
} },
} };
}
</script> </script>
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