From b49719c6418c1d4f5f3fe8076c33ecac3d293438 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 16:25:16 +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        | 9 +++++++--
 src/views/packManagement/PackProjectMaintenance.vue      | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 1c5219a..d335414 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -25,7 +25,8 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="来款单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入来款单位" v-model="queryParam.chargeCompanyTemporaryName" :maxLength='50'></a-input>
+                <a-input placeholder="请输入来款单位" v-model="queryParam.chargeCompanyTemporaryName"
+                         :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -295,7 +296,11 @@ export default {
      * @param record
      */
     invoicing(record) {
-      console.log(record)
+      // 标协会员项目必须先到账后开票
+      if (record.projectType === 5 && record.inAccount !== 1) {
+        this.$message.warn('标协会员项目必须先到账才可开票。')
+        return
+      }
       this.mailContactsId = record.mailContactsId
       this.selectProjectId = record.id
       this.selectProjectType = record.projectType
diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue
index fa8115b..c622097 100644
--- a/src/views/packManagement/PackProjectMaintenance.vue
+++ b/src/views/packManagement/PackProjectMaintenance.vue
@@ -504,7 +504,10 @@ export default {
      * @param record
      */
     invoicing(record) {
-      console.log(record)
+      if (record.projectType === 5 && record.inAccount !== 1) {
+        this.$message.warn('标协会员项目必须先到账才可开票。')
+        return
+      }
       this.selectProjectName = record.chargeProject
       this.selectProjectId = record.id
       this.selectProjectType = record.projectType