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 @@ + + + + + { + if (res.success) { + this.userList = res.result + } else { + this.userList = [] + } + }) + }, loadData(arg) { if (!this.url.list) { this.$message.error('请设置url.list属性!') @@ -468,6 +523,12 @@ export default { } console.log('导出参数', param) downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param) + }, + // 下拉框的搜索 + filterOption(input, option) { + return ( + option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + ) } } } diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue index b0920ea..0b7b2e3 100644 --- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue @@ -87,9 +87,10 @@ - - 详情 - + + + + @@ -128,10 +129,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: 'IndividualPaymentStatisticsDetail', - components: { PageHeaderTitle, JYearDate, ProjectDetailModal }, + components: { PageHeaderTitle, JYearDate, ProjectDetailModal, StatusSlot }, mixins: [JeroListMixin], data() { return { @@ -173,6 +175,18 @@ export default { width: 300, dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } + }, { + title: '来款企业', + align: 'center', + width: 300, + dataIndex: 'chargeCompanyTemporaryName', + scopedSlots: { customRender: 'text' } + }, { + title: '是否打包', + align: 'center', + width: 100, + dataIndex: 'pack', + scopedSlots: { customRender: 'status-pack' } }, { title: '应收金额', align: 'center', @@ -206,6 +220,18 @@ export default { width: 300, dataIndex: 'workGroup', scopedSlots: { customRender: 'text' } + }, { + title: '来款企业', + align: 'center', + width: 300, + dataIndex: 'chargeCompanyTemporaryName', + scopedSlots: { customRender: 'text' } + }, { + title: '是否打包', + align: 'center', + width: 100, + dataIndex: 'pack', + scopedSlots: { customRender: 'status-pack' } }, { title: '应收金额', align: 'center', diff --git a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue index 84ff276..85a7dde 100644 --- a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue +++ b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue @@ -85,7 +85,7 @@ size="middle" ref="table" bordered - rowKey="id" + rowKey="projectId" :columns="columns" :dataSource="dataSource" :pagination="ipagination" @@ -105,6 +105,11 @@ + + + + + - - 详情 - + + + + @@ -113,6 +114,7 @@ + @@ -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 @@ 详情 + + + + + - 标准所来款管理系统 + 汽车标准化工作平台 @@ -173,7 +173,7 @@ export default { } }, created() { - document.title = '标准所协同工作平台' + document.title = '汽车标准化工作平台' }, methods: { submit() {