diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 9fedd24..714185c 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -116,6 +116,14 @@ const incomingUpdatePayment = (param) => postAction('/member/tbMemberProjectSubi
// 更新会员系统 证书缴费的发票信息
const incomingUpdateCertificate = (param) => postAction('/member/tbCertificatePayment/incomingUpdateCertificate', param)
+
+// 确认来款- 查询当前项目是否有来款信息
+const getPayConfirmList = (param) => getAction('/payConfirmPaymentRecord/list', param)
+// 新增一个确认来款信息
+const addPayConfirm = (param) => postAction('/payConfirmPaymentRecord/add', param)
+// 编辑一个确认来款信息
+const editPayConfirm = (param) => postAction('/payConfirmPaymentRecord/edit', param)
+
export {
getWorkingGroupById,
getChargeNotice,
@@ -174,5 +182,10 @@ export {
judgeInternalEnterprise,
incomingUpdatePayment,
- incomingUpdateCertificate
+ incomingUpdateCertificate,
+
+
+ getPayConfirmList,
+ addPayConfirm,
+ editPayConfirm
}
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index ecd004c..4477f62 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -143,6 +143,11 @@
:disabled="record.projectType === 3 && record.registerCheckResult === '0'">来款
开票
+
+ 确认来款
@@ -181,7 +186,8 @@
-
+
+
@@ -200,6 +206,18 @@ import { isAllEqual } from '../../../utils/util'
import AuditProofModule from './modules/AuditProofModule'
// import AuditProofModule from "@views/financialManagement/arriveAndInvoicing/modules/AuditProofModule";
import AuditModal from '@views/incomePayments/meetManage/modules/AuditModal'
+import PreComeModule from './modules/PreComeModule'
+
+// 项目类型 数据字典 的定义 和数据库的保持一致
+const ProjectTypeEnums = {
+ GENERAL_PRO: {name: '普通项目', value: 1},
+ GROUP_PRO: {name: '工作组项目', value: 2},
+ MEETING_PRO: {name: '会议项目', value: 3},
+ MEMBER_PRO: {name: '会员项目', value: 4},
+ STANDARD_MEMBER_PRO: {name: '标协会员项目', value: 5},
+ STANDARD_CERTIFICATE_PRO: {name: '标协证书项目', value: 6},
+}
+
export default {
name: 'ArriveAndInvoivingList',
@@ -213,12 +231,14 @@ export default {
ProjectDetailModal,
BatchInvoicingModule,
AuditProofModule,
- AuditModal
+ AuditModal,
+ PreComeModule
},
mixins: [JeroListMixin],
data() {
return {
IconImg,
+ ProjectTypeEnums,
labelCol: {
xs: { span: 24 },
sm: { span: 5 }
@@ -320,7 +340,7 @@ export default {
dataIndex: 'action',
align: 'center',
fixed: 'right',
- width: 160,
+ width: 200,
scopedSlots: { customRender: 'action' }
}
],
@@ -465,6 +485,17 @@ export default {
return
}
},
+ /**
+ * 确认来款 - 普通项目、工作组项目、资料网员 项目 可以确认来款(即记录跨年度提前来款)
+ * @param record
+ */
+ preComeMoney(record) {
+ // 判断是否是 普通项目、工作组项目、资料网员 项目 不是 直接返回
+ let canOpe = record.projectType === ProjectTypeEnums.GENERAL_PRO.value || record.projectType === ProjectTypeEnums.GROUP_PRO.value || record.projectType === ProjectTypeEnums.MEMBER_PRO.value
+ if(!canOpe) return
+ this.$refs.preComeModule.show(record)
+
+ },
/**
* 搜索金额校验
* @param type 起始范围--start,终止范围--end
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/PreComeModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/PreComeModule.vue
new file mode 100644
index 0000000..35a843d
--- /dev/null
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/PreComeModule.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+ e.target.value = (e.target.value.replace(/[^0-9-.]/g, '')).trim()">
+
+
+
+
+
+ {e.target.value = (e.target.value + '').trim()}"/>
+
+
+
+
+
+
+
+
+
\ No newline at end of file