From 94767de37e10b352c9f114d2da0e7d7b1d03c9f4 Mon Sep 17 00:00:00 2001 From: danshihao Date: Tue, 9 Jul 2024 14:01:51 +0800 Subject: [PATCH] =?UTF-8?q?[fix=2086984]=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E9=A1=B9=E7=9B=AE=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?-=E6=B7=BB=E5=8A=A0=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E9=80=89=E6=8B=A9=E6=9C=AC=E7=BA=A7=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../incomePayments/meetManage/Attendance.vue | 6 ++++-- .../meetManage/SignUpInfoEdit.vue | 20 +++++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 5969b60..65e1928 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -1179,7 +1179,8 @@ export default { query: { meetingType: this.currentMeetingInfo.meetingType, meetingId: this.$route.query.id, - costBool: this.meetingCostBool + costBool: this.meetingCostBool, + safetyCenterId: this.currentMeetingInfo.safetyCenterId } }) }, @@ -1198,7 +1199,8 @@ export default { id: record.id, meetingId: this.$route.query.id, meetingType: this.currentMeetingInfo.meetingType, - costBool: this.meetingCostBool + costBool: this.meetingCostBool, + safetyCenterId: this.currentMeetingInfo.safetyCenterId } }) }, diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue index 6965fce..edd31d3 100644 --- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue +++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue @@ -12,6 +12,8 @@ @@ -25,8 +27,11 @@ placeholder="请选择参会人" v-decorator="['companyContactId',validatorRules.companyContactId]" :maxLength='50' + :can-add="!safetyCenterId" :disabled="model.checkResult === 1" :init-contacts="selectPerson" + :customListFn="safetyCenterId ? getContactsByCompanyBySafetyCenter : null" + :customListParams="safetyCenterId ? customListParams : {}" @change="changeContact" ref="selectMailContacts" @ok="addContactsOk"> @@ -170,7 +175,7 @@ import OtherMeetingForm from '@views/incomePayments/meetManage/OtherMeetingForm' import SeminarVipForm from '@views/incomePayments/meetManage/modules/SeminarVipForm' import SeminarPartnerForm from '@views/incomePayments/meetManage/modules/SeminarPartnerForm' import AddMeetingCompany from '@comp/company/AddMeetingCompany' -import {getContactsById} from '@api/api' +import {getContactsByCompanyBySafetyCenter, getContactsById} from '@api/api' import {getSingUpUserInfo, validateStandard, getMeetInfoById, getLinkTopics} from '@api/incomeMeetingApi' import {judgeCompanyIsPackaged, judgeInternalEnterprise} from '../../../api/incomePaymentsApi' import {httpAction} from '@api/manage' @@ -319,7 +324,17 @@ export default { // 可选会议名称的数组 linkTopicsOptionArr: [], // WASIC可选会议的数组-前端写死 - showTopicsArr: [...WasicTopicData] + showTopicsArr: [...WasicTopicData], + // 功能安全中心id + safetyCenterId: this.$route.query.safetyCenterId, + // 成员单位列表(功能安全中心单独的选择成员列表接口) + companyList: '/company/payCompanyManagement/listSafetyCenter', + // 需要带上当前项目id + customListParams: { + projectId: this.$route.query.safetyCenterId, + // 查询本级可选,传其他值是查上级 + type: '2' + } } }, created() { @@ -372,6 +387,7 @@ export default { }, }, methods: { + getContactsByCompanyBySafetyCenter, // 验证选择会议名称的情况 checkChoiceTopic(rules, value, callback) { console.log(value)