From d686aaefcd476ceccc5a104ac0e51b1b3da93460 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 8 Oct 2021 14:19:07 +0800 Subject: [PATCH 01/15] =?UTF-8?q?Revert=20"=E8=B5=84=E6=96=99=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=94=AF?= =?UTF-8?q?=E5=87=BA=E5=90=88=E5=90=8C=E5=8D=95=E4=BD=8D=E3=80=81=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E6=94=B9=E4=B8=BAinput"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7ab837f86f26ab72177b2e61df454034263a2629. --- .../WorkingGroupProjectDataMaintenance.vue | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue index a94dd19..ed842e0 100644 --- a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue @@ -87,7 +87,6 @@ import { JeroListMixin } from '../../mixins/JeroListMixin' import PageHeaderTitle from '../../components/layouts/PageHeaderTitle' import WorkGroupFileUploadModal from './modules/WorkGroupFileUploadModal' import WorkGroupDistributeModule from './modules/WorkGroupDistributeModule' -import { downloadFile } from '../../api/manage' export default { name: 'WorkingGroupProjectDataMaintenance', @@ -196,18 +195,7 @@ export default { this.dataId = id this.distributeModalVisible = true this.isBatchDistribute = false - }, - handleExportXls(fileName) { - if (!fileName || typeof fileName != 'string') { - fileName = '导出文件' - } - let param = this.getQueryParams() - if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - param['selections'] = this.selectedRowKeys.join(',') - } - console.log('导出参数', param) - downloadFile(this.url.exportXlsUrl, fileName + '.zip', param) - }, + } } } From 2d60bb2ceb4147a83ad7caf3723f33ec2b7b7169 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 8 Oct 2021 14:21:34 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A=E3=80=81=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E4=BF=AE=E6=94=B9=E4=B8=BAinput?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ExpenditureContractModule.vue | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index edd05c9..768551e 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -28,17 +28,18 @@ - + - + @@ -287,12 +288,12 @@ export default { rules: [{ required: true, message: '请输入合同名称' }], validateTrigger: 'blur' }, - signedCompany: { - rules: [{ required: true, message: '请选择签订单位' }], - validateTrigger: 'change' + signedCompanyTemporaryName: { + rules: [{ required: true, message: '请输入签订单位' }], + validateTrigger: 'blur' }, - signedContactsId: { - rules: [{ required: true, message: '请选择签订联系人' }], + signedContactsTemporaryName: { + rules: [{ required: true, message: '请输入签订联系人' }], validateTrigger: 'blur' }, principalId: { @@ -364,17 +365,17 @@ export default { let record record = res.result // 回显企业 - record.signedCompany = { - id: record.signedCompanyTemporaryId, - companyName: record.signedCompanyTemporaryName - } + // record.signedCompany = { + // id: record.signedCompanyTemporaryId, + // companyName: record.signedCompanyTemporaryName + // } // 回显联系人 - this.selectedCompany = record.signedCompany - record.signedContactsId = record.signedContactsTemporaryId - this.selectedContact = { - id: record.signedContactsTemporaryId, - name: record.signedContactsTemporaryName - } + // this.selectedCompany = record.signedCompany + // record.signedContactsId = record.signedContactsTemporaryId + // this.selectedContact = { + // id: record.signedContactsTemporaryId, + // name: record.signedContactsTemporaryName + // } this.model = Object.assign({}, record) // 回显负责人部门 this.principalChange(this.model.principalId) @@ -383,7 +384,7 @@ export default { // 回显打包年份 this.isPackage = this.model.pack === 1 this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear')) + this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompanyTemporaryName', 'signedContactsTemporaryName', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear')) this.confirmLoading = false }) } else { From f11436fc6242cae29b60c4be51c2a2eafd674eb7 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 8 Oct 2021 14:22:21 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A=E3=80=81=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E4=BF=AE=E6=94=B9=E4=B8=BAinput?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkingGroupProjectDataMaintenance.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue index ed842e0..a94dd19 100644 --- a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue @@ -87,6 +87,7 @@ import { JeroListMixin } from '../../mixins/JeroListMixin' import PageHeaderTitle from '../../components/layouts/PageHeaderTitle' import WorkGroupFileUploadModal from './modules/WorkGroupFileUploadModal' import WorkGroupDistributeModule from './modules/WorkGroupDistributeModule' +import { downloadFile } from '../../api/manage' export default { name: 'WorkingGroupProjectDataMaintenance', @@ -195,7 +196,18 @@ export default { this.dataId = id this.distributeModalVisible = true this.isBatchDistribute = false - } + }, + handleExportXls(fileName) { + if (!fileName || typeof fileName != 'string') { + fileName = '导出文件' + } + let param = this.getQueryParams() + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + param['selections'] = this.selectedRowKeys.join(',') + } + console.log('导出参数', param) + downloadFile(this.url.exportXlsUrl, fileName + '.zip', param) + }, } } From c9261faf90b37a5503d947221faf7e59d3c35a44 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 8 Oct 2021 14:59:01 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E7=9B=B4=E8=BD=AC=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expenditureContract/modules/ExpenditureContractModule.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index 768551e..1aa9fe0 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -417,7 +417,6 @@ export default { postAction(url, formData).then(res => { if (res.success) { this.contractId = res.result.id - this.edit(this.contractId) this.$message.success(res.message) // 跳转至支出合同list页面 this.$router.push({ From 26c54458680f33aba3f04578fad09fcc23708902 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 8 Oct 2021 14:59:57 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE=E9=87=8D=E5=A4=8D=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/RevenueContractAduitModule.vue | 56 ++++++++++--------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue index 9e0e45b..6321628 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue @@ -5,32 +5,37 @@ :visible="visible" :confirmLoading="confirmLoading" switchFullscreen - @ok="handleOk" - @cancel="handleCancel" cancelText="关闭"> - - - - - - - 通过 - 拒绝 - - - - - - + + + + + + + + 通过 + 拒绝 + + + + + + + + @@ -81,6 +86,7 @@ export default { // 触发表单验证 this.form.validateFields((err, values) => { if (!err) { + this.confirmLoading = true values.contractId = this.contractId const formData = Object.assign(this.model, values) console.log('表单提交数据', formData) From 6c0a6e2fa7d9c184f0473fdb2fc89f6810a93c93 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 8 Oct 2021 15:06:31 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expenditureContract/modules/ExpenditureContractModule.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index 1aa9fe0..e7d47dd 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -403,8 +403,6 @@ export default { this.confirmLoading = true if (this.installmentList && this.installmentList.length > 0) { let formData = {} - values.signedCompanyId = values.signedCompany.id - delete values.signedCompany formData.installment = this.installmentList formData.contract = Object.assign(this.model, values) console.log('表单提交数据', formData) From ed8cfa45c88ebb04af4e3089d8a2707781f612cc Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 8 Oct 2021 15:51:05 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=BA=94=E6=94=B6?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E3=80=81=E5=AE=9E=E6=94=B6=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ExpenditureContractModule.vue | 6 +++--- .../revenueContract/modules/RevenueContractModule.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index e7d47dd..bce35c2 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -601,11 +601,11 @@ export default { if (this.accountsReceivableNum !== null && this.amountReceivedNum !== null) { this.model.outstandingAmount = Number(this.accountsReceivableNum) - Number(this.amountReceivedNum) this.model.outstandingAmount = this.model.outstandingAmount.toFixed(2) - if (this.model.outstandingAmount === 0) { + if (Number(this.model.outstandingAmount) === 0) { this.model.accountStatus = '3' - } else if (this.model.outstandingAmount > 0 && this.model.outstandingAmount < Number(this.accountsReceivableNum)) { + } else if (Number(this.model.outstandingAmount) > 0 && Number(this.model.outstandingAmount) < Number(this.accountsReceivableNum)) { this.model.accountStatus = '2' - } else if (this.model.outstandingAmount === Number(this.accountsReceivableNum)) { + } else if (Number(this.model.outstandingAmount) === Number(this.accountsReceivableNum)) { this.model.accountStatus = '1' } this.$nextTick(() => { diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index b2a94d2..9a9dce4 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -666,13 +666,13 @@ export default { this.model.outstandingAmount = Number(this.accountsReceivableNum) - Number(this.amountReceivedNum) this.model.outstandingAmount = this.model.outstandingAmount.toFixed(2) // 未收金额 === 0，已付全款状态 - if (this.model.outstandingAmount <= 0) { + if (Number(this.model.outstandingAmount) === 0) { this.model.accountStatus = '3' // 未收金额 > 0 且 未收金额 < 应收金额，部分付款状态 - } else if (this.model.outstandingAmount > 0 && this.model.outstandingAmount < Number(this.accountsReceivableNum)) { + } else if (Number(this.model.outstandingAmount) > 0 && Number(this.model.outstandingAmount) < Number(this.accountsReceivableNum)) { this.model.accountStatus = '2' // 未收金额 === 应收金额，未付款状态 - } else if (this.model.outstandingAmount === Number(this.accountsReceivableNum)) { + } else if (Number(this.model.outstandingAmount) === Number(this.accountsReceivableNum)) { this.model.accountStatus = '1' } this.$nextTick(() => { From 263af748a1d9973a4cfdd8a539f1df567f78c4cd Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Fri, 8 Oct 2021 16:34:32 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=8F=82=E4=BC=9A?= =?UTF-8?q?=E4=BA=BA=E7=9A=84=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/hasPermission.js | 3 +- .../incomePayments/meetManage/Attendance.vue | 157 ++++++++++++++++-- .../projectManagement/CommitteeMeeting.vue | 5 +- .../ConferenceMaintenance.vue | 3 +- .../InternationalSeminar.vue | 3 +- src/views/projectManagement/OtherMeeting.vue | 3 +- 6 files changed, 152 insertions(+), 22 deletions(-) diff --git a/src/utils/hasPermission.js b/src/utils/hasPermission.js index b341310..81df262 100644 --- a/src/utils/hasPermission.js +++ b/src/utils/hasPermission.js @@ -5,10 +5,9 @@ const hasPermission = { Vue.directive('has', { inserted: (el, binding, vnode)=>{ // console.log('binding=====',binding.value) - // console.log('binding=====args',binding) if(binding.arg){ binding.value = binding.arg - console.log( binding.value ,' binding.value =================') + // console.log( binding.value ,' binding.value =================') } // console.log("页面权限控制----"); //console.time() diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 3a844a0..5660559 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -160,7 +160,7 @@ - 查询 + 查询 重置 @@ -173,16 +173,16 @@
- 添加参会人 - 导出 + 添加参会人 + 导出 - 批量删除 + 批量删除 设置对接人 + v-has="'internalMeetingSituation:batchSetDocker'">设置对接人
@@ -242,14 +242,14 @@ 审核凭证 + v-has:[authorCode.auditRecord]="'attendance:auditCredentials'">审核凭证 审核报名信息 - 编辑 + v-has:[authorCode.auditSignUpInfo]="'attendance:auditSignUp'">审核报名信息 + 编辑 - 删除 + 删除 @@ -400,14 +400,112 @@ export default { scopedSlots: {customRender: 'action'} } ], + // 权限编码 + authorCode:{ + + }, + // 其他会议的参会情况的权限编码 + otherMeetingCode:{ + search:'otherMeetingSituation:search', + add:'otherMeetingSituation:add', + export:'otherMeetingSituation:export', + batchDel:'otherMeetingSituation:batchDel', + edit:'otherMeetingSituation:edit', + delete:'otherMeetingSituation:delete', + auditRecord:'otherMeetingSituation:auditCredentials', + auditSignUpInfo:'otherMeetingSituation:auditSignUp' + }, + // 分标委会议的参会情况权限编码 + committeeMeetingCode:{ + search:'committeeMeetingSituation:search', + add:'committeeMeetingSituation:add', + export:'committeeMeetingSituation:export', + batchDel:'committeeMeetingSituation:batchDel', + edit:'committeeMeetingSituation:edit', + delete:'committeeMeetingSituation:delete', + auditRecord:'committeeMeetingSituation:auditCredentials', + auditSignUpInfo:'committeeMeetingSituation:auditSignUp' + }, + // 工作组会议的参会情况的权限编码 + workGroupMeetingCode:{ + search:'workGroupMeetingSituationSituation:search', + add:'workGroupMeetingSituationSituation:add', + export:'workGroupMeetingSituationSituation:export', + batchDel:'workGroupMeetingSituationSituation:batchDel', + edit:'workGroupMeetingSituationSituation:edit', + delete:'workGroupMeetingSituationSituation:delete', + auditRecord:'workGroupMeetingSituationSituation:auditCredentials', + auditSignUpInfo:'workGroupMeetingSituationSituation:auditSignUp' + }, + // 国际研讨会的参会情况的权限编码 + internalMeetingCode:{ + search:'internalMeetingSituation:search', + add:'internalMeetingSituation:add', + export:'internalMeetingSituation:export', + batchDel:'internalMeetingSituation:batchDel', + edit:'internalMeetingSituation:edit', + delete:'internalMeetingSituation:delete', + auditRecord:'internalMeetingSituation:auditCredentials', + auditSignUpInfo:'internalMeetingSituation:auditSignUp', + }, + // 标协会议的参会情况的权限编码 + standardsMeetingCode:{ + search:'standardsMeetingSituation:search', + add:'standardsMeetingSituation:add', + export:'standardsMeetingSituation:export', + batchDel:'standardsMeetingSituation:batchDel', + edit:'standardsMeetingSituation:edit', + delete:'standardsMeetingSituation:delete', + auditRecord:'standardsMeetingSituation:auditCredentials', + auditSignUpInfo:'standardsMeetingSituation:auditSignUp' + }, disableMixinCreated: true, - addPerson:'addPerson12', - url: { - list: '/meeting/payMeetingSituation/page', - delete: '/meeting/payMeetingSituation/delete', - deleteBatch: '/meeting/payMeetingSituation/deleteBatch', - exportXlsUrl: '/meeting/payMeetingSituation/exportXls', - importExcelUrl: '/meeting/payMeetingSituation/importExcel' + // url: { + // list: '/meeting/payMeetingSituation/page', + // delete: '/meeting/payMeetingSituation/delete', + // deleteBatch: '/meeting/payMeetingSituation/deleteBatch', + // exportXlsUrl: '/meeting/payMeetingSituation/exportXls', + // importExcelUrl: '/meeting/payMeetingSituation/importExcel' + // }, + // 其他会议的url + otherMeetingUrl:{ + list: '/meeting/ohterMeetingSituation/page', + delete: '/meeting/ohterMeetingSituation/delete', + deleteBatch: '/meeting/ohterMeetingSituation/deleteBatch', + exportXlsUrl: '/meeting/ohterMeetingSituation/exportXls', + importExcelUrl: '/meeting/ohterMeetingSituation/importExcel' + }, + // 分标委会议的url + committeeMeetingUrl:{ + list: '/meeting/committeeMeetingSituation/page', + delete: '/meeting/committeeMeetingSituation/delete', + deleteBatch: '/meeting/committeeMeetingSituation/deleteBatch', + exportXlsUrl: '/meeting/committeeMeetingSituation/exportXls', + importExcelUrl: '/meeting/committeeMeetingSituation/importExcel' + }, + // 国际研讨会的url + internalMeetingUrl:{ + list: '/meeting/internalMeetingSituation/page', + delete: '/meeting/internalMeetingSituation/delete', + deleteBatch: '/meeting/internalMeetingSituation/deleteBatch', + exportXlsUrl: '/meeting/internalMeetingSituation/exportXls', + importExcelUrl: '/meeting/internalMeetingSituation/importExcel' + }, + // 标协会议的url + standardsMeetingUrl:{ + list: '/meeting/standardsMeetingSituation/page', + delete: '/meeting/standardsMeetingSituation/delete', + deleteBatch: '/meeting/standardsMeetingSituation/deleteBatch', + exportXlsUrl: '/meeting/standardsMeetingSituation/exportXls', + importExcelUrl: '/meeting/standardsMeetingSituation/importExcel' + }, + // 工作组会议的url + workGroupMeetingUrl:{ + list: '/meeting/workGroupMeetingSituation/page', + delete: '/meeting/workGroupMeetingSituation/delete', + deleteBatch: '/meeting/workGroupMeetingSituation/deleteBatch', + exportXlsUrl: '/meeting/workGroupMeetingSituation/exportXls', + importExcelUrl: '/meeting/workGroupMeetingSituation/importExcel' }, // 当前的会议信息详情 currentMeetingInfo: {}, @@ -423,6 +521,8 @@ export default { } }, created() { + // 为不同会议的参会情况去设置不同的权限编码 + this.setCodeByMeetingType(this.$route.query.meetingType) // 获取会议详情 const param = { id: this.$route.query.id @@ -488,6 +588,16 @@ export default { return '' } }, + // eslint-disable-next-line + url(){ + switch (this.$route.query.meetingType){ + case '1': return this.workGroupMeetingUrl + case '2': return this.standardsMeetingUrl + case '3': return this.internalMeetingUrl + case '4': return this.otherMeetingUrl + case '5': return this.committeeMeetingUrl + } + }, // 报名链接 signUpHerfUrl() { return `${window._CONFIG['singUpQRCodeURL']}?id=${this.$route.query.id}` @@ -616,6 +726,8 @@ export default { return '国际研讨会' case '4': return '其他会议' + case '5': + return '分标委会议' default: return '其他会议' } @@ -669,6 +781,19 @@ export default { newInput.remove() this.$message.success('复制成功') }, + /* + * 通过会议类型设置权限编码 + * type 会议类型 + * */ + setCodeByMeetingType(type){ + switch (type){ + case '1':this.authorCode = Object.assign({},this.workGroupMeetingCode);break + case '2':this.authorCode = Object.assign({},this.standardsMeetingCode);break + case '3':this.authorCode = Object.assign({},this.internalMeetingCode);break + case '4':this.authorCode = Object.assign({},this.otherMeetingCode);break + case '5':this.authorCode = Object.assign({},this.committeeMeetingCode);break + } + } } } diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue index 7c434e7..647e7e9 100644 --- a/src/views/projectManagement/CommitteeMeeting.vue +++ b/src/views/projectManagement/CommitteeMeeting.vue @@ -293,6 +293,7 @@ export default { caseCommitteeId(){ return this.$route.query.id ? this.$route.query.id : undefined }, + // eslint-disable-next-line url() { let meetingType = this.$route.query.meetingType + '' // 标协会议 @@ -357,11 +358,13 @@ export default { * 参会情况 * */ toAttendance(record) { + const that = this this.$router.push({ path: '/incomePayments/meetManage/Attendance', query: { id: record.id, - meetingName: record.meetingName + meetingName: record.meetingName, + meetingType:that.$route.query.meetingType + '' } }) }, diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue index 8955748..fe072e2 100644 --- a/src/views/projectManagement/ConferenceMaintenance.vue +++ b/src/views/projectManagement/ConferenceMaintenance.vue @@ -330,7 +330,8 @@ export default { path: '/incomePayments/meetManage/Attendance', query: { id: record.id, - meetingName: record.meetingName + meetingName: record.meetingName, + meetingType:'1' } }) }, diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue index df3f1ee..f3ccb26 100644 --- a/src/views/projectManagement/InternationalSeminar.vue +++ b/src/views/projectManagement/InternationalSeminar.vue @@ -273,7 +273,8 @@ export default { path: '/incomePayments/meetManage/Attendance', query: { id: record.id, - meetingName: record.meetingName + meetingName: record.meetingName, + meetingType:'3' } }) }, diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue index 0b52459..8941a55 100644 --- a/src/views/projectManagement/OtherMeeting.vue +++ b/src/views/projectManagement/OtherMeeting.vue @@ -278,7 +278,8 @@ name: 'OtherMeeting', path: '/incomePayments/meetManage/Attendance', query: { id: record.id, - meetingName: record.meetingName + meetingName: record.meetingName, + meetingType:'4' } }) }, From 938f8224549362d86a48bf0d5e54edaf063d6595 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 8 Oct 2021 17:39:35 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E9=9C=80=E6=B1=82=E9=AA=8C=E6=94=B6bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ProjectDetailModal.vue | 4 +- .../modules/ExpenditureContractModule.vue | 9 +- .../revenueContract/RevenueContractList.vue | 11 +- .../modules/RevenueContractDetail.vue | 428 +++++++++++------- .../modules/RevenueContractModule.vue | 9 +- src/views/packManagement/PackCompanyList.vue | 12 +- .../modules/GeneralProjectModule.vue | 4 +- 7 files changed, 292 insertions(+), 185 deletions(-) diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index 92f2de1..b83c118 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -125,8 +125,8 @@ :dataSource="logisticsInfoList" class="j-table-force-nowrap" > - - 查看物流 + + 查看物流 diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index bce35c2..c1b6c98 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -125,11 +125,10 @@ - + diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue index e4d2514..1f60655 100644 --- a/src/views/contractManagement/revenueContract/RevenueContractList.vue +++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue @@ -48,7 +48,7 @@ - + @@ -65,7 +65,8 @@
新增 - 导出 + 导出 + 批量删除
@@ -108,12 +109,12 @@ 审核 - 编辑 + v-if="record.status === 1 || record.status === 4" v-has="'revenueContract:edit'">编辑 存档 删除 + v-if="record.status === 1 || record.status === 2 || record.status === 4" + v-has="'revenueContract:delete'">删除 已存档 diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue index e3486a7..f506de6 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue @@ -1,191 +1,235 @@