From fedc1622ccbaa7446fc363044965383342186efa Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 16 Sep 2022 10:27:40 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E6=9D=A5=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js                  |  4 +-
 .../ArriveAndInvoivingList.vue                | 45 ++++++++++++++-----
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 714185c..b2893a5 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -116,7 +116,8 @@ const incomingUpdatePayment = (param) => postAction('/member/tbMemberProjectSubi
 // 更新会员系统 证书缴费的发票信息
 const incomingUpdateCertificate = (param) => postAction('/member/tbCertificatePayment/incomingUpdateCertificate', param)
 
-
+// 撤销来款
+const revokeIncome = (params) => postAction(`/paymentRecord/payPaymentRecord/revoke?id=${params}`)
 // 确认来款- 查询当前项目是否有来款信息
 const getPayConfirmList = (param) => getAction('/payConfirmPaymentRecord/list', param)
 // 新增一个确认来款信息
@@ -150,6 +151,7 @@ export {
   getPackCompanyById,
   addPackProject,
   removePackProject,
+  revokeIncome,
   batchRemovePackProject,
   aduitCompany,
   checkContactByCompany,
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 4618fd0..19148ed 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -60,7 +60,8 @@
                 <j-dict-select-tag v-model="queryParam.paidInvoicStatus" placeholder="请选择来款开票状态"
                                    dictCode="paid_invoic_status"/>
               </a-form-item>
-            </a-col>>
+            </a-col>
+            >
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="确认收入状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-dict-select-tag v-model="queryParam.affirmIncome" placeholder="请选择确认收入状态"
@@ -127,7 +128,8 @@
 
           <!--          确认收入 -->
           <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>
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="confirm"
+                         :get-info-func="getPayConfirmList"></status-slot>
           </template>
 
           <!--          开票-->
@@ -155,10 +157,12 @@
             <a @click="incomePayment(record)"
                v-has="'incomePaymentAndInvoiving:incomePayment'"
                :disabled="record.projectType === 3 && record.registerCheckResult === '0'">来款</a>
+            <!--证书项目 与会员项目没有撤销功能-->
+            <a @click="handleRevoke(record)" v-has=" 'incomePaymentAndInvoiving:revoke' " v-if=" !(record.projectType === 5 || record.projectType === 6) ">撤销</a>
             <a @click="invoicing(record)" :disabled="record.needInvoice === 0"
                v-has="'incomePaymentAndInvoiving:invoicing'">开票</a>
             <!--   确认收入项目--- 普通项目、工作组项目、资料网员 项目 可以确认收入 报名状态是 待审核的时候 不能确认收入？-->
-            <a v-has="'incomePaymentAndInvoiving:confirmPayment'"  @click="confirmPayment(record)">确认收入</a>
+            <a v-has="'incomePaymentAndInvoiving:confirmPayment'" @click="confirmPayment(record)">确认收入</a>
           </span>
         </a-table>
       </div>
@@ -226,8 +230,8 @@ import AuditProofModule from './modules/AuditProofModule'
 // import AuditProofModule from "@views/financialManagement/arriveAndInvoicing/modules/AuditProofModule";
 import AuditModal from '@views/incomePayments/meetManage/modules/AuditModal'
 import ConfirmStageModule from './modules/ConfirmStageModule'
-import {getPayConfirmList} from '../../../api/incomePaymentsApi'
-import JDictSelectTag from "@comp/dict/JDictSelectTag";
+import {getPayConfirmList, revokeIncome} from '../../../api/incomePaymentsApi'
+import JDictSelectTag from '@comp/dict/JDictSelectTag'
 
 // 项目类型 数据字典 的定义 和数据库的保持一致
 const ProjectTypeEnums = {
@@ -368,13 +372,13 @@ export default {
           dataIndex: 'action',
           align: 'center',
           fixed: 'right',
-          width: 250,
+          width: 300,
           scopedSlots: {customRender: 'action'}
         }
       ],
       url: {
         list: '/paymentRecord/payPaymentRecord/mainList',
-        exportXlsUrl: '/paymentRecord/payPaymentRecord/exportXls'
+        exportXlsUrl: '/paymentRecord/payPaymentRecord/exportXls',
       },
       selectProjectId: null, // 选中项目id
       selectProjectType: null, // 选中项目类型
@@ -405,6 +409,27 @@ export default {
       this.selectNeedInvoice = record.needInvoice
       this.arriveVisible = true
     },
+    /**
+     * 撤销
+     * */
+    handleRevoke(record) {
+      console.log('撤销')
+      let that = this
+      this.$confirm({
+        title: '确认撤销',
+        content: '确定要撤销来款吗?',
+        onOk: function () {
+          revokeIncome(record.id).then(res => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.loadData()
+            } else {
+              that.$message.warning(res.message)
+            }
+          })
+        }
+      })
+    },
     /**
      * 开票
      * @param record
@@ -513,9 +538,9 @@ export default {
         this.meetingType = record.meetingType
         this.situationId = record.situationId
         let params = {
-          meetingType:record.meetingType,
-          situationId:record.situationId,
-          type:'kp'
+          meetingType: record.meetingType,
+          situationId: record.situationId,
+          type: 'kp'
         }
         this.$refs.auditModal.title = '审核凭证'
         this.$refs.auditModal.open(params, false)