From f0d8f5fab2204d0e8093d84d08c53571b334b303 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 21 Oct 2021 11:45:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E7=BD=91=E5=91=98=E6=88=90=E5=91=98=E7=9A=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E5=88=86=E6=A0=87=E5=A7=94=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E7=9A=84=E4=B8=80=E6=8F=90=E9=86=92=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=20=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/SelectMemberProjectModule.vue      | 18 +++++++++---------
 .../modules/SafeguardMemberModal.vue           |  2 +-
 .../projectManagement/CommitteeMeeting.vue     |  7 +++++++
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue
index 954d4b2..49733b8 100644
--- a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue
@@ -13,16 +13,16 @@
         <a-tab-pane key="1" tab="会员项目">
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row>
-              <!--              <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-              <!--                <a-form-item label="会员项目" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-              <!--                  <a-input placeholder="请输入会员项目" v-model="queryParam.workingGroupProject"></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-year-date placeholder="请选择运行年份" v-model="queryParam.particularYear"></j-year-date>
+                <a-form-item label="会员项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入会员项目" v-model="queryParam.projectName"  :maxLength='50'></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-year-date placeholder="请选择运行年份" v-model="queryParam.particularYear"></j-year-date>-->
+<!--                </a-form-item>-->
+<!--              </a-col>-->
 
               <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
@@ -115,7 +115,7 @@
 <script>
 import {associatedProject} from '@api/incomePaymentsApi'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
-import JYearDate from '@comp/jero/JYearDate'
+// import JYearDate from '@comp/jero/JYearDate'
 import StatusSlot from '@comp/tools/StatusSlot'
 import JEllipsis from '@comp/jero/JEllipsis'
 import AddMemberProject from '@views/contractManagement/revenueContract/modules/AddMemberProject'
@@ -124,7 +124,7 @@ export default {
   name: 'SelectMemberProjectModule',
   mixins: [JeroListMixin],
   components: {
-    JYearDate,
+    // JYearDate,
     StatusSlot,
     JEllipsis,
     AddMemberProject
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 8f63e73..db32292 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -173,8 +173,8 @@
                 file-type="pdf"
                 file-type-error-message="请上传收费通知"
                 :multiple="false"
+                :return-id="true"
                 :number="1"
-                bizPath="payment"
                 v-decorator="['chargeNoticeFileId']"
                 :trigger-change="true"
               ></j-upload>
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index 02b9e75..134bdba 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -185,6 +185,13 @@ export default {
           width: 100,
           scopedSlots: {customRender: 'text'}
         },
+        {
+          title: '已提醒',
+          align: 'center',
+          dataIndex: 'remind_dictText',
+          width: 80,
+          scopedSlots: {customRender: 'text'}
+        },
         {
           title: '负责人',
           align: 'center',