diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index e5f15ad..265c60a 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -136,6 +136,14 @@ const revokeConfirm = (params) => postAction(`/payConfirmPaymentRecord/backIncom // 判断当前节点 是否可以发邮件 const judgeEmailStatus = (param) => getAction('/sys/message/sysMessageTemplate/queryByCode', param) +// 2024-01-08 起草组相关功能接口 +// 起草组管理-复制 +const copyDraftingGroup = (param) => postAction('/drafting/payDraftingGroup/copy', param) +// 起草组管理-工作组下拉 +const getWorkingGroupList = (param) => getAction('/drafting/payDraftingGroup/queryAllWorkingGroupsIdAndName', param) +// 通过id获取起草组详情 +const getDraftingGroupById = (params) => getAction('/drafting/payDraftingGroup/queryById', params) + export { getWorkingGroupById, getChargeNotice, @@ -206,5 +214,9 @@ export { revokeConfirm, - judgeEmailStatus + judgeEmailStatus, + + copyDraftingGroup, + getWorkingGroupList, + getDraftingGroupById, } diff --git a/src/views/draftingGroup/DraftingGroupManagement.vue b/src/views/draftingGroup/DraftingGroupManagement.vue index dcb7bf2..34afffa 100644 --- a/src/views/draftingGroup/DraftingGroupManagement.vue +++ b/src/views/draftingGroup/DraftingGroupManagement.vue @@ -8,12 +8,22 @@ - + - + + + {{ item.workingGroupProject }} + + + @@ -108,16 +118,15 @@ import { JeroListMixin } from '@/mixins/JeroListMixin' import JYearDate from '@comp/jero/JYearDate' import SelectPrincipal from '@comp/company/SelectPrincipal' -import ProgressBar from '@comp/ProgressBar' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' import IconWorkingGruop from '@/assets/imgs/icon/icon_working_group.png' -import { copyWorkingGroup } from '../../api/incomePaymentsApi' +import {copyDraftingGroup, getWorkingGroupList} from '../../api/incomePaymentsApi' import { getAction } from '../../api/manage' -import DraftingGroupModule from './modules/DraftingGroupModule'; +import DraftingGroupModule from './modules/DraftingGroupModule' export default { name: 'DraftingGroupManagement', - components: { JYearDate, DraftingGroupModule, SelectPrincipal, ProgressBar, PageHeaderTitle }, + components: { JYearDate, DraftingGroupModule, SelectPrincipal, PageHeaderTitle }, mixins: [JeroListMixin], data() { return { @@ -131,9 +140,9 @@ export default { sm: { span: 10 } }, url: { - list: '/project/payWorkingGroup/list', - delete: '/project/payWorkingGroup/delete', - deleteBatch: '/project/payWorkingGroup/deleteBatch' + list: '/drafting/payDraftingGroup/list', + delete: '/drafting/payDraftingGroup/delete', + deleteBatch: '/drafting/payDraftingGroup/deleteBatch' }, columns: [ { @@ -148,12 +157,12 @@ export default { }, { title: '起草组项目', align: 'center', - dataIndex: 'workingGroupProject', + dataIndex: 'draftingGroupProject', scopedSlots: { customRender: 'projectName' } }, { title: '关联工作组', align: 'center', - dataIndex: 'obj', + dataIndex: 'workingGroupName', width: 300 }, { title: '负责人A', @@ -175,10 +184,23 @@ export default { lastQueryParam: { year: new Date().getFullYear().toString() }, + // 关联工作组下拉 + workingGroupList: [], operateData: [] // 进行操作权限校验时使用的数据 } }, + created () { + this.loadWorkingGroupList() + }, methods: { + // 获取工作组下拉列表 + loadWorkingGroupList () { + getWorkingGroupList().then(res => { + if (res.success) { + this.workingGroupList = res.result || [] + } + }) + }, loadData(arg) { if (!this.url.list) { this.$message.error('请设置url.list属性!') @@ -271,7 +293,7 @@ export default { * @param id */ copyWorkGroup(id) { - copyWorkingGroup({ id: id }).then(res => { + copyDraftingGroup({ id: id }).then(res => { if (res.success) { this.$message.success(res.message) } else { @@ -289,8 +311,8 @@ export default { this.$router.push({ path: '/draftingGroup/DraftingGroupMemberUnitMaintenance', query: { - workingGroupProject: record.workingGroupProject, - workingGroupProjectId: record.id, + draftingGroupProject: record.draftingGroupProject, + draftingGroupProjectId: record.id, canOperate: record.checkoutOperation === 1 } }) @@ -325,6 +347,12 @@ export default { this.$refs.modalForm.edit(record) this.$refs.modalForm.title = '基本信息维护' this.$refs.modalForm.disableSubmit = false + }, + // 下拉框的搜索 + filterOption(input, option) { + return ( + option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + ) } } } diff --git a/src/views/draftingGroup/modules/DraftingGroupModule.vue b/src/views/draftingGroup/modules/DraftingGroupModule.vue index 2cc3a26..ae5a240 100644 --- a/src/views/draftingGroup/modules/DraftingGroupModule.vue +++ b/src/views/draftingGroup/modules/DraftingGroupModule.vue @@ -17,7 +17,7 @@ @@ -113,17 +113,16 @@