diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index 168fa8d..02039b2 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -97,8 +97,12 @@ const getUserByDepartCode = (param) => getAction('/statistics/allProjectStatisti const cancellationContract = (param) => postAction('/contract/payIncomeContract/cancellation', param) // 支出合同--作废 const cancellationExpenditureContract = (param) => postAction('/contract/paySpendingContract/cancellation', param) -// 到账开票审核缴费凭证时获取最新一条缴费信息 +// 到账开票审核缴费凭证时获取最新一条缴费信息(普通项目、工作组项目、资料网员) const getLastProofInfo = (param) => getAction('/paymentCheck/payPaymentCheck/getLastRecord', param) +// 到账开票审核缴费凭证时获取最新一条缴费信息(标协会员) +const getStanderMemberLastProofInfo = (param) => getAction('/paymentCheck/payPaymentCheck/getTbMemberProject', param) +// 到账开票审核缴费凭证时获取最新一条缴费信息(标协证书) +const getCertificateLastProofInfo = (param) => getAction('/paymentCheck/payPaymentCheck/getTbCertificatePayment', param) export { getWorkingGroupById, @@ -149,5 +153,7 @@ export { cancellationContract, councilPublishRemind, cancellationExpenditureContract, - getLastProofInfo + getLastProofInfo, + getStanderMemberLastProofInfo, + getCertificateLastProofInfo } diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index 17ad3d0..e93979a 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -430,8 +430,8 @@ export default { * @param record */ auditProof(record) { - // 普通项目、工作组项目、会员项目使用新写的审核逻辑 - if (record.projectType === 1 || record.projectType === 2 || record.projectType === 4) { + // 普通项目、工作组项目、会员项目、标协证书、标协会员使用新写的审核逻辑 + if (!!record.projectType && record.projectType !== 3) { this.$refs.auditProof.title = '审核缴费凭证' this.$refs.auditProof.open(record) return diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue index 63c1ceb..090bdb5 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue @@ -237,7 +237,7 @@ export default { &-content { padding-right: 20px; word-break: break-all; - white-space: nowrap; + white-space: pre-wrap; font-size: 14px; font-family: NotoSansHans, NotoSansHans-Light; color: #4D4D4D; @@ -245,7 +245,7 @@ export default { &-money { color: #D40505; word-break: break-all; - white-space: nowrap; + white-space: pre-wrap; } } diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue index 16c9eef..b681c22 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue @@ -29,11 +29,17 @@
{{ proofInfo.applicantName }}
+ +
-
+
+
+ +
+
{ + let param = { + projectId: record.id + } + let httpMethod + // 标协会员、证书和普通项目、工作组项目、资料网员使用的接口不一致 + if (record.projectType.toString() === '5') { + httpMethod = getStanderMemberLastProofInfo + } else if (record.projectType.toString() === '6') { + httpMethod = getCertificateLastProofInfo + } else { + httpMethod = getLastProofInfo + } + httpMethod(param).then(res => { if (res.success) { this.proofInfo = res.result + // 标协会员、证书的缴费凭证文件、缴费金额、缴费日期、申请人字段和普通项目、工作组项目、资料网员的不一致 + if (record.projectType.toString() === '5' || record.projectType.toString() === '6') { + this.proofInfo.proof = res.result.paymentRecord + this.proofInfo.amountReceived = res.result.paidAmount + this.proofInfo.paymentDate = res.result.submissionTime + this.proofInfo.applicantName = res.result.liaisonMan + } + this.getProofType(record) } }) } diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue index 58f8cea..681e90e 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue @@ -48,7 +48,7 @@ import JDate from '../../../../components/tools/JDate' import pick from 'lodash.pick' import { money } from '../../../../utils/validate' -import { addPayBill, addPaymentPhase, editAmountPhase, editPayBill } from '../../../../api/incomePaymentsApi' +import { addPayBill, editPayBill } from '../../../../api/incomePaymentsApi' import { addZero } from '../../../../utils/util' import { getContactsById } from '../../../../api/api' diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue index f30c1b4..40867d2 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue @@ -229,12 +229,14 @@ export default { &-content { padding-right: 20px; word-break: break-all; + white-space: pre-wrap; font-size: 14px; font-family: NotoSansHans, NotoSansHans-Light; color: #4D4D4D; &-money { color: #D40505; + white-space: pre-wrap; } } }