diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue
index 8d613de..4cacc3d 100644
--- a/src/components/tools/StatusSlot.vue
+++ b/src/components/tools/StatusSlot.vue
@@ -58,7 +58,7 @@ export default {
required: false
},
// 当前需要转换key的属性, 悬浮显示实际具体内容信息时需要
- // paymentRecord 来款 confirm-确认收入 mail -- 邮寄 bill--开票
+ // paymentRecord 来款 confirm-确认收入 mail -- 邮寄 bill--开票; pack--打包
statusKey: {
type: String,
required: false,
@@ -69,11 +69,21 @@ export default {
type: Function,
required: false,
default: queryCommonProjectById
+ },
+ // 打包的字段 如果打包,其他的字段全部置灰 如果为空,不做判断
+ packField: {
+ type: String,
+ required: false,
+ default: 'pack'
}
},
computed: {
// eslint-disable-next-line vue/return-in-computed-property
status() {
+ // 如果有打包字段 && 当前列不是打包列 && 当前行是打包为"是"
+ if (this.packField && this.statusKey !== 'pack' && this.statuObj[this.packField] === 1) {
+ return zero
+ }
if (this.statuObj.amountReceivable === '0.00' || this.statuObj.receivableAmount === '0.00') {
if (this.statusType) {
// 待确收金额为0 未到账 未邮寄 未开票的状态
diff --git a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue
index c06f06a..46865d3 100644
--- a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue
@@ -81,7 +81,13 @@
+
+
+
+
+
+
@@ -208,7 +214,7 @@ export default {
title: '需要发票',
align: 'center',
dataIndex: 'needInvoice',
- scopedSlots: { customRender: 'status-pack' },
+ scopedSlots: { customRender: 'status-needInvoice' },
width: 80
},
{
diff --git a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue
index 688a6e7..ea11fd2 100644
--- a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue
@@ -64,7 +64,13 @@
+
+
+
+
+
+
@@ -98,7 +104,13 @@
+
+
+
+
+
+
@@ -261,7 +273,7 @@ export default {
title: '需要发票',
align: 'center',
dataIndex: 'invoiceRequirements',
- scopedSlots: {customRender: 'status-pack'},
+ scopedSlots: {customRender: 'status-needInvoice'},
width: 80,
},
{
diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue
index 07ca596..096dd6c 100644
--- a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue
@@ -92,7 +92,13 @@
+
+
+
+
+
+
@@ -237,7 +243,7 @@ export default {
align: 'center',
width: 80,
dataIndex: 'needInvoice',
- scopedSlots: { customRender: 'status-pack' }
+ scopedSlots: { customRender: 'status-needInvoice' }
}, {
title: '到账',
align: 'center',
diff --git a/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue b/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue
index 167253d..bad5bec 100644
--- a/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue
+++ b/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue
@@ -129,25 +129,6 @@
@click="openDetailModal(record)">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ text }}
@@ -176,7 +157,6 @@
import { JeroListMixin } from '@/mixins/JeroListMixin'
import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
import {getDraftingGroupById} from '@api/incomePaymentsApi'
-import StatusSlot from '../../components/tools/StatusSlot'
import ProjectDetailModal from '../../components/ProjectDetailModal'
import DraftingGroupMemberUnitModule from './modules/DraftingGroupMemberUnitModule'
import Vue from 'vue'
@@ -194,7 +174,6 @@ export default {
components: {
DraftingGroupMemberUnitCheckModule,
PageHeaderTitle,
- StatusSlot,
ProjectDetailModal,
DraftingGroupMemberUnitModule,
PreviewFile
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 3da0bd6..87d9dcb 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -151,7 +151,13 @@
+
+
+
+
+
+
@@ -368,7 +374,7 @@ export default {
align: 'center',
width: 80,
dataIndex: 'needInvoice',
- scopedSlots: {customRender: 'status-pack'}
+ scopedSlots: {customRender: 'status-needInvoice'}
}, {
title: '到账',
align: 'center',
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 175e644..8f23fa8 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -354,7 +354,13 @@
+
+
+
+
+
+
@@ -528,7 +534,7 @@ export default {
align: 'center',
dataIndex: 'needInvoice',
width: 100,
- scopedSlots: { customRender: 'status-pack' }
+ scopedSlots: { customRender: 'status-needInvoice' }
},
{
title: '到账',
diff --git a/src/views/incomePayments/memberManage/CertificateMaintenanceList.vue b/src/views/incomePayments/memberManage/CertificateMaintenanceList.vue
index 436136f..5185854 100644
--- a/src/views/incomePayments/memberManage/CertificateMaintenanceList.vue
+++ b/src/views/incomePayments/memberManage/CertificateMaintenanceList.vue
@@ -114,7 +114,13 @@
>
-
+
+
+
+
+
+
+
@@ -225,7 +231,7 @@ export default {
title: '需要发票',
align: 'center',
dataIndex: 'invoiceRequirements',
- scopedSlots: { customRender: 'status-pack' },
+ scopedSlots: { customRender: 'status-needInvoice' },
},
{
title: '到账',
diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
index 8354d1b..5a217f9 100644
--- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
@@ -140,7 +140,13 @@
+
+
+
+
+
+
@@ -243,7 +249,7 @@ export default {
align: 'center',
width: 80,
dataIndex: 'needInvoice',
- scopedSlots: {customRender: 'status-pack'}
+ scopedSlots: {customRender: 'status-needInvoice'}
},
{
title: '到账',
diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
index 11b153f..36eb30d 100644
--- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
@@ -167,7 +167,13 @@
>
-
+
+
+
+
+
+
+
@@ -322,7 +328,7 @@ export default {
title: '需要发票',
align: 'center',
dataIndex: 'invoiceRequirements',
- scopedSlots: { customRender: 'status-pack' },
+ scopedSlots: { customRender: 'status-needInvoice' },
},
{
title: '到账',
diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue
index 4d02efd..5f10160 100644
--- a/src/views/packManagement/PackCompanyList.vue
+++ b/src/views/packManagement/PackCompanyList.vue
@@ -67,7 +67,7 @@
-
+
@@ -231,7 +231,7 @@ const defaultTableColumns = [
align: 'center',
width: 80,
dataIndex: 'needInvoice',
- scopedSlots: { customRender: 'status-pack' }
+ scopedSlots: { customRender: 'status-needInvoice' }
},
{
title: '到账',
diff --git a/src/views/packManagement/modules/PackProjectSelectProjectModule.vue b/src/views/packManagement/modules/PackProjectSelectProjectModule.vue
index dc63a2c..2338e87 100644
--- a/src/views/packManagement/modules/PackProjectSelectProjectModule.vue
+++ b/src/views/packManagement/modules/PackProjectSelectProjectModule.vue
@@ -77,6 +77,12 @@
+
+
+
+
+
@@ -88,7 +94,7 @@
import { JeroListMixin } from '../../../mixins/JeroListMixin'
import JYearDate from '../../../components/jero/JYearDate'
import StatusSlot from '../../../components/tools/StatusSlot'
-import { addPackProject } from '../../../api/incomePaymentsApi'
+import {addPackProject, getPayConfirmList} from '../../../api/incomePaymentsApi'
export default {
name: 'PackProjectSelectProjectModule',
@@ -193,11 +199,11 @@ export default {
dataIndex: 'makeInvoice',
scopedSlots: { customRender: 'status' }
}, {
- title: '邮寄',
+ title: '确收',
align: 'center',
width: 80,
- dataIndex: 'mail',
- scopedSlots: { customRender: 'status' }
+ dataIndex: 'affirmIncome',
+ scopedSlots: { customRender: 'status-confirm' }
}
],
disableMixinCreated: true,
@@ -207,6 +213,7 @@ export default {
}
},
methods: {
+ getPayConfirmList,
handleOk() {
if (this.confirmLoading) {
return
diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue
index 0145d05..ffdd7aa 100644
--- a/src/views/projectManagement/GeneralProjectManagement.vue
+++ b/src/views/projectManagement/GeneralProjectManagement.vue
@@ -125,7 +125,13 @@
+
+
+
+
+
+
@@ -247,7 +253,7 @@ export default {
align: 'center',
width: 80,
dataIndex: 'needInvoice',
- scopedSlots: { customRender: 'status-pack' }
+ scopedSlots: { customRender: 'status-needInvoice' }
}, {
title: '到账',
align: 'center',
diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index ec85c56..e8c4098 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -174,7 +174,13 @@
+
+
+
+
+
+
@@ -375,7 +381,7 @@ export default {
fixed: 'right',
width: 80,
dataIndex: 'needInvoice',
- scopedSlots: { customRender: 'status-pack' }
+ scopedSlots: { customRender: 'status-needInvoice' }
}, {
title: '到账',
align: 'center',