From 45b902aad5e7a523b42812a56fda1910252e090d Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 23 Dec 2021 14:35:37 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=9C=80=E6=B1=82]=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E3=80=81=E8=AF=81=E4=B9=A6=E4=B8=8D=E5=8F=AF=E6=9D=A5?=
 =?UTF-8?q?=E6=AC=BE=EF=BC=9B=E5=BF=85=E9=A1=BB=E5=AE=A1=E6=A0=B8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E6=89=8D=E8=83=BD=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arriveAndInvoicing/ArriveAndInvoivingList.vue      |  4 ++--
 .../arriveAndInvoicing/modules/ArriveModule.vue        |  2 +-
 .../arriveAndInvoicing/modules/ArriveStageModule.vue   | 10 ++++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 334c52e..ca1a5d2 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -340,8 +340,8 @@ export default {
      */
     invoicing(record) {
       // 标协会员项目必须先到账后开票
-      if (record.projectType === 5 && record.inAccount !== 1) {
-        this.$message.warn('标协会员项目必须先到账才可开票。')
+      if ((Number(record.projectType) === 5 || Number(record.projectType) === 6) && record.paymentStatus !== 'completed') {
+        this.$message.warn(`标协${Number(record.projectType) === 5 ? '会员' : '证书'}项目必须先审核通过才可开票。`)
         return
       }
       this.mailContactsId = record.mailContactsId
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue
index 9281ee9..0d130ef 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue
@@ -57,7 +57,7 @@ export default {
     },
     // 项目类型
     projectType: {
-      type: Number,
+      type: [Number, String],
       required: false,
       default: null
     },
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
index 090bdb5..2942fab 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
@@ -52,10 +52,10 @@
     <a-empty v-else></a-empty>
 
     <template slot="footer">
-      <a-button type="primary" @click="handleAdd" v-preventclick>添加阶段</a-button>
+      <a-button type="primary" @click="handleAdd" v-preventclick v-if="Number(projectType) !== 5 && Number(projectType) !== 6">添加阶段</a-button>
     </template>
 
-    <arrive-module ref="arriveModal" :project-id="projectId" @ok="addArriveOk" v-bind="$attrs"></arrive-module>
+    <arrive-module ref="arriveModal" :project-id="projectId" @ok="addArriveOk" v-bind="$attrs" :project-type="projectType"></arrive-module>
 
     <!--    缴费凭证预览-->
     <preview-img-modal ref="previewImg"></preview-img-modal>
@@ -81,6 +81,12 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    // 项目类型，标协会员、证书项目不可来款，来款的添加阶段按钮隐藏
+    projectType: {
+      type: [Number, String],
+      required: false,
+      default: null
     }
   },
   data() {