From 89d2fc181148c428fa4492c63a71296f6d89da86 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 15 Dec 2021 10:27:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BC=80=E5=8F=91=E3=80=91=E7=90=86?=
 =?UTF-8?q?=E4=BA=8B=E4=BC=9A=E7=BC=96=E8=BE=91=20=E6=9F=A5=E8=AF=A2=20?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=8F=90=E9=86=92=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js                  |  3 +
 .../meetManage/AddOrDetailMeet.vue            |  5 +-
 .../modules/UploadMeetFileModal.vue           |  4 +-
 .../memberManage/CouncilMeetingManage.vue     |  3 +-
 .../CouncilMaintenanceList.vue                |  3 +-
 .../modules/PublishRemindModal.vue            | 76 ++++++++++++++++---
 6 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 7a7cd38..5b92810 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -8,6 +8,8 @@ const getChargeNotice = (param) => getAction('/project/payWorkingGroupSubitem/ge
 const publishRemind = (param) => postAction('/meeting/workGroupMeeting/publishReminder', param)
 // 分标委会议的发布提醒
 const commitePublishRemind = (param) => postAction('/meeting/committeeMeeting/publishReminder',param)
+// 理事会的发布提醒
+const councilPublishRemind = (param) => postAction('/meeting/councilMeeting/publishReminder',param)
 // 通过id获取收入合同信息
 const getRevenueContractById = (param) => getAction('/contract/payIncomeContract/queryById', param)
 // 收入合同审核
@@ -143,5 +145,6 @@ export {
   getPrintPostContactByMailId,
   getUserByDepartCode,
   cancellationContract,
+  councilPublishRemind,
   cancellationExpenditureContract
 }
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 11e5b37..b2cd990 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -304,7 +304,7 @@
           <!--联系方式end-->
           <!--通知正文begin-->
           <!--只有分标委会议与工作组会议才有-->
-          <template v-if="meetingType === '1' || meetingType === '5' ">
+          <template v-if="meetingType === '1' || meetingType === '5' || meetingType === '6' ">
             <div class="item-title">通知文件</div>
             <a-row :gutter="24">
               <a-col :xxl="18" :xl="18" :sm="24">
@@ -604,7 +604,8 @@ export default {
           // 如果是理事会会议需要加上理事会id与会议类型
           if (this.isCouncilIdId) {
             formData.meetingType = '6'
-            formData.caseCommitteeId = this.$route.query.councilIdId
+            formData.councilId = this.$route.query.councilId
+            formData.councilName = this.$route.query.connccilName
           }
           // 转换召开时间
           formData.startTime = this.newConvokeTime[0]
diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
index 232f5b9..a5a7ffe 100644
--- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
@@ -139,8 +139,8 @@ export default {
         // 理事会会议
         case '6':
           return {
-            uploadFile: '/meeting/committeeMeeting/uploadFile',
-            uploadCouncilFile: '/councilMeeting/uploadCouncilFile',
+            uploadFile: '/meeting/councilMeeting/uploadFile',
+            uploadCouncilFile: '/meeting/councilMeeting/uploadCouncilFile',
           }
       }
     },
diff --git a/src/views/incomePayments/memberManage/CouncilMeetingManage.vue b/src/views/incomePayments/memberManage/CouncilMeetingManage.vue
index 4b4a26a..0f89f26 100644
--- a/src/views/incomePayments/memberManage/CouncilMeetingManage.vue
+++ b/src/views/incomePayments/memberManage/CouncilMeetingManage.vue
@@ -259,7 +259,6 @@ export default {
     this.councilName = this.$route.query.councilName
     this.councilId = this.$route.query.councilId
     this.filters.councilId = this.councilId
-    this.filters.councilName = this.councilName
     this.loadData(1)
   },
   methods: {
@@ -275,10 +274,12 @@ export default {
     handleAdd() {
       // 记录当前的理事会id
       let currentId = this.$route.query.councilId
+      let currentName = this.$route.query.councilName
       this.$router.push({
         path: '/incomePayments/meetManage/AddOrDetailMeet',
         query: {
           councilId: currentId,
+          connccilName:currentName,
           meetingType: '6'
         }
       })
diff --git a/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue b/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue
index d621c24..49f061a 100644
--- a/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue
+++ b/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue
@@ -241,7 +241,8 @@ export default {
         path:'/incomePayments/memberManage/councilMeetingManage',
         query:{
           councilId:record.id,
-          councilName:record.name
+          councilName:record.name,
+          meetingType:'6'
         }
       })
     },
diff --git a/src/views/projectManagement/modules/PublishRemindModal.vue b/src/views/projectManagement/modules/PublishRemindModal.vue
index e479674..8cf075e 100644
--- a/src/views/projectManagement/modules/PublishRemindModal.vue
+++ b/src/views/projectManagement/modules/PublishRemindModal.vue
@@ -11,14 +11,14 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row>
-          <!-- 分标委发布显示这个查询条件-->
-          <a-col :xl="10" :lg="10" :md="10" :sm="24" v-if="$route.query.meetingType === '5' ">
+          <!-- 分标委或理事会发布显示这个查询条件-->
+          <a-col :xl="10" :lg="10" :md="10" :sm="24" v-if="$route.query.meetingType === '5' || $route.query.meetingType === '6'  ">
             <a-form-item label="成员单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入成员单位" v-model="queryParam.companyName"></a-input>
             </a-form-item>
           </a-col>
           <!--工作组发布显示这个-->
-          <a-col :xl="10" :lg="10" :md="10" :sm="24" v-else>
+          <a-col :xl="10" :lg="10" :md="10" :sm="24" v-else>CommitteeMeeting
             <a-form-item label="成员单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入成员单位" v-model="queryParam.chargeCompanyTemporaryName"></a-input>
             </a-form-item>
@@ -27,7 +27,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
-              <a-button icon="reload" @click="searchReset">重置</a-button>
+              <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -66,7 +66,7 @@
 
 <script>
 import {JeroListMixin} from '@/mixins/JeroListMixin'
-import {publishRemind,commitePublishRemind} from '@api/incomePaymentsApi'
+import {publishRemind,commitePublishRemind,councilPublishRemind} from '@api/incomePaymentsApi'
 
 
 export default {
@@ -148,6 +148,40 @@ export default {
           // scopedSlots: {customRender: 'text'}
         },
       ],
+      // 理事会成员的表头
+      councilColumns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '成员单位',
+          align: 'center',
+          width: 200,
+          dataIndex: 'companyName',
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '企业联系人',
+          align: 'center',
+          width: 200,
+          dataIndex: 'peopleName',
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '是否提醒',
+          align: 'center',
+          width: 200,
+          dataIndex: 'remind_dictText',
+          // scopedSlots: {customRender: 'text'}
+        },
+      ],
       model: {},
       labelCol: {
         xs: {span: 24},
@@ -165,7 +199,7 @@ export default {
       // 会议维护选中的会议
       selectedMetingList: [],
       newColumns: [],
-      // 提醒类型 1 是工作组 2 是分标委
+      // 提醒类型 1 是工作组 2 是分标委 3是理事会
       remindType:'',
     }
   },
