From 153cb7ad95c67b0c34f225e335708e4197a631db Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 11:55:48 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E3=80=81=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=EF=BC=9A=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98=E7=9A=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=8F=AA=E8=83=BD=E5=85=88=E6=9D=A5=E6=AC=BE=E6=89=8D?=
 =?UTF-8?q?=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          | 2 +-
 src/views/packManagement/PackProjectMaintenance.vue        | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 0599295..1c5219a 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -359,7 +359,7 @@ export default {
           if (arr.some(item => item.projectType === 5)) {
             // 标协会员项目是否完全到账
             if (arr.some(item => item.inAccount !== 1)) {
-              reject('存在未全部到账的标协会员项目！')
+              reject('标协会员项目必须先到账才可开票。')
             }
           }
 
diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue
index 7b153d8..fa8115b 100644
--- a/src/views/packManagement/PackProjectMaintenance.vue
+++ b/src/views/packManagement/PackProjectMaintenance.vue
@@ -530,6 +530,13 @@ export default {
           if (arr.some(item => item.makeInvoice === 1)) {
             reject('存在已完成开票的项目！')
           }
+          // 是否选中了标协会员项目，标协会员项目只能到账一次、开票一次，前端进行是否完全到账的限制
+          if (arr.some(item => item.projectType === 5)) {
+            // 标协会员项目是否完全到账
+            if (arr.some(item => item.inAccount !== 1)) {
+              reject('标协会员项目必须先到账才可开票。')
+            }
+          }
         }
         // 来款
         if (operateType === 'incomePayment') {