diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 610b6c8..68f33ee 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -375,7 +375,7 @@ export default {
dataIndex: 'inAccount',
scopedSlots: {customRender: 'status'}
}, {
- title: '收入',
+ title: '确收',
align: 'center',
width: 70,
dataIndex: 'affirmIncome',
@@ -386,12 +386,6 @@ export default {
width: 70,
dataIndex: 'makeInvoice',
scopedSlots: {customRender: 'status-bill'}
- }, {
- title: '邮寄',
- align: 'center',
- width: 70,
- dataIndex: 'mail',
- scopedSlots: {customRender: 'status-mail'}
}, {
title: '操作',
dataIndex: 'action',
diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
index 9bfb3bf..8354d1b 100644
--- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
@@ -124,6 +124,12 @@
+
+
+
+
+
@@ -254,11 +260,11 @@ export default {
scopedSlots: {customRender: 'status-bill'}
},
{
- title: '邮寄',
+ title: '确收',
align: 'center',
width: 80,
- dataIndex: 'mail',
- scopedSlots: {customRender: 'status-mail'}
+ dataIndex: 'affirmIncome',
+ scopedSlots: {customRender: 'status-confirm'}
},
{
title: '操作',
diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue
index 95c5338..0145d05 100644
--- a/src/views/projectManagement/GeneralProjectManagement.vue
+++ b/src/views/projectManagement/GeneralProjectManagement.vue
@@ -109,6 +109,12 @@
+
+
+
+
+
@@ -145,6 +151,7 @@ import StatusSlot from '@comp/tools/StatusSlot'
import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
import IconProjectManagement from '@/assets/imgs/icon/icon_project_management.png'
import { formatMoney } from '../../utils/formatMoney'
+import {getPayConfirmList} from '@api/incomePaymentsApi'
export default {
name: 'GeneralProjectManagement',
@@ -254,11 +261,11 @@ export default {
dataIndex: 'makeInvoice',
scopedSlots: { customRender: 'status-bill' }
}, {
- title: '邮寄',
+ title: '确收',
align: 'center',
width: 80,
- dataIndex: 'mail',
- scopedSlots: { customRender: 'status-mail' }
+ dataIndex: 'affirmIncome',
+ scopedSlots: { customRender: 'status-confirm' }
}, {
title: '操作',
dataIndex: 'action',
@@ -277,6 +284,7 @@ export default {
},
methods: {
formatMoney,
+ getPayConfirmList,
// 重写查询方法--删除预估到账日期属性
searchQuery() {
this.lastQueryParam = {...this.queryParam}
diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index 13a7a96..3e0d5c7 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -158,6 +158,12 @@
+
+
+
+
+
@@ -204,7 +210,7 @@
import { JeroListMixin } from '@/mixins/JeroListMixin'
import JYearDate from '@comp/jero/JYearDate'
import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
-import {getWorkingGroupById, dunningReminder, workingGroupEditAccount} from '@api/incomePaymentsApi'
+import {getWorkingGroupById, dunningReminder, workingGroupEditAccount, getPayConfirmList} from '@api/incomePaymentsApi'
import StatusSlot from '../../components/tools/StatusSlot'
import ProjectDetailModal from '../../components/ProjectDetailModal'
import WorkingGroupMemberUnitModule from './modules/WorkingGroupMemberUnitModule'
@@ -385,12 +391,12 @@ export default {
dataIndex: 'makeInvoice',
scopedSlots: { customRender: 'status-bill' }
}, {
- title: '邮寄',
+ title: '确收',
align: 'center',
fixed: 'right',
width: 80,
- dataIndex: 'mail',
- scopedSlots: { customRender: 'status-mail' }
+ dataIndex: 'affirmIncome',
+ scopedSlots: { customRender: 'status-confirm' }
}, {
title: '操作',
dataIndex: 'action',
@@ -419,6 +425,7 @@ export default {
},
methods: {
formatMoney,
+ getPayConfirmList,
// 是否可以调账
isAllowEditAccount (record) {
const { receivableAmount, mail, inAccount, makeInvoice } = record