From 241a860a97b66eb9ddfed67ca7e6413d88769096 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 4 Jul 2024 10:27:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=20=E5=8E=BB=E6=8E=89=E5=BE=85=E7=A1=AE=E6=94=B6?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/incomePayments/meetManage/Attendance.vue |  4 +++-
 .../modules/WorkingGroupMemberUnitModule.vue       | 14 +++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 0d09db4..1da7b83 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -344,7 +344,7 @@
           批量设置资料状态
         </a-button>
         <!--20240703 只有工作组和起草组会议列表页上方新增一个‘批量审核’按钮-->
-        <a-button type="primary" @click="batchAuditSignUpFlag" v-if="meetingTypeValue + '' === MeetingTypeEnums.workGroup.value || meetingTypeValue + '' === MeetingTypeEnums.draftGroup.value" v-has:[authorCode.auditSignUpInfo]="'attendance:auditSignUp'">
+        <a-button type="primary" @click="batchAuditSignUpFlag" v-if="meetingTypeValue + '' === MeetingTypeEnums.workGroup.value || meetingTypeValue + '' === MeetingTypeEnums.draftGroup.value" v-has:[authorCode.batchAuditSignUpInfo]="'attendance:batchAuditSignUpInfo'">
           批量审核报名信息
         </a-button>
         <!--当会议费用为0不需要合并开票  -->
@@ -730,6 +730,7 @@ export default {
         delete: 'workGroupMeetingSituation:delete',
         auditRecord: 'workGroupMeetingSituation:auditCredentials',
         auditSignUpInfo: 'workGroupMeetingSituation:auditSignUp',
+        batchAuditSignUpInfo: 'workGroupMeetingSituation:batchAuditSignUp', // 批量审核报名信息
         guestsUploadFileFlag: 'workGroupMeetingSituation:guestsUploadFileFlag'
       },
       // 国际研讨会的参会情况的权限编码
@@ -778,6 +779,7 @@ export default {
         delete: 'draftGroupMeetingSituation:delete',
         auditRecord: 'draftGroupMeetingSituation:auditCredentials',
         auditSignUpInfo: 'draftGroupMeetingSituation:auditSignUp',
+        batchAuditSignUpInfo: 'draftGroupMeetingSituation:batchAuditSignUp', // 批量审核报名信息
         guestsUploadFileFlag: 'draftGroupMeetingSituation:guestsUploadFileFlag'
       },
       // 海外会议的参会情况的权限编码
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
index 16efbf8..b91b2f2 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
@@ -209,7 +209,7 @@
               </a-form-item>
             </a-col>
           </a-row>
-          <template v-if="chargeWayType === 1 || chargeWayType === 2">
+          <!--2024-07-03 去掉待确收金额相关数据--><!--<template v-if="chargeWayType === 1 || chargeWayType === 2">
             <a-row>
               <a-col :xl="12" :sm="24">
                 <a-form-item label="待确收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -269,7 +269,8 @@
               </a-col>
             </a-row>
 
-          </template>
+          </template>-->
+
           <a-row>
             <a-col :xl="12" :sm="24">
               <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -279,6 +280,12 @@
                         :trigger-change="true"
                         date-format="YYYY-MM"
                 />
+                <j-date placeholder="请选择预估到账日期"
+                        style="width: 100%;"
+                        v-decorator="['estimatedArrivalDate', validatorRules.estimatedArrivalDate]"
+                        :trigger-change="true"
+                        date-format="YYYY-MM-DD"
+                />
               </a-form-item>
             </a-col>
             <a-col :xl="12" :sm="24" v-if="chargeWayType === 2">
@@ -436,11 +443,12 @@ import SelectRevenueContract from '../../../components/tools/SelectRevenueContra
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import { CalcAmountMixin } from '@/mixins/CalcAmountMixin'
 import JMonthDate from '@/components/tools/JMonthDate'
+import JDate from '@/components/tools/JDate'
 import {getAllWorkProjects} from '@api/incomeMeetingApi'
 
 export default {
   name: 'WorkingGroupMemberUnitModule',
-  components: { JUpload, JMonthDate, CompanySelect, SelectContacts, SelectRevenueContract, JDictSelectTag },
+  components: { JUpload, JDate, JMonthDate, CompanySelect, SelectContacts, SelectRevenueContract, JDictSelectTag },
   mixins: [CalcAmountMixin],
   props: {
     // 默认来款方式（收入合同新增工作组项目，来款方式默认为2--合同）