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

---
 .../ArriveAndInvoivingList.vue                | 27 ++---------------
 .../modules/ArriveStageModule.vue             | 30 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 19148ed..9cb10d1 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -157,8 +157,6 @@
             <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>
             <!--   确认收入项目--- 普通项目、工作组项目、资料网员 项目 可以确认收入 报名状态是 待审核的时候 不能确认收入？-->
@@ -230,7 +228,7 @@ 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, revokeIncome} from '../../../api/incomePaymentsApi'
+import {getPayConfirmList} from '../../../api/incomePaymentsApi'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 
 // 项目类型 数据字典 的定义 和数据库的保持一致
@@ -372,7 +370,7 @@ export default {
           dataIndex: 'action',
           align: 'center',
           fixed: 'right',
-          width: 300,
+          width: 250,
           scopedSlots: {customRender: 'action'}
         }
       ],
@@ -409,27 +407,6 @@ 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
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
index dabcb13..5ef855b 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
@@ -13,6 +13,8 @@
         <div class="title">
           <div class="title-text">第{{ item.chinaNumIndex }}阶段</div>
           <img src="../../../../assets/imgs/icon/icon_edit.png" @click="handleEdit(item)" v-if="!(item.proof && item.proof !== '')">
+          <!--证书项目 与会员项目没有撤销功能-->
+          <span class="revoke" @click="handleRevoke(item)" v-has=" 'incomePaymentAndInvoiving:revoke' " v-if=" !(projectType === 5 || projectType === 6) ">撤销</span>
         </div>
         <a-row>
           <a-col :span="12">
@@ -72,7 +74,7 @@
 
 <script>
 import ArriveModule from './ArriveModule'
-import { amountReceivedList } from '../../../../api/incomePaymentsApi'
+import {amountReceivedList, revokeIncome} from '../../../../api/incomePaymentsApi'
 import PreviewImgModal from '../../../../components/PreviewImgModal'
 import PreviewFile from '../../../../components/jero/PreviewFile.vue'
 
@@ -116,6 +118,27 @@ export default {
     }
   },
   methods: {
+    /**
+     * 撤销
+     * */
+    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)
+            }
+          })
+        }
+      })
+    },
     handleAdd() {
       this.$refs.arriveModal.title = '添加阶段'
       this.$refs.arriveModal.add()
@@ -205,6 +228,11 @@ export default {
 .stage-box {
   padding-bottom: 10px;
 }
+.revoke {
+  color: #069f99;
+  user-select: none;
+  margin-left: 8px;
+}
 
 .title {
   display: flex;