From 2e87337add9f76f32518c27431fdcdab2f3fc66f Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Mon, 24 Jul 2023 18:24:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E3=80=81=E8=AF=81=E4=B9=A6=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=20=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86=E4=B8=AD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=B7=BB=E5=8A=A0=E9=98=B6=E6=AE=B5=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue         |  4 ++++
 .../ArriveAndInvoivingList.vue                |  7 +++++++
 .../modules/ArriveStageModule.vue             | 20 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index e3610a4..931d72a 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -170,6 +170,10 @@
             <label>银行账户：</label>
             <span>{{ otherCompanyInfo.bankAccount }}</span>
           </a-col>
+          <a-col :span="12" class="detail-item">
+            <label>联行号：</label>
+            <span>{{ otherCompanyInfo.linkBankNumber || '' }}</span>
+          </a-col>
         </a-row>
       </template>
     </section>
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index ad50206..ee74639 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -174,6 +174,7 @@
       :project-id="selectProjectId"
       :project-type="selectProjectType"
       :need-invoice="selectNeedInvoice"
+      :can-add-stage="canAddStage"
       :visible.sync="arriveVisible"></arrive-stage-module>
 
     <!--    开票阶段-->
@@ -409,6 +410,12 @@ export default {
 
     }
   },
+  computed: {
+    // 批量来款是否可以新增阶段--会员缴费、证书缴费 不能新增阶段
+    canAddStage() {
+      return Number(this.selectProjectType) !== 5 && Number(this.selectProjectType) !== 6
+    }
+  },
   methods: {
     getPayConfirmList,
     /**
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
index 0cefc55..a7df90c 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
@@ -80,7 +80,8 @@
     <a-empty v-else></a-empty>
 
     <template slot="footer">
-      <a-button type="primary" @click="handleAdd" v-preventclick v-if="Number(projectType) !== 5 && Number(projectType) !== 6">添加阶段</a-button>
+      <!--Number(projectType) !== 5 && Number(projectType) !== 6 -->
+      <a-button type="primary" @click="handleAdd" v-preventclick v-if="canAddStageFlag">添加阶段</a-button>
     </template>
 
     <arrive-module ref="arriveModal" :project-id="projectId" @ok="addArriveOk" v-bind="$attrs" :project-type="projectType"></arrive-module>
@@ -96,6 +97,7 @@ import {amountReceivedList, revokeIncome} from '../../../../api/incomePaymentsAp
 import PreviewImgModal from '../../../../components/PreviewImgModal'
 import PreviewFile from '../../../../components/jero/PreviewFile.vue'
 import {ajaxGetDictItems} from '@api/api'
+import { ProjectTypeEnums } from '../../../../enums/commonEnums'
 
 export default {
   name: 'ArriveStageModule',
@@ -117,6 +119,22 @@ export default {
       type: [Number, String],
       required: false,
       default: null
+    },
+    // 是否能增加阶段-从外部进行模块的区分
+    canAddStage: {
+      type: Boolean,
+      required: false,
+      default: true
+    }
+  },
+  computed: {
+    canAddStageFlag() {
+      // 标协会员项目和证书项目 需要判断 当前的阶段是否有值，这两类项目只能来款一次
+      if(Number(this.projectType) === ProjectTypeEnums.STANDARD_CERTIFICATE_PRO.value || Number(this.projectType) === ProjectTypeEnums.STANDARD_MEMBER_PRO.value) {
+        return this.stageList.length === 0 && this.canAddStage
+      } else {
+        return this.canAddStage
+      }
     }
   },
   data() {