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:
zhaoxiao
2021-12-13 10:39:50 +08:00
parent 08d8372c41
commit d5ed6d97dd
10 changed files with 200 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/layouts/TabLayout.vue
+1 -1
View File
@@ -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
src/components/page/GlobalHeader.vue
+1 -1
View File
@@ -17,7 +17,7 @@
:type="collapsed ? 'menu-unfold' : 'menu-fold'"
@click="toggle"/>
<span v-if="device === 'desktop'">欢迎进入标准所协同工作平台</span>
<span v-if="device === 'desktop'">欢迎进入汽车标准化工作平台</span>
<span v-else>Jero-Boot</span>
<user-menu :theme="theme"/>
src/views/statisticalReport/WholeInstituteStatisticsList.vue
+74 -13
View File
@@ -10,7 +10,8 @@
<a-row>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="来款单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入来款单位" v-model="queryParam.chargeCompanyTemporaryName" :maxLength='50'></a-input>
<a-input placeholder="请输入来款单位" v-model="queryParam.chargeCompanyTemporaryName"
:maxLength='50'></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -18,11 +19,6 @@
<a-input placeholder="请输入来款项目" v-model="queryParam.projectName" :maxLength='50'></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">
<select-principal placeholder="请选择项目负责人" v-model="queryParam.principalNameId"></select-principal>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="所属科室" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-tree-select
@@ -31,10 +27,25 @@
:treeData="treeDepartData"
:replaceFields="replaceFields"
v-model="queryParam.departCode"
placeholder="请选择科室">
placeholder="请选择科室"
@change="departChange">
</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">
<a-select v-model="queryParam.principalNameId"
show-search
allowClear
placeholder="请选择项目负责人"
option-filter-prop="children"
:filter-option="filterOption">
<a-select-option v-for="item in userList" :key="item.id" :value="item.id">
{{ item.realname }}
</a-select-option>
</a-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-dict-select-tag v-model="queryParam.chargeUse" placeholder="请选择来款用途" dictCode="payment_charge_use"/>
@@ -101,7 +112,7 @@
ref="table"
size="middle"
bordered
rowKey="id"
rowKey="projectId"
:columns="columns"
:scroll="{x: 1300}"
:dataSource="dataSource"
@@ -121,12 +132,17 @@
<j-ellipsis :value="text" :length="18"></j-ellipsis>
</template>
<!-- 是否打包-->
<template slot="pack" slot-scope="text, record">
<status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
</template>
<template slot="footer" v-if="dataSource.length > 0">
<a-table
size="middle"
ref="footTable"
rowKey="id"
:rowKey="record=>record.id"
:columns="columnsFooter"
:scroll="{x: 1300}"
:dataSource="footerDataSource"
@@ -158,16 +174,16 @@
import IconImg from '@/assets/imgs/icon/icon_statistical_report.png'
import PageHeaderTitle from '../../components/layouts/PageHeaderTitle'
import { JeroListMixin } from '../../mixins/JeroListMixin'
import { getAllDepartTreeList } from '../../api/incomePaymentsApi'
import SelectPrincipal from '../../components/company/SelectPrincipal'
import { getAllDepartTreeList, queryUserByDepartId } from '../../api/incomePaymentsApi'
import JYearDate from '../../components/jero/JYearDate'
import { getAction } from '../../api/manage'
import ProjectDetailModal from '../../components/ProjectDetailModal'
import { downloadFile } from '../../api/manage'
import StatusSlot from '../../components/tools/StatusSlot'
export default {
name: 'WholeInstituteStatisticsList',
components: { PageHeaderTitle, SelectPrincipal, JYearDate, ProjectDetailModal },
components: { PageHeaderTitle, JYearDate, ProjectDetailModal, StatusSlot },
mixins: [JeroListMixin],
data() {
return {
@@ -218,6 +234,12 @@ export default {
width: 300,
dataIndex: 'chargeCompanyTemporaryName',
scopedSlots: { customRender: 'text' }
}, {
title: '是否打包',
align: 'center',
width: 100,
dataIndex: 'pack',
scopedSlots: { customRender: 'pack' }
}, {
title: '应收金额',
align: 'center',
@@ -267,6 +289,12 @@ export default {
width: 300,
dataIndex: 'chargeCompanyTemporaryName',
scopedSlots: { customRender: 'text' }
}, {
title: '是否打包',
align: 'center',
width: 100,
dataIndex: 'pack',
scopedSlots: { customRender: 'status-pack' }
}, {
title: '应收金额',
align: 'center',
@@ -299,7 +327,9 @@ export default {
exportXlsUrl: '/statistics/allProjectStatistics/statistics/excel'
},
validateMoney: true,
exportSelectedKeys: []
exportSelectedKeys: [],
// 项目负责人数据
userList: []
}
},
created() {
@@ -345,6 +375,31 @@ export default {
}
})
},
/**
* 科室变化获取负责人数据
* @param value
*/
departChange(value) {
delete this.queryParam.principalNameId
delete this.lastQueryParam.principalNameId
this.getUsersByDepartId(value)
},
/**
* 通过部门code获取用户
* @param departCode
*/
getUsersByDepartId(departCode) {
let param = {
departCode: departCode
}
queryUserByDepartId(param).then(res => {
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
)
}
}
}
src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue
+30 -4
View File
@@ -87,9 +87,10 @@
<j-ellipsis :value="text" :length="18"></j-ellipsis>
</template>
<span slot="action" class="action-span-cell" slot-scope="text, record">
<a @click="goDetail(record.id)">详情</a>
</span>
<!-- 是否打包-->
<template slot="status-pack" slot-scope="text, record">
<status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
</template>
<template slot="footer" v-if="dataSource.length > 0">
@@ -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',
src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
+20 -2
View File
@@ -85,7 +85,7 @@
size="middle"
ref="table"
bordered
rowKey="id"
rowKey="projectId"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -105,6 +105,11 @@
<j-ellipsis :value="text" :length="18"></j-ellipsis>
</template>
<!-- 是否打包-->
<template slot="status-pack" slot-scope="text, record">
<status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
</template>
<template slot="footer" v-if="dataSource.length > 0">
<a-table
size="middle"
@@ -145,10 +150,11 @@ import { getAction } from '@api/manage'
import SelectPrincipal from '@comp/company/SelectPrincipal'
import { getAllDepartTreeList } from '../../../api/incomePaymentsApi'
import ProjectDetailModal from '../../../components/ProjectDetailModal'
import StatusSlot from '../../../components/tools/StatusSlot'
export default {
name: 'ProjectPaymentStatisticsList',
components: { PageHeaderTitle, JYearDate, SelectPrincipal, ProjectDetailModal },
components: { PageHeaderTitle, JYearDate, SelectPrincipal, ProjectDetailModal, StatusSlot },
mixins: [JeroListMixin],
data() {
return {
@@ -193,6 +199,12 @@ export default {
width: 300,
dataIndex: 'chargeCompanyTemporaryName',
scopedSlots: { customRender: 'text' }
},{
title: '是否打包',
align: 'center',
width: 100,
dataIndex: 'pack',
scopedSlots: { customRender: 'status-pack' }
}, {
title: '应收金额',
align: 'center',
@@ -238,6 +250,12 @@ export default {
width: 300,
dataIndex: 'chargeCompanyTemporaryName',
scopedSlots: { customRender: 'text' }
},{
title: '是否打包',
align: 'center',
width: 100,
dataIndex: 'pack',
scopedSlots: { customRender: 'status-pack' }
}, {
title: '应收金额',
align: 'center',
src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue
+32 -5
View File
@@ -67,7 +67,7 @@
size="middle"
ref="table"
bordered
rowKey="id"
rowKey="projectId"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -87,9 +87,10 @@
<j-ellipsis :value="text" :length="18"></j-ellipsis>
</template>
<span slot="action" class="action-span-cell" slot-scope="text, record">
<a @click="goDetail(record.id)">详情</a>
</span>
<!-- 是否打包-->
<template slot="pack" slot-scope="text, record">
<status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
</template>
<template slot="footer" v-if="dataSource.length > 0">
@@ -113,6 +114,7 @@
<template slot="text" slot-scope="text">
<j-ellipsis :value="text" :length="18"></j-ellipsis>
</template>
</a-table>
</template>
@@ -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',
src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue
+1 -1
View File
@@ -59,7 +59,7 @@
size="middle"
ref="table"
bordered
rowKey="id"
rowKey="chargeCompanyId"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
+38 -19
View File
@@ -9,14 +9,15 @@
<a-row>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="来款单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入来款单位" v-model="queryParam.chargeCompanyTemporaryName" :maxLength="50"></a-input>
<a-input placeholder="请输入来款单位" v-model="queryParam.chargeCompanyTemporaryName"
:maxLength="50"></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">
<a-input placeholder="请输入来款项目" v-model="queryParam.projectName"></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">-->
<!-- <a-input placeholder="请输入来款项目" v-model="queryParam.projectName"></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-dict-select-tag v-model="queryParam.chargeUse" placeholder="请选择来款用途" dictCode="payment_charge_use"/>
@@ -102,6 +103,11 @@
<a @click="goDetail(record.id)">详情</a>
</span>
<!-- 是否打包-->
<template slot="status-pack" slot-scope="text, record">
<status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
</template>
<template slot="footer" v-if="dataSource.length > 0">
<a-table
@@ -140,10 +146,11 @@ import { JeroListMixin } from '../../../mixins/JeroListMixin'
import SelectPrincipal from '../../../components/company/SelectPrincipal'
import JYearDate from '../../../components/jero/JYearDate'
import { getAction } from '../../../api/manage'
import StatusSlot from '../../../components/tools/StatusSlot'
export default {
name: 'WorkingGroupPaymentStatisticsDetail',
components: { PageHeaderTitle, SelectPrincipal, JYearDate },
components: { PageHeaderTitle, SelectPrincipal, JYearDate, StatusSlot },
mixins: [JeroListMixin],
data() {
return {
@@ -170,18 +177,24 @@ export default {
customRender: function (t, r, index) {
return parseInt(index) + 1
}
}, {
title: '项目负责人',
align: 'center',
width: 300,
dataIndex: 'principalName',
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',
width: 300,
dataIndex: 'principalName',
scopedSlots: { customRender: 'text' }
}, {
title: '应收金额',
align: 'center',
@@ -217,18 +230,24 @@ export default {
dataIndex: 'title',
width: 60,
align: 'center'
}, {
title: '项目负责人',
align: 'center',
width: 300,
dataIndex: 'principalName',
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',
width: 300,
dataIndex: 'principalName',
scopedSlots: { customRender: 'text' }
}, {
title: '应收金额',
align: 'center',
src/views/user/Login.vue
+1 -1
View File
@@ -129,7 +129,7 @@ export default {
}
},
created () {
document.title = '标准所协同工作平台'
document.title = '汽车标准化工作平台'
this.currdatetime = new Date().getTime()
Vue.ls.remove(ACCESS_TOKEN)
this.getRouterData()
src/views/user/alteration/Alteration.vue
+2 -2
View File
@@ -3,7 +3,7 @@
<div class='alteration-head logo'>
<router-link :to="{name:'dashboard'}">
<img src="~@/assets/logo.png" alt="logo">
<h1>标准所来款管理系统</h1>
<h1>汽车标准化工作平台</h1>
</router-link>
</div>
<div class='alteration-center'>
@@ -173,7 +173,7 @@ export default {
}
},
created() {
document.title = '标准所协同工作平台'
document.title = '汽车标准化工作平台'
},
methods: {
submit() {