diff --git a/public/local_production_address_config.js b/public/local_production_address_config.js index 14a4c6b..81c946d 100644 --- a/public/local_production_address_config.js +++ b/public/local_production_address_config.js @@ -13,11 +13,14 @@ window._CONFIG["onlinePreviewDomainURL"] = "http://139.9.235.66:8012/onlinePrevi // todo 需要改为企业端的报名地址 --- 139 // 会议管理报名二维码地址 -window._CONFIG["singUpQRCodeURL"] = "http://bxxt.hzwlsoft.com/signupentrance" +// window._CONFIG["singUpQRCodeURL"] = "http://bxxt.hzwlsoft.com/signupentrance" +window._CONFIG["singUpQRCodeURL"] = "http://10.10.10.46:8066/signupentrance" // 会议管理签到二维码地址 微信扫描二维码 跳转的 地址 要么全大写 要么全小写 -window._CONFIG["singInQRCodeURL"] = "http://bxxt.hzwlsoft.com/signinurl" +// window._CONFIG["singInQRCodeURL"] = "http://bxxt.hzwlsoft.com/signinurl" +window._CONFIG["singInQRCodeURL"] = "http://10.10.10.46:8066/signinurl" // 页面显示用的会议报名二维码连接 -window._CONFIG["singInQRCodHref"]= 'http://139.9.235.66/signupentrance' +// window._CONFIG["singInQRCodHref"]= 'http://139.9.235.66/signupentrance' +window._CONFIG["singInQRCodHref"]= 'http://10.10.10.46:8066/signupentrance' // 票据打印--寄件人单位名称 window._CONFIG["sendCompanyName"] = "中国汽车标准化研究院" @@ -27,4 +30,5 @@ window._CONFIG["sendAddress"] = "天津市东丽区先锋东路68号" window._CONFIG["sendPostCode"] = "300300" // 查看物流信息 -window._CONFIG["lookExpressDomainURL"] = "http://bxxt.hzwlsoft.com/lookExpressInfo"; \ No newline at end of file +// window._CONFIG["lookExpressDomainURL"] = "http://bxxt.hzwlsoft.com/lookExpressInfo"; +window._CONFIG["lookExpressDomainURL"] = "http://10.10.10.46:8077/lookExpressInfo"; \ No newline at end of file diff --git a/src/api/api.js b/src/api/api.js index 660a6da..fb3868d 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -124,6 +124,9 @@ const companyAdminResetPassword = (param) => postAction('/payManagerManagement/r // 企业管理员启用禁用 const companyAdminEnable= (param) => postAction('/payManagerManagement/frozenBatch', param) +// 通过企业id查询企业的相关发票信息 +const queryCompanyInfoById= (param) => getAction('/company/payCompanyManagement/queryById', param) + // 加密获取key 与 iv const getKeyIv = (param) => getAction('/sys/getEncryptedString',param) @@ -193,7 +196,8 @@ export { getContactsByCompanyNoLimit, loginIdmPlatform, companyAdminResetPassword, - companyAdminEnable + companyAdminEnable, + queryCompanyInfoById } diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 8fe65ce..7128877 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -319,7 +319,7 @@ 审核凭证 - + 审核报名信息 @@ -327,8 +327,12 @@ 编辑 删除 - - 资料状态 + + 资料状态 @@ -954,7 +958,7 @@ export default { // 行内 设置嘉宾是否可上传文件，只有参会方式是嘉宾的可以设置 setGuestsUploadFileFlag(record) { // 参会人员不是嘉宾，直接返回 - if(record.identity !== 1) return + if(record.identity !== 1 || record.registerCheckResult === 0) return this.$refs.setGuessUploadFlagModal.show(record) }, // 批量设置嘉宾是否可上传文件，只有参会方式是嘉宾的可以设置 @@ -965,10 +969,10 @@ export default { } // 判断只能身份为嘉宾的数据 设置资料状态 let flag = this.selectionRows.some(item => { - return item.identity !== 1 + return item.identity !== 1 || item.registerCheckResult === 0 }) if(flag) { - this.$message.warn('只有身份为嘉宾的数据才可设置资料状态') + this.$message.warn('只有身份为嘉宾且报名信息审核通过的数据才可设置资料状态') return } this.$refs.setGuessUploadFlagModal.showBatch(this.selectedRowKeys) diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue index 8883d95..5cd755c 100644 --- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue +++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue @@ -547,7 +547,7 @@ export default { * */ changeInvoice(val) { this.selectedInvoiceType = Number(val) - if (val === '0') { + if (this.selectedInvoiceType === 0) { // 不需要发票 this.needInvoiceBool = false } else { diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue index 0c5becd..da52940 100644 --- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue +++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue @@ -133,6 +133,7 @@ import { judgeInternalEnterprise } from '../../../api/incomePaymentsApi' import {httpAction} from '@api/manage' import pick from 'lodash.pick' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' +import { queryCompanyInfoById } from '../../../api/api' export default { name: 'SignUpInfoEdit', @@ -287,13 +288,28 @@ export default { }, }, methods: { + // 通过企业的id获取企业管理中的基本信息，用于发票回显 + queryCompanyInfoById(id) { + return new Promise(resolve => { + let result = {} + queryCompanyInfoById({id}).then(res => { + if(res.success) { + result = res.result || {} + result = pick(res.result, 'companyName', 'dutyCode', 'companyAddress', 'companyPhone', 'openingBank', 'bankAccount', 'linkBankNumber') + } + }).finally(() => { + resolve(result) + }) + }) + + }, addContactsOk() { this.$refs.selectContacts.getContactsList() }, /* * 编辑 * */ - edit(record){ + async edit(record){ this.isInternalEnterprise = false this.form.resetFields() this.model = Object.assign({},record) @@ -310,15 +326,26 @@ export default { } // 参会人回显 // this.selectedCompany = this.model.companyId - this.selectedCompany = Object.assign({}, this.model.companyId, { - // 写入发票的信息，因为需要回显 - dutyCode:this.model.dutyCode, // 信用代码 - companyAddress:this.model.companyAddress, // 公司地址 - companyPhone:this.model.companyPhone, // 公司电话 - openingBank:this.model.openingBank, // 开户行 - bankAccount:this.model.bankAccount, // 银行账号 - linkBankNumber:this.model.linkBankNumber // 联行号 + // 如果当前的参会人信息中发票信息不全 则从企业管理中获取一下 + // if(!this.model.dutyCode && !this.model.companyAddress) + // 从企业管理中获取全部的会议信息 + let companyInfo = await this.queryCompanyInfoById(this.model.companyId.id) + // 判断当前数据中企业信息是否完整 将有数据的赋值到数据中 + // 写入发票的信息，因为需要回显 + // dutyCode:this.model.dutyCode, // 信用代码 + // companyAddress:this.model.companyAddress, // 公司地址 + // companyPhone:this.model.companyPhone, // 公司电话 + // openingBank:this.model.openingBank, // 开户行 + // bankAccount:this.model.bankAccount, // 银行账号 + // linkBankNumber:this.model.linkBankNumber // 联行号 + let invoiceKeys = ['dutyCode', 'companyAddress', 'companyPhone', 'openingBank', 'bankAccount', 'linkBankNumber'] + let invoiceInfo = {} + invoiceKeys.map(key => { + if(this.model[key]) { + invoiceInfo[key] = this.model[key] + } }) + this.selectedCompany = Object.assign({}, companyInfo, this.model.companyId, invoiceInfo) this.selectPerson = { id:this.model.companyContactTemporaryId, name:this.model.companyContactName @@ -444,7 +471,7 @@ export default { this.guestType = null } this.$nextTick( ()=> { - this.$refs.formother.setFormVal(this.model) + this.$refs.formother.setFormVal(Object.assign({}, this.model, { identify: this.identifyType})) }) }, /*