From ac661971296c1be668394fee12b341b0a87d20b3 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 17 Feb 2023 09:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E6=B1=87=E6=80=BB=20=E5=B7=A5=E4=BD=9C=E7=BB=84?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/EmailErrorMsgModal.vue            |  7 ++++-
 .../modules/PublishRemindModal.vue            | 29 ++++++++++++++++---
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/views/projectManagement/modules/EmailErrorMsgModal.vue b/src/views/projectManagement/modules/EmailErrorMsgModal.vue
index 33d502a..0eb7199 100644
--- a/src/views/projectManagement/modules/EmailErrorMsgModal.vue
+++ b/src/views/projectManagement/modules/EmailErrorMsgModal.vue
@@ -38,6 +38,11 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
+/deep/ .ant-modal-body {
+  overflow: auto;
+  max-height: 500px;
+}
+
 
 </style>
\ No newline at end of file
diff --git a/src/views/projectManagement/modules/PublishRemindModal.vue b/src/views/projectManagement/modules/PublishRemindModal.vue
index 5d6475a..3b84ae1 100644
--- a/src/views/projectManagement/modules/PublishRemindModal.vue
+++ b/src/views/projectManagement/modules/PublishRemindModal.vue
@@ -24,7 +24,16 @@
             </a-form-item>
           </a-col>
 
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="8" :lg="8" :md="8" :sm="24">
+            <a-form-item label="已提醒" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag style="width: 100%"
+                                 dict-code="yn"
+                                 v-model="queryParam.remind"
+                                 placeholder="请选择提醒类型"></j-dict-select-tag>
+            </a-form-item>
+          </a-col>
+
+          <a-col :xl="4" :lg="8" :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" class="reset-button">重置</a-button>
@@ -61,17 +70,22 @@
           <a @click="handleDelete(record.id)">删除</a>
         </span>
     </a-table>
+    <email-error-msg-modal ref="emailError"></email-error-msg-modal>
   </j-modal>
 </template>
 
 <script>
 import {JeroListMixin} from '@/mixins/JeroListMixin'
 import {publishRemind,commitePublishRemind,councilPublishRemind} from '@api/incomePaymentsApi'
+import EmailErrorMsgModal from '@views/projectManagement/modules/EmailErrorMsgModal'
 
 
 export default {
   name: 'PublishRemindModal',
   mixins: [JeroListMixin],
+  components:{
+    EmailErrorMsgModal
+  },
   data() {
     return {
       title: '操作',
@@ -194,7 +208,7 @@ export default {
       url: {
         add: '/project/payCommonProject/add',
         edit: '/project/payCommonProject/edit',
-        list: '/project/payWorkingGroupSubitem/list',
+        list: '/project/payWorkingGroupSubitem/publishReminderList',
       },
       // 会议维护选中的会议
       selectedMetingList: [],
@@ -253,7 +267,7 @@ export default {
       }
       this.confirmLoading = true
       if (this.selectionRows.length === 0) {
-        this.$message.warn('请至少选择一个成员单位')
+        this.$message.warn('请至少选择一个成员')
         this.confirmLoading = false
         return
       } else {
@@ -295,9 +309,16 @@ export default {
             }, 1000)
           })
         } else {
+          param.workingGroupId = this.$route.query.workingGroupProjectId
           publishRemind(param).then(res => {
             if (res.success) {
-              this.$message.success(res.message)
+              // this.$message.success(res.result)
+              if (Array.isArray(res.result) && res.result.length > 0) {
+                // msgWarn(this,res.result,0)
+                this.$refs.emailError.open()
+                this.$refs.emailError.msgList = res.result
+                console.log(this.$refs.emailError.msgList, 'this.$refs.emailError.msgList ')
+              }
               this.$emit('ok')
               this.confirmLoading = false
               this.handleCancel()