diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index 5b92810..168fa8d 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -97,6 +97,8 @@ 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) export { getWorkingGroupById, @@ -146,5 +148,6 @@ export { getUserByDepartCode, cancellationContract, councilPublishRemind, - cancellationExpenditureContract + cancellationExpenditureContract, + getLastProofInfo } diff --git a/src/components/PreviewImgModal.vue b/src/components/PreviewImgModal.vue new file mode 100644 index 0000000..de6f348 --- /dev/null +++ b/src/components/PreviewImgModal.vue @@ -0,0 +1,49 @@ + + + + + \ No newline at end of file diff --git a/src/components/company/BusinessSelect.vue b/src/components/company/BusinessSelect.vue index 85a6c18..4190fb3 100644 --- a/src/components/company/BusinessSelect.vue +++ b/src/components/company/BusinessSelect.vue @@ -61,10 +61,18 @@ diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index 4018c21..20faf6f 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -103,7 +103,12 @@ - + + + 审核 + 来款 @@ -143,6 +148,9 @@ + + + @@ -158,6 +166,7 @@ import SelectPrincipal from '../../../components/company/SelectPrincipal' import ProjectDetailModal from '../../../components/ProjectDetailModal' import BatchInvoicingModule from '../../packManagement/modules/BatchInvoicingModule' import { isAllEqual } from '../../../utils/util' +import AuditProofModule from './modules/AuditProofModule' export default { name: 'ArriveAndInvoivingList', @@ -169,7 +178,8 @@ export default { InvoicingStageModule, SelectPrincipal, ProjectDetailModal, - BatchInvoicingModule + BatchInvoicingModule, + AuditProofModule }, mixins: [JeroListMixin], data() { @@ -235,6 +245,12 @@ export default { width: 120, dataIndex: 'paidAmount', scopedSlots: { customRender: 'text' } + }, { + title: '缴费凭证状态', + align: 'center', + width: 160, + dataIndex: 'paymentStatus_dictText', + scopedSlots: { customRender: 'text' } }, { title: '需要发票', align: 'center', @@ -391,7 +407,23 @@ export default { } resolve(arr) }) - } + }, + /** + * 审核缴费凭证 + * @param record + */ + auditProof(record) { + // 普通项目、工作组项目、会员项目使用新写的审核逻辑 + if (record.projectType === 1 || record.projectType === 2 || record.projectType === 4) { + this.$refs.auditProof.title = '审核缴费凭证' + this.$refs.auditProof.open(record) + return + } + // 会议项目使用原本会议缴费凭证的审核弹窗 + if (record.projectType === 3) { + return + } + }, } } diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue index 7b94313..63c1ceb 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue @@ -12,7 +12,7 @@
第{{ item.chinaNumIndex }}阶段
- +
@@ -28,6 +28,16 @@
+ + + +
+
缴费凭证:
+
+
+
+
+
@@ -46,16 +56,20 @@ + + + + + \ No newline at end of file diff --git a/src/views/incomePayments/memberManage/councilMaintenance/modules/CouncilMaintenanceMemberModal.vue b/src/views/incomePayments/memberManage/councilMaintenance/modules/CouncilMaintenanceMemberModal.vue index 7ea2e2c..a92e83c 100644 --- a/src/views/incomePayments/memberManage/councilMaintenance/modules/CouncilMaintenanceMemberModal.vue +++ b/src/views/incomePayments/memberManage/councilMaintenance/modules/CouncilMaintenanceMemberModal.vue @@ -23,6 +23,8 @@