diff --git a/src/api/api.js b/src/api/api.js index 4bdc4f9..0be1d60 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -116,6 +116,11 @@ const getContactsByCompany = (params) => getAction('/company/payContactsManageme const getContactsByCompanyNoLimit = (params) => getAction('/company/payContactsManagement/queryByCompanyMeeting', params) // 通过联系人id获取联系人信息 const getContactsById = (param) => getAction('/company/payContactsManagement/queryByIdMeeting', param) +// 企业管理员重置密码 +const companyAdminResetPassword = (param) => postAction('/payManagerManagement/resetPassword', param) + +// 企业管理员启用禁用 +const companyAdminEnable= (param) => postAction('/payManagerManagement/frozenBatch', param) // 加密获取key 与 iv const getKeyIv = (param) => getAction('/sys/getEncryptedString',param) @@ -183,7 +188,9 @@ export { getFileInfo, getKeyIv, getContactsByCompanyNoLimit, - loginIdmPlatform + loginIdmPlatform, + companyAdminResetPassword, + companyAdminEnable } diff --git a/src/api/incomeMeetingApi.js b/src/api/incomeMeetingApi.js index 523539e..fe46d65 100644 --- a/src/api/incomeMeetingApi.js +++ b/src/api/incomeMeetingApi.js @@ -26,6 +26,10 @@ const addGenerateCodeList = (params) => postAction('/meeting/randomCode/add', pa // 国际研讨会--列表页编辑一条随机码数据 const editGenerateCodeList = (params) => postAction('/meeting/randomCode/edit', params) +// 标协会议-问题征集详情-查询标准号下拉框数据 +const getStandardNumberList = (params) => getAction('/meeting/standardsMeeting/getStandardNumberList', params) + + export { getUserInfo, getMeetInfoById, @@ -37,5 +41,6 @@ export { getGeneratedCodeList, generateCode, addGenerateCodeList, - editGenerateCodeList + editGenerateCodeList, + getStandardNumberList } diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index 2b85b4a..f60bb8a 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -108,6 +108,10 @@ {{ basicInfo.bankAccount }} + + + {{ basicInfo.linkBankNumber || '' }} + @@ -117,7 +121,7 @@

第三方垫付信息

- + @@ -289,7 +293,7 @@ import { queryCommonProjectById, getStanderMemberLastProofInfo, getCertificateLa import JEllipsis from '@comp/jero/JEllipsis' import PreviewFile from './jero/PreviewFile' import { ProjectTypeEnums } from '@/enums/commonEnums' -import pick from 'lodash.pick' +// import pick from 'lodash.pick' // import {getAction} from "@api/manage"; const columns = [ { diff --git a/src/views/businessManagement/CompanyAdmin.vue b/src/views/businessManagement/CompanyAdmin.vue new file mode 100644 index 0000000..d417382 --- /dev/null +++ b/src/views/businessManagement/CompanyAdmin.vue @@ -0,0 +1,212 @@ + + + + + \ No newline at end of file diff --git a/src/views/businessManagement/modules/BusinessManagementModule.vue b/src/views/businessManagement/modules/BusinessManagementModule.vue index 312b618..f108f5a 100644 --- a/src/views/businessManagement/modules/BusinessManagementModule.vue +++ b/src/views/businessManagement/modules/BusinessManagementModule.vue @@ -83,6 +83,16 @@ + + + + + + + @@ -178,7 +188,11 @@ export default { dutyCode: { rules: [{ required: true, validator: this.checkDutyCode }], validateTrigger: 'blur' - } + }, + linkBankNumber: { + rules: [{ required: true, message: '请输入联行号' }], + validateTrigger: 'blur' + }, }, url: { add: '/company/payCompanyManagement/add', @@ -201,7 +215,7 @@ export default { this.model = Object.assign({}, record) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'companyName', 'companyAddress', 'companyPhone', 'postalCode', 'bankAccountName', 'openingBank', 'bankAccount', 'dutyCode', 'remarks')) + this.form.setFieldsValue(pick(this.model, 'companyName', 'companyAddress', 'companyPhone', 'postalCode', 'bankAccountName', 'openingBank', 'bankAccount', 'dutyCode','linkBankNumber', 'remarks')) }) }, close() { diff --git a/src/views/businessManagement/modules/CompanyAdminModule.vue b/src/views/businessManagement/modules/CompanyAdminModule.vue new file mode 100644 index 0000000..f6a8ab5 --- /dev/null +++ b/src/views/businessManagement/modules/CompanyAdminModule.vue @@ -0,0 +1,230 @@ + + + + + diff --git a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue index 615c2d8..307c54d 100644 --- a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue +++ b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue @@ -9,6 +9,9 @@ @cancel="handleCancel" cancelText="关闭"> + + 说明：1.负责人A为该分标委的主负责人，负责人B为该分标委的辅助负责人。 + @@ -31,6 +34,22 @@ + + + + + + + + + + + + @@ -50,10 +69,13 @@ + + + \ No newline at end of file diff --git a/src/views/incomePayments/meetManage/modules/ProblemCollectionModal.vue b/src/views/incomePayments/meetManage/modules/ProblemCollectionModal.vue new file mode 100644 index 0000000..ea9fbfc --- /dev/null +++ b/src/views/incomePayments/meetManage/modules/ProblemCollectionModal.vue @@ -0,0 +1,58 @@ + + + + + + \ No newline at end of file diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue index d5aecff..aed9c8b 100644 --- a/src/views/projectManagement/CommitteeMeeting.vue +++ b/src/views/projectManagement/CommitteeMeeting.vue @@ -143,12 +143,15 @@ 编辑 删除 + + 问题征集 + @@ -163,6 +166,8 @@ import PublishRemindModal from '@views/projectManagement/modules/PublishRemindMo import UploadMeetFileModal from '@views/incomePayments/meetManage/modules/UploadMeetFileModal' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' import '@/assets/less/TableExpand.less' +// 问题征集 组件 +import ProblemCollectionModal from '../incomePayments/meetManage/modules/ProblemCollectionModal' export default { name: 'CommitteeMeeting', @@ -172,7 +177,8 @@ export default { JDictSelectTag, PublishRemindModal, UploadMeetFileModal, - PageHeaderTitle + PageHeaderTitle, + ProblemCollectionModal }, mixins: [JeroListMixin, RangeDateMixin], data() { @@ -497,6 +503,14 @@ export default { this.lastQueryParam = {...this.queryParam} this.loadData(1) }, + /* + * 问题征集按钮点击后的回调 + * */ + problemCollectionDetail(record) { + if(!Number(record.isAddQuestion) || !this.meetingType === '2') return + if(!(record.tbMeetingType === 1 || record.tbMeetingType === 2)) return + this.$refs.problemCollectionModal.show(record) + } } } diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue index 5cc1073..336996b 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue @@ -36,6 +36,24 @@ + + + + + + { + if (res.success) { + that.treeDepartData = [] + let treeList = res.result + for (let a = 0; a < treeList.length; a++) { + let temp = treeList[a] + temp.isLeaf = temp.leaf + that.treeDepartData.push(temp) + } + } + }) + }, searchReset() { this.lastQueryParam = { year: new Date().getFullYear().toString()