From f7aa8456a7bd3d4125e09e33079594a259059314 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Wed, 6 Mar 2024 16:00:22 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90=E5=91=98=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E3=80=81=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98-?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E3=80=81=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E3=80=81=E6=89=80=E6=9C=89=E4=BC=9A=E8=AE=AE=EF=BC=9A=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E9=82=AE=E5=AF=84=E3=80=81=E5=A2=9E=E5=8A=A0=E7=A1=AE?=
 =?UTF-8?q?=E6=94=B6=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arriveAndInvoicing/ArriveAndInvoivingList.vue |  8 +-------
 .../memberManage/SafeguardMemberList.vue          | 12 +++++++++---
 .../GeneralProjectManagement.vue                  | 14 +++++++++++---
 .../WorkingGroupMemberUnitMaintenance.vue         | 15 +++++++++++----
 4 files changed, 32 insertions(+), 17 deletions(-)

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 @@
           <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: '操作',
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 @@
             <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}
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 @@
             <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