From 223babb4880de95825446cb2af8f1d5460093b21 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Wed, 27 Dec 2023 17:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=20=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE-=E8=83=BD=E5=90=A6=E6=9D=A5=E6=AC=BE?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arriveAndInvoicing/ArriveAndInvoivingList.vue        | 3 ++-
 .../incomePayments/memberManage/SafeguardMemberList.vue  | 5 ++++-
 .../WorkingGroupPaymentStatisticsDetail.vue              | 9 ++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 676a265..2b44fd8 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -424,7 +424,8 @@ export default {
   computed: {
     // 批量来款是否可以新增阶段--会员缴费、证书缴费 不能新增阶段
     canAddStage() {
-      return Number(this.selectProjectType) !== 5 && Number(this.selectProjectType) !== 6
+      // return Number(this.selectProjectType) !== 5 && Number(this.selectProjectType) !== 6
+      return true
     }
   },
   methods: {
diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
index 1722f29..b08eed1 100644
--- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
@@ -107,7 +107,10 @@
         </template>
 
         <template slot="member" slot-scope="text,record">
-          <div @click="openDetail(record)" class="primary-color">{{ text }}</div>
+          <a-tooltip>
+            <template slot="title">{{ text }}</template>
+            <div @click="openDetail(record)" class="primary-color table-text">{{ text }}</div>
+          </a-tooltip>
         </template>
         <!--金钱 3位一逗号分隔-->
         <template slot="allMoney" slot-scope="text">
diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
index 43e87b8..e29cbd1 100644
--- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
+++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
@@ -74,7 +74,14 @@
                   @change="checkMoney('end')"></a-input>
               </a-form-item>
             </a-col>
-
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="是否打包" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag v-model="queryParam.pack"
+                                   placeholder="请选择是否打包"
+                                   dictCode="yn"
+                />
+              </a-form-item>
+            </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>