Skip to content

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

1

parent 58f45c1c
Hide whitespace changes
Inline Side-by-side
Showing with 365 additions and 355 deletions
.vscode/extensions.json deleted 100644 → 0
View file @ 58f45c1c
{
"recommendations": [
"dbaeumer.vscode-eslint",
"octref.vetur"
],
"unwantedRecommendations": [
"hookyqr.beautify",
"dbaeumer.jshint",
"ms-vscode.vscode-typescript-tslint-plugin"
]
}
.vscode/settings.json deleted 100644 → 0
View file @ 58f45c1c
{
"vetur.validation.template": false,
"vetur.format.enable": false,
"eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
"vetur.experimental.templateInterpolationService": true
}
src/pages/financial/orderCompleteStatistics.vue
View file @ ff1264a8
<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 {
color: #000;
}
.orderCompleteStatistics td {
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,346 +412,376 @@ ...@@ -413,346 +412,376 @@
</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'; //获取业务员 getOrderCompleteStatisticsPageList,
import { setContractAdjustPrice,
getOrderCompleteStatisticsPageList, } from "../../api/report/index";
setContractAdjustPrice import Vue from "vue";
} from "../../api/report/index"
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'; data() {
export default { return {
data() { total: 0,
return { msg: {
total: 0, pageIndex: 1,
msg: { pageSize: 10,
pageIndex: 1, OrderId: 0, // 订单编号
pageSize: 10, ContractNo: "", //合同编号
OrderId: 0, // 订单编号 StudentName: "", //学生姓名
ContractNo: "", //合同编号 ClassName: "", //班级名称
StudentName: "", //学生姓名 CourseName: "", //课程名称
ClassName: "", //班级名称 CreateBy: 0, //业务员
CourseName: "", //课程名称 FinanceId: 0, //财务单据id
CreateBy: 0, //业务员 TradeWay: 0, //交易方式
FinanceId: 0, //财务单据id AccountId: 0, //账号id
TradeWay: 0, //交易方式 AccountType: 0, //账户类型
AccountId: 0, //账号id StartTime: "", //下单时间
AccountType: 0, //账户类型 EndTime: "",
StartTime: '', //下单时间 XFStartTime: "", //消费课时时间
EndTime: '', XFEndTime: "",
XFStartTime: '', //消费课时时间 },
XFEndTime: '', datevalue: [],
}, datevalue2: [],
datevalue: [], data: [],
datevalue2: [], DataList: [],
data: [], UpdateStaus: 0,
DataList: [], UpdateStartTime: "",
UpdateStaus: 0, UpdateEndTime: "",
UpdateStartTime: '', BranchList: [],
UpdateEndTime: '', MonthIndex: 0,
BranchList: [], loading: false,
MonthIndex: 0, AALloading: false,
loading: false, userId: -2,
AALloading: false,
userId: -2,
EmployeeList: [], //业务员列表 EmployeeList: [], //业务员列表
AccList: [], //账户类型列表 AccList: [], //账户类型列表
BranchAccountList: [], //交易方式列表 BranchAccountList: [], //交易方式列表
accountList: [], //账号id列表 accountList: [], //账号id列表
AdjustPriceMsg: { AdjustPriceMsg: {
ContractId: "", //合同id ContractId: "", //合同id
AdjustPrice: "", //协调金额 AdjustPrice: "", //协调金额
}, },
from: 1, //来源页 from: 1, //来源页
} };
},
created() {
let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId;
},
mounted() {
if (this.$route.query.from) {
this.from = this.$route.query.from;
this.$forceUpdate();
}
this.getData();
this.getCompanyList();
this.getEmployee(0);
this.AccountType_post_GetList();
this.Financial_post_GetBranchAccountList();
},
methods: {
handleCurrentChange: function (val) {
//翻页
this.msg.pageIndex = val;
this.getData();
}, },
created() {
let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId;
exportExcel: function () {
EduDownLoad(
"/finance/OutToExcelOrderStudentClassHoursList",
this.msg,
"订单完成统计.xls"
);
}, },
mounted() { getData() {
if (this.$route.query.from) { if (this.datevalue && this.datevalue.length > 0) {
this.from = this.$route.query.from this.msg.StartTime = this.datevalue[0];
this.$forceUpdate(); this.msg.EndTime = this.datevalue[1];
} else {
this.msg.StartTime = "";
this.msg.EndTime = "";
} }
this.getData(); if (this.datevalue2 && this.datevalue2.length > 0) {
this.getCompanyList(); this.msg.XFStartTime = this.datevalue2[0];
this.getEmployee(0); this.msg.XFEndTime = this.datevalue2[1];
this.AccountType_post_GetList(); } else {
this.Financial_post_GetBranchAccountList(); this.msg.XFStartTime = "";
this.msg.XFEndTime = "";
}
getOrderCompleteStatisticsPageList(this.msg).then((res) => {
res.Data.PageData.map((item) => {
item.Progress = item.Progress + "%";
});
this.DataList = res.Data.PageData;
this.total = res.Data.Count;
});
}, },
methods: { getCompanyList() {
handleCurrentChange: function (val) { //翻页 let userInfo = this.getLocalStorage();
this.msg.pageIndex = val; var RB_Group_id = userInfo.RB_Group_id;
this.getData(); let msg = {
}, Status: 0,
is_show: 0,
exportExcel: function () { RB_Group_Id: RB_Group_id,
EduDownLoad("/finance/OutToExcelOrderStudentClassHoursList", this.msg, "订单完成统计.xls") };
}, getSchoolDropdown({}).then((res) => {
getData() { if (res.Code == 1) {
if (this.datevalue && this.datevalue.length > 0) { var tempArray = res.Data;
this.msg.StartTime = this.datevalue[0]; this.BranchList = tempArray;
this.msg.EndTime = this.datevalue[1];
} else {
this.msg.StartTime = '';
this.msg.EndTime = '';
}
if (this.datevalue2 && this.datevalue2.length > 0) {
this.msg.XFStartTime = this.datevalue2[0];
this.msg.XFEndTime = this.datevalue2[1];
} else {
this.msg.XFStartTime = '';
this.msg.XFEndTime = '';
}
getOrderCompleteStatisticsPageList(this.msg).then((res) => {
res.Data.PageData.map((item) => {
item.Progress = item.Progress + "%"
})
this.DataList = res.Data.PageData
this.total = res.Data.Count
})
},
getCompanyList() {
let userInfo = this.getLocalStorage();
var RB_Group_id = userInfo.RB_Group_id;
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
};
getSchoolDropdown({}).then(res => {
if (res.Code == 1) {
var tempArray = res.Data;
this.BranchList = tempArray;
}
})
},
//获取业务员
getEmployee(id) {
var qMsg = {
Dept_Id: 0
} }
qMsg.Dept_Id = id; });
queryEmployee(qMsg).then(res => { },
//获取业务员
getEmployee(id) {
var qMsg = {
Dept_Id: 0,
};
qMsg.Dept_Id = id;
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() { //获取账户类型下拉
this.apipost('AccountType_post_GetList', this.queryAccMsg, res => { AccountType_post_GetList() {
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() { },
this.apipost('Financial_post_GetBranchAccountList', {}, res => { //获取交易方式列表
Financial_post_GetBranchAccountList() {
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 );
getAccountList(i, t) { },
let accountList = []; //账户id
if (t == 1) { // 银行 getAccountList(i, t) {
this.apipost('bankaccount_post_GetList', { let accountList = [];
TypeId: i if (t == 1) {
}, res => { // 银行
this.apipost(
"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) { //平台账户 );
let msg = { }
BackId: 0, if (t == 2) {
TypeId: i, //平台账户
BranchId: -1, let msg = {
Alias: '' BackId: 0,
} TypeId: i,
this.apipost('BankAccount_post_GetPlatformList', msg, res => { BranchId: -1,
Alias: "",
};
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) { //现金账户 );
let msg = { }
TypeId: i, if (t == 3) {
BranchId: -1, //现金账户
Alias: '' let msg = {
} TypeId: i,
this.apipost('BankAccount_post_GetCashAccountList', msg, res => { BranchId: -1,
Alias: "",
};
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) { //资金池账户 );
let msg = { }
TypeId: i, if (t == 4) {
BranchId: -1, //资金池账户
Alias: '' let msg = {
} TypeId: i,
this.apipost('BankAccount_post_GetCashPoolList', msg, res => { BranchId: -1,
Alias: "",
};
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({ row, column, rowIndex }) {
if (rowIndex === 1) {
if (column.field === "date") {
return {
rowspan: 1,
colspan: 2,
};
} else if (column.field === "hobby") {
return {
rowspan: 0,
colspan: 0,
};
} }
}
},
//对话框
show() {
this.$refs.dialog.show();
},
}, hide() {
bodyCellSpan({ this.$refs.dialog.hide();
row, },
column,
rowIndex
}) {
if (rowIndex === 1) {
if (column.field === "date") {
return {
rowspan: 1,
colspan: 2,
};
} else if (column.field === "hobby") {
return {
rowspan: 0,
colspan: 0,
};
}
}
},
//对话框
show() {
this.$refs.dialog.show();
},
hide() { onDialogHide() {
this.$refs.dialog.hide(); // QDialog发出“hide”事件时
}, // 需要发出
this.$emit("hide");
},
onDialogHide() { onCancelClick() {
// QDialog发出“hide”事件时 // 我们只需要隐藏对话框
// 需要发出 this.hide();
this.$emit("hide"); },
}, onSubmit() {
this.$refs.money.validate();
if (this.$refs.money.hasError) {
this.formHasError = true;
} else {
this.AdjustPriceMsg.ContractId =
this.AdjustPriceMsg.ContractId.toString();
this.AdjustPriceMsg.AdjustPrice =
this.AdjustPriceMsg.AdjustPrice.toString();
onCancelClick() { if (this.AdjustPriceMsg.AdjustPrice == "") {
// 我们只需要隐藏对话框 this.AdjustPriceMsg.AdjustPrice = 0;
this.hide(); }
},
onSubmit() {
this.$refs.money.validate();
if (this.$refs.money.hasError) {
this.formHasError = true;
} else {
this.AdjustPriceMsg.ContractId = this.AdjustPriceMsg.ContractId.toString();
this.AdjustPriceMsg.AdjustPrice = this.AdjustPriceMsg.AdjustPrice.toString();
if (this.AdjustPriceMsg.AdjustPrice == '') { setContractAdjustPrice(this.AdjustPriceMsg).then((res) => {
this.AdjustPriceMsg.AdjustPrice = 0; this.$q.notify({
type: "positive",
icon: "done",
position: "top",
color: "positive",
message: res.Message,
});
if (res.Code === 1) {
this.getData();
} }
this.$refs.dialog.hide();
setContractAdjustPrice(this.AdjustPriceMsg).then((res) => {
this.$q.notify({
type: "positive",
icon: "done",
position: "top",
color: "positive",
message: res.Message,
});
if (res.Code === 1) {
this.getData()
}
this.$refs.dialog.hide();
})
}
},
goUrl(path, Names) {
let Name = encodeURI(Names)
this.OpenNewUrl(path, {
Name: Name,
});
},
goUrl2(path, Names) { //班级
let Name = encodeURI(Names)
this.OpenNewUrl(path, {
ClassName: Name,
}); });
},
goUrl3(path, ID) { //订单跳转
this.OpenNewUrl(path, {
OrderId: ID,
});
},
seeClassUseDetail(item){
let obj={
StudentId:76,
TeacherId:0,
ClassId:16
}
console.log(752,item)
// this.OpenNewUrl("/teacher/studentsClassSee",obj)
} }
} },
} goUrl(path, Names) {
let Name = encodeURI(Names);
this.OpenNewUrl(path, {
Name: Name,
});
},
goUrl2(path, Names) {
//班级
let Name = encodeURI(Names);
this.OpenNewUrl(path, {
ClassName: Name,
});
},
goUrl3(path, ID) {
//订单跳转
this.OpenNewUrl(path, {
OrderId: ID,
});
},
seeClassUseDetail(item) {
let obj = {
StudentId: item.GuestId,
TeacherId: 0,
// ClassId: 16,
};
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