From 32dff804d19c2f25d4e4f82aeffd75b8159beb59 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Mon, 25 Oct 2021 14:42:36 +0800
Subject: [PATCH] =?UTF-8?q?[update]-=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=8D=8F?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE=E5=9C=A8=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=88=E5=B9=B6=E5=BC=80=E7=A5=A8=E7=9A=84?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arriveAndInvoicing/ArriveAndInvoivingList.vue   | 13 +++++++++++++
 .../packManagement/modules/BatchInvoicingModule.vue |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index fa20761..0599295 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -334,10 +334,12 @@ export default {
         arr = this.dataSource.filter(tt => selectedKeys.indexOf(tt.id) > -1)
         // 开票
         if (operateType === 'invoic') {
+
           // 是否存在不需要发票的项目
           if (arr.some(item => item.needInvoice === 0 || Number(item.receivableAmount) === 0)) {
             reject('存在不需要发票的项目！')
           }
+
           // 是否存在企业不同的项目
           let companyArr = []
           arr.forEach(item => {
@@ -347,9 +349,20 @@ export default {
           if (!isAllEqual(companyArr)) {
             reject('请选择来款单位为同一企业的项目合并开票！')
           }
+
+          // 是否存在已完成开票的项目
           if (arr.some(item => item.makeInvoice === 1)) {
             reject('存在已完成开票的项目！')
           }
+
+          // 是否选中了标协会员项目，标协会员项目只能到账一次、开票一次，前端进行是否完全到账的限制
+          if (arr.some(item => item.projectType === 5)) {
+            // 标协会员项目是否完全到账
+            if (arr.some(item => item.inAccount !== 1)) {
+              reject('存在未全部到账的标协会员项目！')
+            }
+          }
+
           this.selectedCompany = {
             id: arr[0].chargeCompanyId,
             companyName: arr[0].chargeCompanyTemporaryName
diff --git a/src/views/packManagement/modules/BatchInvoicingModule.vue b/src/views/packManagement/modules/BatchInvoicingModule.vue
index 886722e..3984ca6 100644
--- a/src/views/packManagement/modules/BatchInvoicingModule.vue
+++ b/src/views/packManagement/modules/BatchInvoicingModule.vue
@@ -184,7 +184,7 @@ export default {
           title: '打包项目名称',
           align: 'center',
           dataIndex: 'chargeProject',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '应收金额',
           align: 'center',