LK/income_payments_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] - 统计增加相应的查询条件；增加科室总体统计页面

Browse Source
This commit is contained in:
fengchenchen
2022-06-08 17:05:04 +08:00
parent 0cc0e754e4
commit 0e07bf1338
12 changed files with 771 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mixins/JeroListMixin.js
+27 -11
View File
@@ -11,6 +11,11 @@ import store from '@/store'
import {Modal} from 'ant-design-vue'
import {deleteByDepartId} from '@api/api'
const defaultSorter = {
column: 'createTime',
order: 'desc'
}
export const JeroListMixin = {
data() {
return {
@@ -138,7 +143,7 @@ export const JeroListMixin = {
getQueryField() {
//TODO 字段权限控制
var str = 'id,'
if (this.columns && this.columns.length){
if (this.columns && this.columns.length) {
this.columns.forEach(function (value) {
str += ',' + value.dataIndex
})
@@ -254,7 +259,18 @@ export const JeroListMixin = {
//TODO 筛选
if (Object.keys(sorter).length > 0) {
this.isorter.column = sorter.field
this.isorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
if (sorter.order) {
// 如果当前有列选中筛选条件
this.isorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
} else {
// 没有筛选值则 isorter 重置为初始值
this.isorter.column = defaultSorter.column
this.isorter.order = defaultSorter.order
}
} else {
this.isorter.column = defaultSorter.column
this.isorter.order = defaultSorter.order
}
this.ipagination = pagination
this.loadData()
@@ -362,8 +378,8 @@ export const JeroListMixin = {
* @Date 2021-12-29
* @author fac
* */
releaseMeeing(){
if(this.selectedRowKeys.length === 0){
releaseMeeing() {
if (this.selectedRowKeys.length === 0) {
this.$message.warn('请至少选中一个会议')
return
}
@@ -371,24 +387,24 @@ export const JeroListMixin = {
let flag = this.selectionRows.some(item => {
return item.isRelease === 1
})
if(flag){
if (flag) {
this.$message.warn('请选择未发布的会议')
return
}
const that = this
if(this.url.releaseMeeingUrl){
if (this.url.releaseMeeingUrl) {
const param = {
meetingIds:this.selectedRowKeys
meetingIds: this.selectedRowKeys
}
this.$confirm({
title: '确认发布',
content: '确定要发布选中的会议吗?',
onOk: function () {
postAction(that.url.releaseMeeingUrl,param).then(res => {
if(res.success){
postAction(that.url.releaseMeeingUrl, param).then(res => {
if (res.success) {
that.$message.success('发布成功')
that.loadData()
}else {
} else {
that.$message.warn(res.message)
}
})
@@ -396,7 +412,7 @@ export const JeroListMixin = {
})
}else {
} else {
this.$message.warn('请设置url.releaseMeeingUrl')
}
},
src/utils/formatMoney.js
+14
View File
@@ -47,3 +47,17 @@ export function formatMoney(money) {
}
return ___(__(_(result) + point))
}
/* 将数字 转换成 3个数字一组，并且中间用,分隔得方式 */
export function handleCostNumber(value) {
if(!value){
return 0.00
}
//toFixed()方法可以把Number四舍五入为指定位数的数字
let str=parseFloat(value).toFixed(2)
//"?="表示查询的要满足的条件，
return str&&str.toString().replace(/(\d)(?=(\d{3})+\.)/g,function ($0,$1) {
return $1+','
})
}
src/views/projectManagement/WorkingGroupProjectManagement.vue
+14 -9
View File
@@ -6,27 +6,32 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-col :xxl="5" :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="工作组项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入工作组项目" v-model="queryParam.workingGroupProject" :maxLength='50'></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-col :xxl="5" :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="负责人A" :labelCol="labelCol" :wrapperCol="wrapperCol">
<select-principal placeholder="请选择负责人" v-model="queryParam.principalIdA"></select-principal>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-col :xxl="5" :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span class="table-page-search-submitButtons">
<a-button type="primary" icon="search" @click="searchQuery"
v-has="'workingGroupProject:search'">查询</a-button>
<a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
</span>
<a-col :xxl="5" :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="企业联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入企业联系人" v-model="queryParam.companyContactName" :maxLength='50'></a-input>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<span class="table-page-search-submitButtons">
<a-button type="primary" icon="search" @click="searchQuery"
v-has="'workingGroupProject:search'">查询</a-button>
<a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
src/views/statisticalReport/WholeInstituteStatisticsList.vue
+80 -26
View File
@@ -52,24 +52,9 @@
<j-dict-select-tag v-model="queryParam.chargeUse" placeholder="请选择来款用途" dictCode="payment_charge_use"/>
</a-form-item>
</a-col>
<a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="应收款项" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
placeholder="请输入应收款项"
v-model="queryParam.allMoney"
class="query-group-cust"
@change="checkMoney('start')"></a-input>
<span class="query-group-split-cust"></span>
<a-input
placeholder="请输入应收款项"
v-model="queryParam.allMoneyTwo"
class="query-group-cust"
@change="checkMoney('end')"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
<j-year-date style="width:100%" placeholder="请选择项目年份" v-model="queryParam.year"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -86,6 +71,31 @@
dictCode="pay_statistics_status"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="开票年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择开票年份" v-model="queryParam.billYear"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="企业联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入企业联系人" v-model="queryParam.companyContactName" :maxLength='50'></a-input>
</a-form-item>
</a-col>
<a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="应收款项" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
placeholder="请输入应收款项"
v-model="queryParam.allMoney"
class="query-group-cust"
@change="checkMoney('start')"></a-input>
<span class="query-group-split-cust"></span>
<a-input
placeholder="请输入应收款项"
v-model="queryParam.allMoneyTwo"
class="query-group-cust"
@change="checkMoney('end')"></a-input>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<span class="table-page-search-submitButtons">
<a-button type="primary" icon="search" @click="searchQuery"
@@ -115,7 +125,7 @@
bordered
rowKey="projectId"
:columns="columns"
:scroll="{x: 1300}"
:scroll="{x: 1500}"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
@@ -158,7 +168,7 @@
ref="footTable"
:rowKey="record=>record.id"
:columns="columnsFooter"
:scroll="{x: 1300}"
:scroll="{x: 1500}"
:dataSource="footerDataSource"
:showHeader="false"
:pagination="false"
@@ -271,16 +281,36 @@ export default {
}, {
title: '应收金额',
align: 'center',
width: 200,
width: 150,
dataIndex: 'allMoney',
sorter: true,
scopedSlots: { customRender: 'allMoney' }
}, {
},
{
title: '实收金额',
align: 'center',
width: 200,
width: 150,
sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '来款用途',
align: 'center',
dataIndex: 'chargeUse_text',
@@ -326,16 +356,36 @@ export default {
}, {
title: '应收金额',
align: 'center',
width: 200,
width: 150,
sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
},
{
title: '实收金额',
align: 'center',
width: 200,
width: 150,
sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '来款用途',
align: 'center',
dataIndex: 'chargeUse_text',
@@ -608,4 +658,8 @@ export default {
border-left: none;
}
}
.table-page-search-submitButtons{
margin-left: 0;
}
</style>
src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue
+319
View File
@@ -0,0 +1,319 @@
<!-- 科室总体统计 -->
<template>
<div>
<page-header-title :img-for-icon="IconImg"></page-header-title>
<a-card :bordered="false">
<!-- 查询区域-start -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择项目年份" v-model="queryParam.year"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="开票年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择开票年份" v-model="queryParam.billYear"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span class="table-page-search-submitButtons">
<a-button type="primary" icon="search" @click="searchQuery"
v-has="'departmentAllStatistics:search'">查询</a-button>
<a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- /查询区域-end-->
<!-- 操作按钮区域-->
<div class="table-operator">
<a-button type="primary" icon="export" @click="handleExportXls('科室总体统计')"
v-has="'departmentAllStatistics:export'">导出
</a-button>
</div>
<!-- 操作按钮区域-end-->
<!-- table表格区域-->
<div>
<a-table
size="middle"
ref="table"
bordered
rowKey="projectId"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:scroll="{x: 1100}"
@change="handleTableChange"
:class="dataSource.length === 0 ? 'show-scroll' : ''"
class="j-table-force-nowrap main-table">
<template slot="text" slot-scope="text">
<j-ellipsis :value="text" :length="18"></j-ellipsis>
</template>
<template slot="allMoney" slot-scope="text">
<a-tooltip>
<template slot="title">{{ formatMoney(text) }}</template>
<div class="table-text">{{ formatMoney(text) }}</div>
</a-tooltip>
</template>
<template slot="footer" v-if="dataSource.length > 0">
<a-table
size="middle"
ref="footTable"
rowKey="id"
:columns="columnsFooter"
:dataSource="footerDataSource"
:showHeader="false"
:pagination="false"
:scroll="{x: 1100}"
class="j-table-force-nowrap footer-table">
<template slot="allMoney" slot-scope="text">
<a-tooltip>
<template slot="title">{{ formatMoney(text) }}</template>
<div class="table-text">{{ formatMoney(text) }}</div>
</a-tooltip>
</template>
<template slot="text" slot-scope="text">
<j-ellipsis :value="text" :length="18"></j-ellipsis>
</template>
</a-table>
</template>
</a-table>
</div>
</a-card>
</div>
</template>
<script>
import IconImg from '@/assets/imgs/icon/icon_statistical_report.png'
import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle'
import JYearDate from '../../../components/jero/JYearDate'
import { JeroListMixin } from '../../../mixins/JeroListMixin'
import { getAction } from '../../../api/manage'
import {formatMoney} from '@/utils/formatMoney'
const defaultTableColumns = [
{
title: '序号',
dataIndex: '',
key: 'rowIndex',
width: 100,
align: 'center',
customRender: function (t, r, index) {
return parseInt(index) + 1
}
}, {
title: '部门',
align: 'center',
width: 300,
dataIndex: 'principalName',
scopedSlots: {customRender: 'text'}
},
{
title: '应收总金额',
align: 'center',
width: 160,
dataIndex: 'allMoney',
sorter: true,
scopedSlots: {customRender: 'allMoney'}
}, {
title: '实收总金额',
align: 'center',
width: 160,
dataIndex: 'comeAllMoney',
sorter: true,
scopedSlots: {customRender: 'allMoney'}
},
{
title: '到账率',
align: 'center',
width: 160,
dataIndex: 'finishRate',
scopedSlots: {customRender: 'text'}
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: {customRender: 'allMoney'}
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: {customRender: 'allMoney'}
}
]
export default {
name: 'DepartmentAllStatistics',
components: {PageHeaderTitle, JYearDate},
mixins: [JeroListMixin],
data() {
return {
IconImg,
labelCol: {
xs: {span: 24},
sm: {span: 5}
},
wrapperCol: {
xs: {span: 24},
sm: {span: 10}
},
url: {
list: '/statistics/allProjectStatistics/listProject',
exportXlsUrl: '/statistics/allProjectStatistics/statistics/excelProject'
},
columns: defaultTableColumns,
// 总计表头，与主表表头一致
columnsFooter: defaultTableColumns,
// 总计数据
footerDataSource: [],
// 给定当年作为来款年份默认查询条件
queryParam: {
year: new Date().getFullYear().toString()
},
lastQueryParam: {
year: new Date().getFullYear().toString()
},
}
},
mounted() {
this.setScroll()
},
methods: {
formatMoney,
// 同步表与footer滚动，保留底部滚动条
setScroll() {
if (this.dataSource.length === 0) {
return
}
let dom = this.$refs.footTable.$el.querySelectorAll('.ant-table-body')[0]
console.log(this.$refs.footTable.$el.querySelectorAll('.ant-table-body'))
dom.addEventListener(
'scroll',
() => {
this.$refs.table.$el.querySelectorAll(
'.ant-table-body'
)[0].scrollLeft = dom.scrollLeft
},
true
)
},
loadData(arg) {
if (!this.url.list) {
this.$message.error('请设置url.list属性!')
return
}
//加载数据 若传入参数1则加载第一页的内容
if (arg === 1) {
this.ipagination.current = 1
}
let params = this.getQueryParams()//查询条件
this.loading = true
getAction(this.url.list, params).then((res) => {
if (res.success) {
this.dataSource = res.result.pageList.records
// this.dataSource = res.result.pageList.records
let obj = {
id: '1',
title: '总计',
allMoney: res.result.sumOfMoney || '0.00' + '',
comeAllMoney: res.result.sumOfReallyMoney || '0.00' + ''
}
this.footerDataSource = [obj]
if (res.result.pageList.total) {
this.ipagination.total = res.result.pageList.total
//清空列表选中
this.onClearSelected()
} else {
this.ipagination.total = 0
}
}
if (this.dataSource.length > 0) {
this.$nextTick(() => {
this.setScroll()
})
}
if (res.code === 510) {
this.$message.warning(res.message)
}
this.loading = false
}).finally(() => {
this.loading = false
})
},
searchReset() {
this.lastQueryParam = {
year: new Date().getFullYear().toString()
}
this.queryParam = {
year: new Date().getFullYear().toString()
}
this.loadData(1)
},
}
}
</script>
<style scoped lang="less">
@import '~@assets/less/common.less';
// 隐藏主列表的横向滚动条
.main-table {
/deep/ .ant-table-body {
overflow-x: hidden !important;
}
/deep/ .ant-table-footer {
padding: 0 0;
}
/deep/ .ant-table.ant-table-bordered .ant-table-footer {
border-left: none;
margin-top: -2px;
}
}
.show-scroll {
/deep/ .ant-table-body {
overflow-x: auto !important;
}
}
// 去除底部表格边框
.footer-table {
/deep/ .ant-table-tbody > tr > td {
border: none;
}
/deep/ .ant-table-fixed-right table {
border-left: none !important;
background: none;
}
/deep/ .ant-table-body {
overflow-x: auto !important;
}
/deep/ .ant-table-bordered .ant-table-header > table {
border-left: none;
}
}
</style>
src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue
+44 -2
View File
@@ -19,7 +19,7 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
<j-year-date style="width:100%" placeholder="请选择项目年份" v-model="queryParam.year"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -29,6 +29,11 @@
dictCode="pay_statistics_status"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="开票年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择开票年份" v-model="queryParam.billYear"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="应收款项" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
@@ -191,15 +196,34 @@ export default {
title: '应收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'text' }
}, {
title: '实收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'text' }
}, {
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '来款用途',
align: 'center',
width: 160,
@@ -236,14 +260,32 @@ export default {
title: '应收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'text' }
}, {
title: '实收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'text' }
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '来款用途',
align: 'center',
src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue
+45 -4
View File
@@ -14,7 +14,7 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
<j-year-date style="width:100%" placeholder="请选择项目年份" v-model="queryParam.year"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="10" :lg="11" :md="12" :sm="24">
@@ -45,6 +45,11 @@
</a-tree-select>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="开票年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择开票年份" v-model="queryParam.billYear"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<span class="table-page-search-submitButtons">
<a-button type="primary" icon="search" @click="searchQuery" v-has="'individualPaymentStatistics:search'">查询</a-button>
@@ -182,19 +187,37 @@ export default {
align: 'center',
width: 140,
dataIndex: 'allMoney',
sorter: true,
scopedSlots: {customRender: 'allMoney'}
}, {
title: '实收金额',
align: 'center',
width: 140,
dataIndex: 'comeAllMoney',
sorter: true,
scopedSlots: {customRender: 'allMoney'}
}, {
title: '个人完成率',
align: 'center',
dataIndex: 'finishRate',
width: 140
}
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
},
],
columnsFooter: [
{
@@ -209,23 +232,41 @@ export default {
width: 300,
dataIndex: 'principalName',
scopedSlots: { customRender: 'text' }
}, {
}, {
title: '应收金额',
align: 'center',
width: 140,
dataIndex: 'allMoney',
sorter: true,
scopedSlots: {customRender: 'allMoney'}
}, {
title: '实收金额',
align: 'center',
width: 140,
dataIndex: 'comeAllMoney',
sorter: true,
scopedSlots: {customRender: 'allMoney'}
}, {
title: '个人完成率',
align: 'center',
dataIndex: 'chargeUse_dictText',
dataIndex: 'finishRate',
width: 140
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
}
],
footerDataSource: [],
src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
+44 -2
View File
@@ -24,7 +24,7 @@
</a-col>
<a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
<a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
<j-year-date style="width:100%" placeholder="请选择项目年份" v-model="queryParam.year"></j-year-date>
</a-form-item>
</a-col>
<a-col :xxl="6" :xl="12" :lg="12" :md="12" :sm="24">
@@ -47,6 +47,11 @@
<select-principal placeholder="请选择项目负责人" v-model="queryParam.principalNameId"></select-principal>
</a-form-item>
</a-col>
<a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
<a-form-item label="开票年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择开票年份" v-model="queryParam.billYear"></j-year-date>
</a-form-item>
</a-col>
<!-- <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">-->
<!-- <a-form-item label="所属科室" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-tree-select-->
@@ -227,14 +232,33 @@ export default {
align: 'center',
width: 160,
dataIndex: 'allMoney',
sorter: true,
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收金额',
align: 'center',
width: 160,
dataIndex: 'comeAllMoney',
sorter: true,
scopedSlots: { customRender: 'allMoney' }
}, {
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '来款用途',
align: 'center',
width: 160,
@@ -278,12 +302,30 @@ export default {
align: 'center',
width: 160,
dataIndex: 'allMoney',
sorter: true,
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收金额',
align: 'center',
width: 160,
dataIndex: 'comeAllMoney',
sorter: true,
scopedSlots: { customRender: 'allMoney' }
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '来款用途',
src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue
+44 -2
View File
@@ -19,7 +19,7 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
<j-year-date style="width:100%" placeholder="请选择项目年份" v-model="queryParam.year"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -29,6 +29,11 @@
dictCode="pay_statistics_status"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="开票年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择开票年份" v-model="queryParam.billYear"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="应收款项" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
@@ -200,15 +205,34 @@ export default {
title: '应收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '来款用途',
align: 'center',
width: 160,
@@ -245,14 +269,32 @@ export default {
title: '应收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '来款用途',
align: 'center',
src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue
+48 -5
View File
@@ -7,17 +7,23 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row>
<a-col :xxl="4" :xl="10" :lg="12" :md="12" :sm="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="来款企业" :labelCol="labelCol" :wrapperCol="wrapperCol" style="margin-bottom: -1px">
<company-select :can-add="false" placeholder="请选择来款企业"
v-model="queryParam.chargeCompany"></company-select>
</a-form-item>
</a-col>
<a-col :xxl="4" :xl="10" :lg="12" :md="12" :sm="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
<j-year-date style="width:100%" placeholder="请选择项目年份" v-model="queryParam.year"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="开票年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择开票年份" v-model="queryParam.billYear"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="应收款项" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
@@ -181,12 +187,14 @@ export default {
title: '应收总金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收总金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
@@ -195,7 +203,24 @@ export default {
width: 160,
dataIndex: 'finishRate',
scopedSlots: { customRender: 'text' }
}, {
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '操作',
dataIndex: 'action',
align: 'center',
@@ -220,12 +245,14 @@ export default {
title: '应收总金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收总金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
@@ -234,7 +261,23 @@ export default {
width: 160,
dataIndex: 'finishRate',
scopedSlots: { customRender: 'text' }
}, {
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
},{
title: '操作',
dataIndex: 'action',
align: 'center',
src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
+47 -4
View File
@@ -25,16 +25,22 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
<j-year-date style="width:100%" placeholder="请选择项目年份" v-model="queryParam.year"></j-year-date>
</a-form-item>
</a-col>
<a-col :xxl="5" :xl="8" :lg="8" :md="8" :sm="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="付款状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag v-model="queryParam.inAccountStatue"
placeholder="请选择付款状态"
dictCode="pay_statistics_status"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="开票年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择开票年份" v-model="queryParam.billYear"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="应收款项" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
@@ -216,15 +222,34 @@ export default {
title: '应收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '来款用途',
align: 'center',
width: 160,
@@ -269,15 +294,33 @@ export default {
title: '应收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
},, {
title: '来款用途',
align: 'center',
width: 160,
src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue
+45 -3
View File
@@ -14,7 +14,12 @@
</a-col>
<a-col :xxl="4" :xl="10" :lg="12" :md="12" :sm="24">
<a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
<j-year-date style="width:100%" placeholder="请选择项目年份" v-model="queryParam.year"></j-year-date>
</a-form-item>
</a-col>
<a-col :xxl="4" :xl="10" :lg="12" :md="12" :sm="24">
<a-form-item label="开票年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择开票年份" v-model="queryParam.billYear"></j-year-date>
</a-form-item>
</a-col>
<a-col :xl="10" :lg="11" :md="12" :sm="24">
@@ -189,12 +194,14 @@ export default {
title: '应收总金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收总金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
@@ -203,7 +210,24 @@ export default {
width: 160,
dataIndex: 'moneyRate',
scopedSlots: { customRender: 'text' }
}, {
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '操作',
dataIndex: 'action',
align: 'center',
@@ -225,16 +249,18 @@ export default {
align: 'center',
dataIndex: 'workGroup',
scopedSlots: { customRender: 'text' }
}, {
}, {
title: '应收总金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收总金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
@@ -243,6 +269,22 @@ export default {
width: 160,
dataIndex: 'moneyRate',
scopedSlots: { customRender: 'text' }
},
{
title: '已开票金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'billMoney',
scopedSlots: { customRender: 'allMoney' }
},
{
title: '确认到账金额',
align: 'center',
width: 150,
sorter: true,
dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '操作',
dataIndex: 'action',