@@ -175,8 +209,7 @@ export default {
       this.visible = true
       // 保存选中的会议
       this.selectedMetingList = [...meetingList]
-      // 列表需要工作组id参数
-      this.filters.workingGroupId = this.$route.query.workingGroupProjectId
+
       // 分标委会议需要分标标委的id
       if (this.$route.query.meetingType === '5') {
         // 分标委
@@ -185,7 +218,15 @@ export default {
         this.remindType = 2
         // 分标委成员
         this.url.list = '/payCaseCommitteeSubitem/payCaseCommitteeSubitem/list'
+      } else if(this.$route.query.meetingType === '6') {
+        this.newColumns = [...this.councilColumns]
+        this.filters.id = this.$route.query.councilId
+        //理事会成员的接口
+        this.url.list = '/payCaseCouncilSubitem/payCaseCouncilSubitem/list'
+        this.remindType = 3
       } else {
+        // 列表需要工作组id参数
+        this.filters.workingGroupId = this.$route.query.workingGroupProjectId
         // 工作组
         this.remindType = 1
         this.newColumns = [...this.columns]
@@ -203,6 +244,7 @@ export default {
     },
     close() {
       this.$emit('close')
+      this.newColumns = []
       this.visible = false
     },
     handleOk() {
@@ -236,7 +278,23 @@ export default {
               this.confirmLoading = false
             }, 1000)
           })
-        }else {
+        }else if(this.$route.query.meetingType === '6'){
+          // 理事会的用理事会的发布提醒
+          councilPublishRemind(param).then(res => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.$emit('ok')
+              this.confirmLoading = false
+              this.handleCancel()
+            } else {
+              this.$message.warn(res.message)
+            }
+          }).finally(() => {
+            setTimeout(() => {
+              this.confirmLoading = false
+            }, 1000)
+          })
+        } else {
           publishRemind(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)