Skip to content

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

1

parent d2495bca
Show whitespace changes
Inline Side-by-side
Showing with 246 additions and 820 deletions
src/api/report/index.js
View file @ 99514bfc
...@@ -4,7 +4,6 @@ import request from '../../utils/request' ...@@ -4,7 +4,6 @@ import request from '../../utils/request'
* 营收报表 * 营收报表
*/ */
export function getRevenueReportPageList(data) { export function getRevenueReportPageList(data) {
//参数信息AccountType AccountId
return request({ return request({
url: '/finance/GetRevenueReportPageList', url: '/finance/GetRevenueReportPageList',
method: 'post', method: 'post',
...@@ -16,10 +15,19 @@ export function getRevenueReportPageList(data) { ...@@ -16,10 +15,19 @@ export function getRevenueReportPageList(data) {
* 订单完成统计 * 订单完成统计
*/ */
export function getOrderCompleteStatisticsPageList(data) { export function getOrderCompleteStatisticsPageList(data) {
//参数信息AccountType AccountId
return request({ return request({
url: '/finance/GetOrderStudentClassHoursPageList', url: '/finance/GetOrderStudentClassHoursPageList',
method: 'post', method: 'post',
data data
}) })
} }
/**
* 设置合同协调金额
*/
export function setContractAdjustPrice(data) {
return request({
url: '/finance/SetContractAdjustPrice',
method: 'post',
data
})
}
src/pages/financial/EasyReport.vue
View file @ 99514bfc
...@@ -988,7 +988,8 @@ ...@@ -988,7 +988,8 @@
sortChange: function (param) { sortChange: function (param) {
}, },
customCompFunc: function (param) {}, customCompFunc: function (param) {
},
columnCellClass: function (rowIndex, columnName, rowData) { columnCellClass: function (rowIndex, columnName, rowData) {
if (rowData.YiYue < 0 && columnName == "YiYue") { if (rowData.YiYue < 0 && columnName == "YiYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red"
......
src/pages/financial/orderCompleteStatistics.vue
View file @ 99514bfc
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
<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">
<div class="page_EasyReport_set clearfix"> <div class="page_EasyReport_set clearfix">
<el-form class="clearfix page_EasyReport_form" label-width="110px"> <el-form class="clearfix" label-width="110px">
<el-row style="padding:15px 0 0 0;"> <el-row style="padding:15px 0 0 0; width:100%">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="订单编号："> <el-form-item label="订单编号：">
<el-input v-model="msg.OrderId" placeholder="请输入内容" filterable></el-input> <el-input v-model="msg.OrderId" placeholder="请输入内容" filterable></el-input>
...@@ -120,23 +120,166 @@ ...@@ -120,23 +120,166 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6" style="float:right">
<button class="normalBtn page_EasyReport_search" @click="getData(2)">查询</button> <button class="normalBtn " @click="getData()">查询</button>
<button class="normalBtn " @click="exportExcel">导出EXCEL</button>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="page_EasyReport_export">
<button class="normalBtn " @click="exportExcel">导出EXCEL</button> <!-- <button class="normalBtn page_EasyReport_search" v-if="userId==1" @click="getData(1)">保存损失</button>
</div>
<button class="normalBtn page_EasyReport_search" v-if="userId==1" @click="getData(1)">保存损失</button>
<p class="easyUpdateTime" v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p> <p class="easyUpdateTime" v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
<p class="easyUpdateTime" v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}<br />每日8点、12点、19点、22点数据更新~</p> <p class="easyUpdateTime" v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}<br />每日8点、12点、19点、22点数据更新~</p> -->
</div> </div>
<div style="margin-bottom:25px;" v-loading='loading'> <!-- <div style="margin-bottom:25px;" v-loading='loading'>
<v-table is-horizontal-resize column-width-drag :show-vertical-border="true" rowKeyFieldName="rowkey" style="width:100%" :columns="columns" <v-table is-horizontal-resize column-width-drag :show-vertical-border="true" rowKeyFieldName="rowkey" style="width:100%" :columns="columns"
:table-data="DataList" :filter-method="filterMethod" :column-cell-class-name="columnCellClass" :table-data="DataList" :filter-method="filterMethod" :column-cell-class-name="columnCellClass"
@on-custom-comp="customCompFunc" @sort-change="sortChange" :row-click="rowClick" :row-dblclick="rowDbClick" > @on-custom-comp="customCompFunc" @sort-change="sortChange" :row-click="rowClick" :row-dblclick="rowDbClick" :cell-span-option="cellSpanOption" >
</v-table> </v-table>
</div> -->
<div style="width:100%; overflow-x:auto">
<table :boeder="1" class="singeRowTable orderCompleteStatistics" style="width:3000px;border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr>
<!-- -合同信息-- -->
<th :width='120'>合同信息</th>
<th :width='200'>签订时间</th>
<th :width='220'>合同编号</th>
<th :width='400'>产品名称</th>
<th :width='400'>班级</th>
<th :width='150'>学员名称</th>
<th :width='120'>业务员</th>
<th :width='120'>课时</th>
<th :width='120'>单价</th>
<th :width='120'>课程费</th>
<th :width='120'>教材费</th>
<th :width='120'>课件费</th>
<th :width='150'>优惠金额</th>
<th :width='180'>合同总金额</th>
<!-- -收款信息（实收金额-- -->
<th :width='300'>收款日期</th>
<th :width='150'>收款金额</th>
<th :width='150'>收款方式</th>
<th :width='150'>收款账户</th>
<!-- ---- -->
<th :width='150'>应收金额</th>
<!-- --合同有效金额-- -->
<th :width='150'>有效课时</th>
<th :width='150'>有效金额</th>
<!-- -消耗情况-- -->
<th :width='200'>消耗教材费</th>
<th :width='200'>消耗课件费</th>
<th :width='150'>上课进度</th>
<th :width='150'>已上课时</th>
<th :width='120'>单价</th>
<th :width='200'>已上课金额</th>
<!-- -剩余情况-- -->
<th :width='120'>协调金额</th>
<th :width='120'>剩余课时</th>
<th :width='120'>剩余金额</th>
<th :width='120'>操作</th>
</tr>
<template v-for="(item,index) in DataList" v-loading="loading">
<tr>
<!-- -合同信息-- -->
<td>{{item.OrderId}}</td>
<td>{{item.CreateTime}}</td>
<td>{{item.ContractNo}}</td>
<td>{{item.CourseName}}</td>
<td>{{item.ClassName}}</td>
<td>{{item.StudentName}}</td>
<td>{{item.EmployeeName}}</td>
<td>{{item.TotalClassHours}}</td>
<td>{{item.TotalUnitPrice}}</td>
<td>{{item.TotalCourseFee}}</td>
<td>{{item.TotalBookFee}}</td><!--教材费-->
<td>{{item.TotalClassFee}}</td><!--课件费-->
<td>{{item.TotalClassFee}}</td><!--优惠金额-->
<td>{{item.TotalMoney}}</td><!--合同总金额-->
<!-- -收款信息（实收金额-- -->
<td>
<div v-for="subitem in item.IncomeList" :key="item.id">
{{ subitem.TradeDate }}
</div>
</td><!--收款日期-->
<td>
<div v-for="subitem in item.IncomeList" :key="item.id">
{{ subitem.Money }}
</div>
</td><!--收款金额-->
<td>
<div v-for="subitem in item.IncomeList">
<div v-for="_subitem in subitem.TradeWayList">
{{ _subitem.TypeName }}
</div>
</div>
</td><!--收款方式-->
<td>
<div v-for="subitem in item.IncomeList">
<div v-for="_subitem in subitem.TradeWayList">
{{ _subitem.BankNo }}
</div>
</div>
</td><!--收款账户-->
<!-- ---- -->
<td>{{item.PreferPrice}}</td><!--应收金额-->
<!-- -合同有效金额--- -->
<td>{{item.EffectiveClassHours}}</td><!--有效课时-->
<td>{{item.Income}}</td><!--有效金额-->
<!-- 消耗情况 -->
<td>{{item.UseBookFee}}</td><!--教材费-->
<td>{{item.UseCoursewareFee}}</td><!--课件费-->
<td>{{item.Progress}}</td><!--上课进度-->
<td>{{item.UseClassHours}}</td><!--已上课时-->
<td>{{item.Unit_Price}}</td><!--单价-->
<td>{{item.UseCourseFee}}</td><!--已上课金额-->
<!-- -剩余情况-- -->
<td>{{item.AdjustPrice}}</td><!--协调金额-->
<td>{{item.SurplusCourseHours}}</td><!--剩余课时-->
<td :class="{'color-red':item.SurplusMoney<0,'color-green':item.SurplusMoney>0&&item.SurplusMoney<500,'color-black':item.SurplusMoney=0||item.SurplusMoney>=500}">{{item.SurplusMoney}}</td><!--剩余金额-->
<td><q-btn color="primary" label="协调金额" @click="show($event),AdjustPriceMsg.ContractId=item.Id,AdjustPriceMsg.AdjustPrice=item.AdjustPrice"/></td><!--操作-->
</tr>
</template>
</table>
<div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>暂无数据</p></div>
</div>
<!-- 对话框 -->
<template>
<q-dialog ref="dialog" @hide="onDialogHide">
<q-card class="q-dialog-plugin">
<div class="q-pa-md" style="max-width: 400px">
<q-card-section>
<div class="text-h6" style="textAlign:center">设置协调金额</div>
</q-card-section>
<q-form @submit="onSubmit" class="q-gutter-md">
<q-input
filled
ref="money"
v-model="AdjustPriceMsg.AdjustPrice"
label="协调金额"
lazy-rules
type="number"
:rules="[(val) => (val>=0) || '请输入协调金额']"
/>
<div>
<q-btn label="提交" type="Submit" color="primary" />
</div>
</q-form>
</div>
</q-card>
</q-dialog>
</template>
<div v-if="DataList.length>0">
<!-- <el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size='msg.pageSize'
:total='total'>
</el-pagination> -->
</div> </div>
</div> </div>
</template> </template>
...@@ -145,406 +288,9 @@ ...@@ -145,406 +288,9 @@
getSchoolDropdown, //获取校区列表 getSchoolDropdown, //获取校区列表
} from '../../api/school/index'; } from '../../api/school/index';
import { queryEmployee } from '../../api/users/user';//获取业务员 import { queryEmployee } from '../../api/users/user';//获取业务员
import {getOrderCompleteStatisticsPageList} from "../../api/report/index" import {getOrderCompleteStatisticsPageList,setContractAdjustPrice} from "../../api/report/index"
import Vue from "vue"; import Vue from "vue";
//一月
Vue.component("YiYueJump", {
// 团队跳转
template: `
<div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',1,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.YiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.YiYue}}</span>
</div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
goUrl(path, month, year, BranchId, ids) {
this.$router.push({
path: "/financial/" + path,
query: {
year: year,
month: month,
BranchId: BranchId,
CostIds: ids,
blank: "y"
}
});
}
}
});
//二月
Vue.component("ErYueJump", {
// 团队跳转
template: `
<div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',2,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ErYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.ErYue}}</span>
</div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
goUrl(path, month, year, BranchId, ids) {
this.$router.push({
path: "/financial/" + path,
query: {
year: year,
month: month,
BranchId: BranchId,
CostIds: ids,
blank: "y"
}
});
}
}
});
//三月
Vue.component("SanYueJump", {
// 团队跳转
template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',3,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SanYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.SanYue}}</span>
</div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
goUrl(path, month, year, BranchId, ids) {
this.$router.push({
path: "/financial/" + path,
query: {
year: year,
month: month,
BranchId: BranchId,
CostIds: ids,
blank: "y"
}
});
}
}
});
//四月
Vue.component("SiYueJump", {
// 团队跳转
template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',4,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.SiYue}}</span>
</div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
goUrl(path, month, year, BranchId, ids) {
this.$router.push({
path: "/financial/" + path,
query: {
year: year,
month: month,
BranchId: BranchId,
CostIds: ids,
blank: "y"
}
});
}
}
});
//五月
Vue.component("WuYueJump", {
// 团队跳转
template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',5,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.WuYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.WuYue}}</span>
</div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
goUrl(path, month, year, BranchId, ids) {
this.$router.push({
path: "/financial/" + path,
query: {
year: year,
month: month,
BranchId: BranchId,
CostIds: ids,
blank: "y"
}
});
}
}
});
//六月
Vue.component("LiuYueJump", {
// 团队跳转
template: ` <div class="gourl_span">
<span style="cursor: pointer;" v-if="rowData.CostIds" @click="goUrl('JumpReport',6,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.LiuYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.LiuYue}}</span>
</div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
goUrl(path, month, year, BranchId, ids) {
this.$router.push({
path: "/financial/" + path,
query: {
year: year,
month: month,
BranchId: BranchId,
CostIds: ids,
blank: "y"
}
});
}
}
});
//七月
Vue.component("QiYueJump", {
// 团队跳转
template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',7,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.QiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.QiYue}}</span>
</div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
goUrl(path, month, year, BranchId, ids) {
this.$router.push({
path: "/financial/" + path,
query: {
year: year,
month: month,
BranchId: BranchId,
CostIds: ids,
blank: "y"
}
});
}
}
});
//八月
Vue.component("BaYueJump", {
// 团队跳转
template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',8,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.BaYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.BaYue}}</span>
</div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
goUrl(path, month, year, BranchId, ids) {
this.$router.push({
path: "/financial/" + path,
query: {
year: year,
month: month,
BranchId: BranchId,
CostIds: ids,
blank: "y"
}
});
}
}
});
//九月
Vue.component("JiuYueJump", {
// 团队跳转
template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',9,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.JiuYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.JiuYue}}</span>
</div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
goUrl(path, month, year, BranchId, ids) {
this.$router.push({
path: "/financial/" + path,
query: {
year: year,
month: month,
BranchId: BranchId,
CostIds: ids,
blank: "y"
}
});
}
}
});
//十月
Vue.component("ShiYueJump", {
// 团队跳转
template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',10,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.ShiYue}}</span>
</div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
goUrl(path, month, year, BranchId, ids) {
this.$router.push({
path: "/financial/" + path,
query: {
year: year,
month: month,
BranchId: BranchId,
CostIds: ids,
blank: "y"
}
});
}
}
});
//十一月
Vue.component("ShiYiYueJump", {
// 团队跳转
template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',11,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.ShiYiYue}}</span>
</div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
goUrl(path, month, year, BranchId, ids) {
this.$router.push({
path: "/financial/" + path,
query: {
year: year,
month: month,
BranchId: BranchId,
CostIds: ids,
blank: "y"
}
});
}
}
});
//十二月
Vue.component("ShiErYueJump", {
// 团队跳转
template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',12,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiEr}}</span>
<span style="cursor: pointer" v-else>{{rowData.ShiEr}}</span>
</div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
goUrl(path, month, year, BranchId, ids) {
this.$router.push({
path: "/financial/" + path,
query: {
year: year,
month: month,
BranchId: BranchId,
CostIds: ids,
blank: "y"
}
});
}
}
});
import { import {
getEasyReportList, getEasyReportList,
outToExcelEasyReportList outToExcelEasyReportList
...@@ -555,6 +301,7 @@ ...@@ -555,6 +301,7 @@
export default { export default {
data() { data() {
return { return {
msg: { msg: {
pageIndex:1, pageIndex:1,
pageSize:10, pageSize:10,
...@@ -579,300 +326,6 @@ ...@@ -579,300 +326,6 @@
loading: false, loading: false,
AALloading: false, AALloading: false,
userId: -2, userId: -2,
/* columns: [{
field: "Sort",
title: "合计",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "ZhaiYao",
title: "订单号",
width: 150,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false,
},
{
field: "YiYue",
title: "一月",
start: "01-01",
end: "01-31",
month: 1,
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false,
// componentName: "YiYueJump"
},
{
field: "ErYue",
title: "二月",
start: "02-01",
end: "02",
month: 2,
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false,
// componentName: "ErYueJump"
},
{
field: "SanYue",
title: "三月",
start: "03-01",
end: "03-31",
month: 3,
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false,
// componentName: "SanYueJump"
},
{
field: "DiYiJiDu",
title: "第一季度",
start: "01-01",
end: "03-31",
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "SiYue",
title: "四月",
start: "04-01",
end: "04-30",
month: 4,
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false,
// componentName: "SiYueJump"
},
{
field: "WuYue",
title: "五月",
start: "05-01",
end: "05-31",
month: 5,
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false,
// componentName: "WuYueJump"
},
{
field: "LiuYue",
title: "六月",
start: "06-01",
end: "06-30",
month: 6,
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false,
// componentName: "LiuYueJump"
},
{
field: "DiErJiDu",
title: "第二季度",
start: "04-01",
end: "06-30",
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "ShangBanNianBao",
title: "上半年报",
start: "01-01",
end: "06-30",
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "QiYue",
title: "七月",
start: "07-01",
end: "07-31",
month: 7,
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false,
// componentName: "QiYueJump"
},
{
field: "BaYue",
title: "八月",
start: "08-01",
end: "08-31",
month: 8,
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false,
// componentName: "BaYueJump"
},
{
field: "JiuYue",
title: "九月",
start: "09-01",
end: "09-30",
month: 9,
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false,
// componentName: "JiuYueJump"
},
{
field: "DiSanJiDu",
title: "第三季度",
start: "06-01",
end: "09-30",
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "ShiYue",
title: "十月",
start: "10-01",
end: "10-31",
month: 10,
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false,
// componentName: "ShiYueJump"
},
{
field: "ShiYiYue",
title: "十一月",
start: "11-01",
end: "11-30",
month: 11,
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false,
// componentName: "ShiYiYueJump"
},
{
field: "ShiErYue",
title: "十二月",
start: "12-01",
end: "12-31",
month: 12,
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false,
// componentName: "ShiErYueJump"
},
{
field: "DiSiJiDu",
title: "第四季度",
start: "10-01",
end: "12-31",
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "XiaBanNianBao",
title: "下半年报",
start: "10-01",
end: "12-31",
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "ZongJi",
title: "总计",
start: "01-01",
end: "12-31",
width: 80,
titleAlign: "left",
columnAlign: "right",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
],*/
columns:[ columns:[
// { // {
// title:"订单完成情况一览表", // title:"订单完成情况一览表",
...@@ -922,7 +375,7 @@ ...@@ -922,7 +375,7 @@
key:"a6", key:"a6",
}, },
{ {
field: "StudentName", field: "EmployeeName",
title: "业务员", title: "业务员",
width: 80, width: 80,
key:"a6", key:"a6",
...@@ -1103,16 +556,10 @@ ...@@ -1103,16 +556,10 @@
}, },
{ {
field: "", field: "",
title: "一览操作", title: "操作",
width: 100, width: 100,
key:"f4", key:"f4",
renderBodyCell: ({ row, column, rowIndex }, h) => { componentName:'ShiErYueJump'
let newDiv = h("div")
newDiv.innerHTML="协调费用"
return
newDiv
// <q-btn color="primary" label="Primary" />
}
}, },
// ] // ]
// } // }
...@@ -1125,45 +572,25 @@ ...@@ -1125,45 +572,25 @@
AccList:[],//账户类型列表 AccList:[],//账户类型列表
BranchAccountList:[],//交易方式列表 BranchAccountList:[],//交易方式列表
accountList:[],//账号id列表 accountList:[],//账号id列表
AdjustPriceMsg:{
ContractId:"",//合同id
AdjustPrice:"",//协调金额
}
} }
}, },
created() { created() {
// if (this.$route.query.year) {
// this.year = this.$route.query.year
// } else {
// this.year = new Date().getFullYear().toString()
// }
// let arr = ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"]
// for (let i = 0; i < 12; i++) {
// this.monthList.push({
// id: i + 1,
// name: arr[i],
// value: 0,
// })
// }
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
}, },
mounted() { mounted() {
this.getData(2); this.getData();
this.getCompanyList(); this.getCompanyList();
this.getEmployee(0); this.getEmployee(0);
this.AccountType_post_GetList(); this.AccountType_post_GetList();
this.Financial_post_GetBranchAccountList(); this.Financial_post_GetBranchAccountList();
}, },
methods: { methods: {
goUrl(path, startDate, endDate, BranchId, tab) {
this.$router.push({
name: path,
query: {
"startDate": startDate,
"endDate": endDate,
BranchId: BranchId,
blank: 'y',
tab: tab
}
})
},
GoUrlFan(path, month, year, BranchId, ids) { GoUrlFan(path, month, year, BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/financial/" + path, path: "/financial/" + path,
...@@ -1237,85 +664,13 @@ ...@@ -1237,85 +664,13 @@
exportExcel: function () { exportExcel: function () {
EduDownLoad("/finance/OutToExcelOrderStudentClassHoursList", this.msg, "订单完成统计.xls") EduDownLoad("/finance/OutToExcelOrderStudentClassHoursList", this.msg, "订单完成统计.xls")
}, },
// getData: function (type) {
// this.msg.sharelist = []
// this.loading = true;
// if (type == 1) {
// this.monthList.forEach(x => {
// let obj = {
// ID: 0,
// Money: x.value,
// Month: x.id,
// Year: this.year
// }
// this.msg.sharelist.push(obj)
// })
// }
// this.msg.Year = parseInt(this.year)
// getEasyReportList(this.msg)
// .then(res => {
// this.loading = false;
// if (res.Code == 1) {
// let data = res.Data
// let tichengList = [];
// this.DataList = [];
// data.list.forEach(item => {
// if (item.ZhaiYao != "销售提成" && item.ZhaiYao != "原始提成") {
// this.DataList.push(item)
// } else {
// tichengList.push(item);
// }
// })
// this.UpdateStaus = data.Status;
// this.UpdateStartTime = data.UpdateStartTime;
// this.UpdateEndTime = data.UpdateEndTime;
// this.loading = false
// this.$forceUpdate()
// return
// for (let i = 0; i <= 18; i++) {
// this.DataList.push({
// ID: i + 1,
// ZhaiYao: parseInt(Math.random(1000) * 1000 + 1),
// YiYue: parseInt(Math.random(1000) * 1000 + 1),
// ErYue: parseInt(Math.random(1000) * 1000 + 1),
// SanYue: parseInt(Math.random(1000) * 1000 + 1),
// DiYiJiDu: parseInt(Math.random(1000) * 1000 + 1),
// SiYue: parseInt(Math.random(1000) * 1000 + 1),
// WuYue: parseInt(Math.random(1000) * 1000 + 1),
// LiuYue: parseInt(Math.random(1000) * 1000 + 1),
// DiErJiDu: parseInt(Math.random(1000) * 1000 + 1),
// ShangBanNianBao: parseInt(Math.random(1000) * 1000 + 1),
// QiYue: parseInt(Math.random(1000) * 1000 + 1),
// BaYue: parseInt(Math.random(1000) * 1000 + 1),
// JiuYue: parseInt(Math.random(1000) * 1000 + 1),
// DiSanJiDu: parseInt(Math.random(1000) * 1000 + 1),
// ShiYue: parseInt(Math.random(1000) * 1000 + 1),
// ShiYiYue: parseInt(Math.random(1000) * 1000 + 1),
// ShiErYue: parseInt(Math.random(1000) * 1000 + 1),
// DiSiJiDu: parseInt(Math.random(1000) * 1000 + 1),
// XiaBanNianBao: parseInt(Math.random(1000) * 1000 + 1),
// ZongJi: parseInt(Math.random(1000) * 1000 + 1),
// })
// }
// } else {
// this.loading = false
// this.$message.error(res.Message)
// }
// })
// .catch(() => {
// this.loading = false;
// });
// },
//初始化学校
getData(){ getData(){
getOrderCompleteStatisticsPageList(this.msg).then((res)=>{ getOrderCompleteStatisticsPageList(this.msg).then((res)=>{
// let data=[] res.Data.PageData.map((item)=>{
// res.Data.PageData.map((item)=>{ item.Progress=item.Progress+"%"
// console.log(item) })
// // let obj={
// // OrderId:item.
// // }
// })
this.DataList=res.Data.PageData this.DataList=res.Data.PageData
}) })
}, },
...@@ -1453,6 +808,68 @@ ...@@ -1453,6 +808,68 @@
} }
}, },
bodyCellSpan({ row, column, rowIndex }) {
if (rowIndex === 1) {
// console.log(column)
if (column.field === "date") {
return {
rowspan: 1,
colspan: 2,
};
}
// does not need to be rendered
else if (column.field === "hobby") {
return {
rowspan: 0,
colspan: 0,
};
}
}
},
//对话框
show() {
this.$refs.dialog.show();
},
hide() {
this.$refs.dialog.hide();
},
onDialogHide() {
// QDialog发出“hide”事件时
// 需要发出
this.$emit("hide");
},
onCancelClick() {
// 我们只需要隐藏对话框
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();
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()
}
})
}
},
} }
} }
......
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