From 52db20e1e3f4c0d216d786f6c7e012a1d8ece80f Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Wed, 27 Dec 2023 15:56:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?=E6=92=A4=E9=94=80=E5=BC=80=E7=A5=A8=20=E6=92=A4=E9=94=80?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js                  |  9 +++++
 .../modules/ConfirmStageModule.vue            | 37 +++++++++++++++++-
 .../modules/InvoicingStageModule.vue          | 38 ++++++++++++++++++-
 3 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index d851875..c5c40cc 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -126,6 +126,12 @@ const addPayConfirm = (param) => postAction('/payConfirmPaymentRecord/add', para
 const editPayConfirm = (param) => postAction('/payConfirmPaymentRecord/edit', param)
 
 
+// 撤销开票 todo
+const revokeInvoice = (params) => postAction(`/paymentRecord/payPaymentRecord/revoke?id=${params}`)
+// 撤销确认来款信息 todo
+const revokeConfirm = (params) => postAction(`/paymentRecord/payPaymentRecord/revoke?id=${params}`)
+
+
 //2023-07-13 工作组相关功能的接口
 // 判断当前节点 是否可以发邮件
 const judgeEmailStatus = (param) => getAction('/sys/message/sysMessageTemplate/queryByCode', param)
@@ -196,6 +202,9 @@ export {
   addPayConfirm,
   editPayConfirm,
 
+  revokeInvoice,
+  revokeConfirm,
+
 
   judgeEmailStatus
 }
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmStageModule.vue
index 5da1a8e..ac9b102 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmStageModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmStageModule.vue
@@ -15,6 +15,9 @@
           <div class="title">
             <div class="title-text">第{{ item.chinaNumIndex }}阶段</div>
             <img src="../../../../assets/imgs/icon/icon_edit.png" @click="handleEdit(item)">
+            <!--证书项目 与会员项目没有撤销功能-->
+            <span class="revoke" @click="handleRevoke(item)" v-has="'incomePaymentAndInvoicing:revokeConfirm'" v-if=" !(projectType === 5 || projectType === 6) ">撤销</span>
+
           </div>
           <a-row>
             <a-col :span="6">
@@ -75,7 +78,7 @@
 
 <script>
 import ConfirmModule from './ConfirmModule'
-import {getPayConfirmList} from '../../../../api/incomePaymentsApi'
+import { getPayConfirmList, revokeConfirm } from "../../../../api/incomePaymentsApi";
 import {ajaxGetDictItems} from '@api/api'
 
 export default {
@@ -89,6 +92,12 @@ export default {
       required: false,
       default: null
     },
+    // 项目类型，标协会员、证书项目不可来款，来款的添加阶段按钮隐藏
+    projectType: {
+      type: [Number, String],
+      required: false,
+      default: null
+    },
     // 弹窗显隐
     visible: {
       type: Boolean,
@@ -153,6 +162,26 @@ export default {
       this.$refs.confirmModal.title = '编辑阶段'
       this.$refs.confirmModal.edit(record, this.projectInfo)
     },
+    /**
+     * 撤销
+     * */
+    handleRevoke(record) {
+      let that = this
+      this.$confirm({
+        title: '确认撤销',
+        content: '确定要撤销确认收入吗?',
+        onOk: function () {
+          revokeConfirm(record.id).then(res => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.loadData()
+            } else {
+              that.$message.warning(res.message)
+            }
+          })
+        }
+      })
+    },
     handleCancel() {
       this.close()
     },
@@ -218,6 +247,12 @@ export default {
 .stage-box {
   padding-bottom: 10px;
 }
+.revoke {
+  color: #069f99;
+  user-select: none;
+  margin-left: 8px;
+  cursor: pointer;
+}
 
 .title {
   display: flex;
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue
index fa69a5b..680f33e 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue
@@ -14,6 +14,9 @@
           <div class="title">
             <div class="title-text">第{{ item.chinaNumIndex }}阶段</div>
             <img src="../../../../assets/imgs/icon/icon_edit.png" @click="handleEdit(item)">
+            <!--证书项目 与会员项目没有撤销功能-->
+            <span class="revoke" @click="handleRevoke(item)" v-has="'incomePaymentAndInvoicing:revokeInvoice'" v-if=" !(projectType === 5 || projectType === 6) ">撤销</span>
+
           </div>
           <a-row>
             <a-col :span="6">
@@ -88,7 +91,7 @@
 
 <script>
 import InvoicingModule from './InvoicingModule'
-import { payBillList } from '../../../../api/incomePaymentsApi'
+import { payBillList, revokeInvoice } from '../../../../api/incomePaymentsApi'
 import {ajaxGetDictItems} from '@api/api'
 
 export default {
@@ -102,6 +105,12 @@ export default {
       required: false,
       default: null
     },
+    // 项目类型，标协会员、证书项目不可来款，来款的添加阶段按钮隐藏
+    projectType: {
+      type: [Number, String],
+      required: false,
+      default: null
+    },
     // 弹窗显隐
     visible: {
       type: Boolean,
@@ -160,6 +169,26 @@ export default {
       this.$refs.invoicingModal.title = '编辑阶段'
       this.$refs.invoicingModal.edit(record)
     },
+    /**
+     * 撤销
+     * */
+    handleRevoke(record) {
+      let that = this
+      this.$confirm({
+        title: '确认撤销',
+        content: '确定要撤销开票吗?',
+        onOk: function () {
+          revokeInvoice(record.id).then(res => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.loadData()
+            } else {
+              that.$message.warning(res.message)
+            }
+          })
+        }
+      })
+    },
     handleCancel() {
       this.close()
     },
@@ -226,6 +255,13 @@ export default {
   padding-bottom: 10px;
 }
 
+.revoke {
+  color: #069f99;
+  user-select: none;
+  margin-left: 8px;
+  cursor: pointer;
+}
+
 .title {
   display: flex;
   align-items: center;