update 普通项目、工作组成员单位、资料网员-成员、到账开票、所有会议:去掉邮寄、增加确收(未完成)

This commit is contained in:
danshihao
2024-03-06 16:00:22 +08:00
parent bd2579feb5
commit f7aa8456a7
4 changed files with 32 additions and 17 deletions
@@ -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',
@@ -124,6 +124,12 @@
<status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
</template>
<!-- 确认收入 -->
<template slot="status-confirm" slot-scope="text,record">
<status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="confirm"
:get-info-func="getPayConfirmList"></status-slot>
</template>
<!-- 开票-->
<template slot="status-bill" slot-scope="text,record">
<status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
@@ -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: '操作',
@@ -109,6 +109,12 @@
<status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
</template>
<!-- 确认收入 -->
<template slot="status-confirm" slot-scope="text,record">
<status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="confirm"
:get-info-func="getPayConfirmList"></status-slot>
</template>
<!-- 开票-->
<template slot="status-bill" slot-scope="text,record">
<status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
@@ -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}
@@ -158,6 +158,12 @@
<status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
</template>
<!-- 确认收入 -->
<template slot="status-confirm" slot-scope="text,record">
<status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="confirm"
:get-info-func="getPayConfirmList"></status-slot>
</template>
<!-- 开票-->
<template slot="status-bill" slot-scope="text,record">
<status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
@@ -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