From d5ed6d97dd93407160d93c19e229a329afc9f646 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Mon, 13 Dec 2021 10:39:50 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E7=BB=9F=E8=AE=A1=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8C=85=E5=AD=97=E6=AE=B5=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layouts/TabLayout.vue | 2 +- src/components/page/GlobalHeader.vue | 2 +- .../WholeInstituteStatisticsList.vue | 87 ++++++++++++++++--- .../IndividualPaymentStatisticsDetail.vue | 34 +++++++- .../ProjectPaymentStatisticsList.vue | 22 ++++- .../EnterprisePaymentStatisticsDetail.vue | 37 ++++++-- .../EnterprisePaymentStatisticsList.vue | 2 +- .../WorkingGroupPaymentStatisticsDetail.vue | 57 ++++++++---- src/views/user/Login.vue | 2 +- src/views/user/alteration/Alteration.vue | 4 +- 10 files changed, 200 insertions(+), 49 deletions(-) diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue index e9c3b2e..838bd8a 100644 --- a/src/components/layouts/TabLayout.vue +++ b/src/components/layouts/TabLayout.vue @@ -182,7 +182,7 @@ // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题 changeTitle(title) { - let projectTitle = '标准所协同工作平台' + let projectTitle = '汽车标准化工作平台' // 首页特殊处理 if (this.$route.path === indexKey) { document.title = projectTitle diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue index af5b811..a0c6957 100644 --- a/src/components/page/GlobalHeader.vue +++ b/src/components/page/GlobalHeader.vue @@ -17,7 +17,7 @@ :type="collapsed ? 'menu-unfold' : 'menu-fold'" @click="toggle"/> - 欢迎进入标准所协同工作平台 + 欢迎进入汽车标准化工作平台 Jero-Boot diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index 9af6a5a..51e9883 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -10,7 +10,8 @@ - + @@ -18,11 +19,6 @@ - - - - - + placeholder="请选择科室" + @change="departChange"> + + + + + {{ item.realname }} + + + + @@ -101,7 +112,7 @@ ref="table" size="middle" bordered - rowKey="id" + rowKey="projectId" :columns="columns" :scroll="{x: 1300}" :dataSource="dataSource" @@ -121,12 +132,17 @@ + + + - - 详情 - + + + + + - - 详情 - + + @@ -129,10 +131,11 @@ import { JeroListMixin } from '../../../mixins/JeroListMixin' import JYearDate from '../../../components/jero/JYearDate' import { getAction } from '@api/manage' import ProjectDetailModal from '../../../components/ProjectDetailModal' +import StatusSlot from '../../../components/tools/StatusSlot' export default { name: 'EnterprisePaymentStatisticsDetail', - components: { PageHeaderTitle, JYearDate, ProjectDetailModal }, + components: { PageHeaderTitle, JYearDate, ProjectDetailModal, StatusSlot }, mixins: [JeroListMixin], data() { return { @@ -164,6 +167,18 @@ export default { width: 300, dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } + }, { + title: '来款企业', + align: 'center', + width: 300, + dataIndex: 'chargeCompany', + scopedSlots: { customRender: 'text' } + }, , { + title: '是否打包', + align: 'center', + width: 100, + dataIndex: 'pack', + scopedSlots: { customRender: 'pack' } }, { title: '应收金额', align: 'center', @@ -197,6 +212,18 @@ export default { width: 300, dataIndex: 'projectName', scopedSlots: { customRender: 'text' } + }, { + title: '来款企业', + align: 'center', + width: 300, + dataIndex: 'chargeCompany', + scopedSlots: { customRender: 'text' } + }, { + title: '是否打包', + align: 'center', + width: 100, + dataIndex: 'pack', + scopedSlots: { customRender: 'pack' } }, { title: '应收金额', align: 'center', diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue index 395aa20..411bb93 100644 --- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue +++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue @@ -59,7 +59,7 @@ size="middle" ref="table" bordered - rowKey="id" + rowKey="chargeCompanyId" :columns="columns" :dataSource="dataSource" :pagination="ipagination" diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue index b89d462..037ae4f 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue @@ -9,14 +9,15 @@ - + + + + + + - - - - - @@ -102,6 +103,11 @@ 详情 + + +