diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index ff83b2c..12edf59 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -89,6 +89,9 @@ const getAllRevenueContract = (param) => getAction('/contract/payIncomeContract/ // 打印获取邮寄联系人信息接口,传票据邮寄列表id const getPrintPostContactByMailId = (param) => getAction('/mail/payMailBill/print', param) +// 全所统计--通过部门code查所有人员 +const getUserByDepartCode = (param) => getAction('/statistics/allProjectStatistics/listForUserByOrgCode', param) + export { getWorkingGroupById, getChargeNotice, @@ -133,5 +136,6 @@ export { aduitExpenditureContract, archiveExpenditureContract, getAllRevenueContract, - getPrintPostContactByMailId + getPrintPostContactByMailId, + getUserByDepartCode } diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue index bd20d33..81e752b 100644 --- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue +++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue @@ -59,10 +59,11 @@ - 资料维护 - 会议维护 - 新增成员 - 编辑 + 在研项目 + 其他分发资料 + 分标委会议 + 新增委员 + 基本信息维护 删除 @@ -146,7 +147,7 @@ export default { title: '操作', dataIndex: 'operation', align: 'center', - width: 400, + width: 300, scopedSlots: { customRender: 'operation' } } ], @@ -180,13 +181,13 @@ export default { title: '手机号', align: 'center', dataIndex: 'phone', - width: 200, + width: 220, scopedSlots: { customRender: 'textRow' } }, { title: '操作', dataIndex: 'action', align: 'center', - width: 199, + width: 79, scopedSlots: { customRender: 'action' } } ], @@ -268,6 +269,10 @@ export default { this.$refs.memberModalForm.title = '新增成员' this.$refs.memberModalForm.disableSubmit = false }, + /** + * 删除成员 + * @param id + */ handleDeleteMember(id) { console.log(id) if (!this.url.deleteMember) { @@ -313,6 +318,13 @@ export default { meetingType: '5' } }) + }, + /** + * 前往在研项目 + * @param record + */ + toUnderStudyProject(record) { + console.log('在研项目', record) } } } diff --git a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue index a1b76b8..9ce1bcd 100644 --- a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue +++ b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue @@ -1,17 +1,17 @@ - 文件维护 - 会议维护 + 其他分发资料 + 工作组会议 复制 编辑 + v-if="record.checkoutOperation === 1">基本信息维护 删除 @@ -160,7 +160,7 @@ export default { align: 'center', dataIndex: 'principalNameA' }, { - title: '进度', + title: '收款进度', align: 'center', dataIndex: 'obj', width: 250, @@ -170,7 +170,7 @@ export default { dataIndex: 'action', align: 'center', fixed: 'right', - width: 300, + width: 420, scopedSlots: { customRender: 'action' } } ], diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index 51e9883..1e1ae83 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -174,7 +174,7 @@ import IconImg from '@/assets/imgs/icon/icon_statistical_report.png' import PageHeaderTitle from '../../components/layouts/PageHeaderTitle' import { JeroListMixin } from '../../mixins/JeroListMixin' -import { getAllDepartTreeList, queryUserByDepartId } from '../../api/incomePaymentsApi' +import { getAllDepartTreeList, getUserByDepartCode } from '../../api/incomePaymentsApi' import JYearDate from '../../components/jero/JYearDate' import { getAction } from '../../api/manage' import ProjectDetailModal from '../../components/ProjectDetailModal' @@ -392,7 +392,7 @@ export default { let param = { departCode: departCode } - queryUserByDepartId(param).then(res => { + getUserByDepartCode(param).then(res => { if (res.success) { this.userList = res.result } else {