From 7332f26f7c5dea12f7f49e57a660c8cd818b469c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 16 Aug 2023 17:11:38 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E8=AE=AE=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=8F=90=E9=86=92=E5=8C=BA=E5=88=86=E6=8F=90=E9=86=92=E5=92=8C?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/PublishRemindModal.vue            | 44 ++++++++++++++++---
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/views/projectManagement/modules/PublishRemindModal.vue b/src/views/projectManagement/modules/PublishRemindModal.vue
index bd1b67c..2f2e6f6 100644
--- a/src/views/projectManagement/modules/PublishRemindModal.vue
+++ b/src/views/projectManagement/modules/PublishRemindModal.vue
@@ -12,19 +12,19 @@
       <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' || $route.query.meetingType === '6'  ">
+          <a-col :xl="8" :lg="8" :md="8" :sm="12" 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="8" :lg="8" :md="8" :sm="12" v-else>
             <a-form-item label="成员单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入成员单位" v-model="queryParam.chargeCompanyTemporaryName"></a-input>
             </a-form-item>
           </a-col>
 
-          <a-col :xl="8" :lg="8" :md="8" :sm="24">
+          <a-col :xl="6" :lg="6" :md="6" :sm="12">
             <a-form-item label="已提醒" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag style="width: 100%"
                                  dict-code="yn"
@@ -33,6 +33,15 @@
             </a-form-item>
           </a-col>
 
+          <a-col :xl="6" :lg="6" :md="6" :sm="12">
+            <a-form-item label="邮件提醒" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag style="width: 100%"
+                                 dict-code="yn"
+                                 v-model="queryParam.mailRemind"
+                                 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>
@@ -90,7 +99,7 @@ export default {
   data() {
     return {
       title: '操作',
-      width: 800,
+      width: 1200,
       visible: false,
       confirmLoading: false,
       form: this.$form.createForm(this),
@@ -122,12 +131,19 @@ export default {
           scopedSlots: {customRender: 'text'}
         },
         {
-          title: '邮件提醒',
+          title: '是否提醒',
           align: 'center',
           width: 200,
           dataIndex: 'remind_dictText',
           // scopedSlots: {customRender: 'text'}
         },
+        {
+          title: '邮件提醒',
+          align: 'center',
+          width: 200,
+          dataIndex: 'mailRemind_dictText',
+          // scopedSlots: {customRender: 'text'}
+        },
       ],
       // 分标委发布提醒 表头
       commitColumns: [
@@ -156,12 +172,19 @@ export default {
           scopedSlots: {customRender: 'text'}
         },
         {
-          title: '邮件提醒',
+          title: '是否提醒',
           align: 'center',
           width: 200,
           dataIndex: 'remind_dictText',
           // scopedSlots: {customRender: 'text'}
         },
+        {
+          title: '邮件提醒',
+          align: 'center',
+          width: 200,
+          dataIndex: 'mailRemind_dictText',
+          // scopedSlots: {customRender: 'text'}
+        },
       ],
       // 理事会成员的表头
       councilColumns: [
@@ -190,12 +213,19 @@ export default {
           scopedSlots: {customRender: 'text'}
         },
         {
-          title: '邮件提醒',
+          title: '是否提醒',
           align: 'center',
           width: 200,
           dataIndex: 'remind_dictText',
           // scopedSlots: {customRender: 'text'}
         },
+        {
+          title: '邮件提醒',
+          align: 'center',
+          width: 200,
+          dataIndex: 'mailRemind_dictText',
+          // scopedSlots: {customRender: 'text'}
+        },
       ],
       model: {},
       labelCol: {