From a1f5f9f9502746aac68fb494041f623b07b65778 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 24 Sep 2021 19:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E6=B6=88=E6=81=AF=E6=9D=83=E9=99=90=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/imgs/icon/icon_template.png        | Bin 0 -> 687 bytes
 src/components/ProjectDetailModal.vue         |   3 +-
 src/components/tools/DynamicNotice.vue        |   6 +-
 .../meetManage/SignUpInfoDetail.vue           |   1 +
 .../message/SysMessageTemplateList.vue        | 129 +++++++++--------
 .../projectManagement/CommitteeMeeting.vue    |   2 +-
 .../ConferenceMaintenance.vue                 |   2 +-
 .../InternationalSeminar.vue                  |   2 +-
 src/views/projectManagement/OtherMeeting.vue  |   2 +-
 src/views/system/UserAnnouncementList.vue     | 137 ++++++++++--------
 10 files changed, 155 insertions(+), 129 deletions(-)
 create mode 100644 src/assets/imgs/icon/icon_template.png

diff --git a/src/assets/imgs/icon/icon_template.png b/src/assets/imgs/icon/icon_template.png
new file mode 100644
index 0000000000000000000000000000000000000000..784e765162273a25743ab1e7164d6c34a85dac1a
GIT binary patch
literal 687
zcmV;g0#N;lP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%X-PyuRA@u(T0L(QK@goe7nbPLkOpcxBGCc`NEAlGo}q>+QVIm3Ks0<bP(njP
zLpmg8*0Ly|pdddW1r-GiZlFQRFR(o5th;alle@j_-Z{!`V_AAT``&!q?3@lETSW8(
z03PT6SN!*>s-}DabE3@r!^}>vIPnENMEoft>jwl7ksSx}IY(7pIDbC^e+js}qGCQ*
z7NDv-t0aPmE&)I%ptYcM5opczfBIBc0}EedxtMw*=$g;x(_XLlUPShm84gkd%)DV{
zyFr;BG`6FvOM6fd0Yr2S06s(%AgX#ZS_HBbN-t3tBZ$~DGj-0rjVd4l@k%Cxq)?@k
zB7r&qksMpuY|scW^O}hKs(g9?U@!qhbRPg70Kgg|o)eL;0r-`g2q_@Fljogye>N>L
zVCL&)cD|HV0g!g$@p!!bzdel!7!HTGk|cTKL%x7r>X5<}=I8?r5gi%<BH99gS2YDR
z(uofhz|8Arb_W11_=qsGZ_c^R)>Fubv=6qi8t@_IgY5+5-YP3%AFujg8;!tVFgVrk
z_q~dEHk(Z+lgYI8A|@gRfOkIL&9R8MDI%|<&I4sBbi}vZaYxFmBbGI?s{rr}05*K0
zU}n=KNp6V9msTU-L)r)1Xc7AmtBUOeoTxs~%>zpcqp=zwqPqa_qH1v#ab~vdoV(rX
zW0aY%nA!6>eE<=+RP|$Q0qL}rPF?A`r>ZaOc-wbRuoTJ)^ifIx5g&@kCtosk@WBMs
zIXuLklP4gA*CN=c{8}Z#*<nro^QpmTH2RK+XTly6$69*zcFvt$JV*+6oMZX9&2NYZ
Vj8DB2<30cY002ovPDHLkV1kE)C*}YE

literal 0
HcmV?d00001

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index 2860e20..4c3cef9 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -253,6 +253,7 @@ export default {
   },
   methods: {
     open(record) {
+      this.visible = true
       // 记录当前项目id
       this.currentProjectId = record.id
       // 通过id查询项目详情
@@ -269,7 +270,7 @@ export default {
           console.log('未查到相应的信息')
         }
       })
-      this.visible = true
+
     },
     handleCancel() {
       this.visible = false
diff --git a/src/components/tools/DynamicNotice.vue b/src/components/tools/DynamicNotice.vue
index 02cb7fc..fb61b5a 100644
--- a/src/components/tools/DynamicNotice.vue
+++ b/src/components/tools/DynamicNotice.vue
@@ -17,9 +17,9 @@
     computed: {
       comp: function () {
         if(!this.path){
-          return null;
+          return null
         }
-        return () => import(`@/views/${this.path}.vue`)
+        return resolve => require([`@/components${this.path}.vue`], resolve)
       }
     },
     props: ['path','formData'],
@@ -27,7 +27,7 @@
       detail () {
         setTimeout(() => {
           if(this.path){
-            this.$refs.compModel.view(this.formData);
+            this.$refs.compModel.open(this.formData)
           }
         }, 200)
       },
diff --git a/src/views/incomePayments/meetManage/SignUpInfoDetail.vue b/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
index 5071b9a..1dc4b4f 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
@@ -263,6 +263,7 @@ import {getSingUpUserInfo} from '@api/incomeMeetingApi'
 import JImageUpload from '@comp/jero/JImageUpload'
 import PreviewFile from '@comp/jero/PreviewFile'
 
+
 export default {
   name: 'SignUpInfoDetail',
   components: {
diff --git a/src/views/modules/message/SysMessageTemplateList.vue b/src/views/modules/message/SysMessageTemplateList.vue
index bcf42f9..9d9eeb4 100644
--- a/src/views/modules/message/SysMessageTemplateList.vue
+++ b/src/views/modules/message/SysMessageTemplateList.vue
@@ -1,60 +1,62 @@
 <template>
-  <a-card :bordered="false">
+ <div>
+   <page-header-title :img-for-icon="IconImg"></page-header-title>
+   <a-card :bordered="false">
 
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
+     <!-- 查询区域 -->
+     <div class="table-page-search-wrapper">
+       <a-form layout="inline" @keyup.enter.native="searchQuery">
+         <a-row :gutter="24">
 
-          <a-col :xl="6" :lg="8" :md="8" :sm="24">
-            <a-form-item label="模板CODE">
-              <a-input placeholder="请输入模板CODE" v-model="queryParam.templateCode"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="8" :md="8" :sm="24">
-            <a-form-item label="模板内容">
-              <a-input placeholder="请输入模板内容" v-model="queryParam.templateContent"></a-input>
-            </a-form-item>
-          </a-col>
+           <a-col :xl="6" :lg="8" :md="8" :sm="24">
+             <a-form-item label="模板CODE">
+               <a-input placeholder="请输入模板CODE" v-model="queryParam.templateCode"></a-input>
+             </a-form-item>
+           </a-col>
+           <a-col :xl="6" :lg="8" :md="8" :sm="24">
+             <a-form-item label="模板内容">
+               <a-input placeholder="请输入模板内容" v-model="queryParam.templateContent"></a-input>
+             </a-form-item>
+           </a-col>
 
-            <a-col :xl="6" :lg="8" :md="8" :sm="24">
-              <a-form-item label="模板标题">
-<!--                <a-input placeholder="请输入模板标题" v-model="queryParam.templateName"></a-input>-->
-                <j-dict-select-tag placeholder="请选择模板标题" dictCode="notice_type" v-model="queryParam.templateName"></j-dict-select-tag>
-              </a-form-item>
-            </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+           <a-col :xl="6" :lg="8" :md="8" :sm="24">
+             <a-form-item label="模板标题">
+               <!--                <a-input placeholder="请输入模板标题" v-model="queryParam.templateName"></a-input>-->
+               <j-dict-select-tag placeholder="请选择模板标题" dictCode="notice_type" v-model="queryParam.templateName"></j-dict-select-tag>
+             </a-form-item>
+           </a-col>
+           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchQuery" icon="search" v-has="'template:list'">查询</a-button>
               <a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
             </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+           </a-col>
+         </a-row>
+       </a-form>
+     </div>
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-    </div>
+     <!-- 操作按钮区域 -->
+     <div class="table-operator">
+       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+     </div>
 
-    <!-- table区域-begin -->
-    <div>
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
+     <!-- table区域-begin -->
+     <div>
+       <a-table
+         ref="table"
+         size="middle"
+         bordered
+         rowKey="id"
+         :columns="columns"
+         :dataSource="dataSource"
+         :pagination="ipagination"
+         :loading="loading"
+         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+         class="j-table-force-nowrap"
+         @change="handleTableChange">
 
-        <!-- 字符串超长截取省略号显示-->
-        <span slot="templateContent" slot-scope="text">
+         <!-- 字符串超长截取省略号显示-->
+         <span slot="templateContent" slot-scope="text">
           <a-tooltip>
             <template slot="title">
               <span v-html="text"></span>
@@ -63,25 +65,26 @@
           </a-tooltip>
         </span>
 
-        <template slot="text" slot-scope="text">
-          <j-ellipsis v-if="text" :length="20" :value="text"></j-ellipsis>
-          <span v-else></span>
-        </template>
+         <template slot="text" slot-scope="text">
+           <j-ellipsis v-if="text" :length="20" :value="text"></j-ellipsis>
+           <span v-else></span>
+         </template>
 
-        <span slot="action" class="action-span-cell" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+         <span slot="action" class="action-span-cell" slot-scope="text, record">
+          <a @click="handleEdit(record)" v-has="'template:list'">编辑</a>
           <a @click="handleDelete(record.id)">删除</a>
         </span>
 
-      </a-table>
-    </div>
-    <!-- table区域-end -->
+       </a-table>
+     </div>
+     <!-- table区域-end -->
 
-    <!-- 表单区域 -->
-    <sysMessageTemplate-modal ref="modalForm" @ok="modalFormOk"></sysMessageTemplate-modal>
+     <!-- 表单区域 -->
+     <sysMessageTemplate-modal ref="modalForm" @ok="modalFormOk"></sysMessageTemplate-modal>
 
-    <sysMessageTest-modal ref="testModal"></sysMessageTest-modal>
-  </a-card>
+     <sysMessageTest-modal ref="testModal"></sysMessageTest-modal>
+   </a-card>
+ </div>
 </template>
 
 <script>
@@ -91,6 +94,8 @@ import {JeroListMixin} from '@/mixins/JeroListMixin'
 import JEllipsis from '@/components/jero/JEllipsis'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import '@/assets/less/TableExpand.less'
+import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
+import IconImg from '@/assets/imgs/icon/icon_template.png'
 
 export default {
   name: 'SysMessageTemplateList',
@@ -99,11 +104,13 @@ export default {
     SysMessageTemplateModal,
     SysMessageTestModal,
     JEllipsis,
-    JDictSelectTag
+    JDictSelectTag,
+    PageHeaderTitle
   },
   data() {
     return {
       description: '消息模板管理页面',
+      IconImg,
       // 表头
       columns: [
         {
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index 9ef78f8..7a960fd 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -73,7 +73,7 @@
 
       <!--    操作按钮区域-->
       <div class="table-operator">
-        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'committeeMeeting:add'">新增</a-button>
+        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'meeting:add'">新增</a-button>
         <a-button type="primary" icon="export" @click="handleExportXls('工作组会议维护')" v-has="'committeeMeeting:export'">导出</a-button>
         <a-button type="danger" icon="delete" @click="batchDel" v-has="'committeeMeeting:batchDel'">批量删除</a-button>
         <!--只有工作会议与分标委会议才有-->
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index 38433c9..ffd4bee 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -78,7 +78,7 @@
 
     <!--    操作按钮区域-->
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="handleAdd" v-has="'workingGroupConference:add'" v-if="canOperate">新增</a-button>
+      <a-button type="primary" icon="plus" @click="handleAdd" v-has="'meeting:add'" v-if="canOperate">新增</a-button>
       <a-button type="primary" icon="export" @click="handleExportXls('工作组会议维护')"
                 v-has="'workingGroupConference:export'">导出
       </a-button>
diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue
index b15f1c0..8578d37 100644
--- a/src/views/projectManagement/InternationalSeminar.vue
+++ b/src/views/projectManagement/InternationalSeminar.vue
@@ -63,7 +63,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'internationalSeminar:add'">新增</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'meeting:add'">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('会议管理')" v-has="'internationalSeminar:export'">导出</a-button>
       <a-button type="danger" icon="delete" @click="batchDel" v-has="'internationalSeminar:batchDel'">批量删除</a-button>
     </div>
diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue
index dada4cb..053e586 100644
--- a/src/views/projectManagement/OtherMeeting.vue
+++ b/src/views/projectManagement/OtherMeeting.vue
@@ -63,7 +63,7 @@
 
       <!-- 操作按钮区域 -->
       <div class="table-operator">
-        <a-button @click="handleAdd" type="primary" icon="plus" v-has="'otherMeeting:add'">新增</a-button>
+        <a-button @click="handleAdd" type="primary" icon="plus" v-has="'meeting:add'">新增</a-button>
         <a-button type="primary" icon="download" @click="handleExportXls('会议管理')" v-has="'otherMeeting:export'">导出</a-button>
         <a-button type="danger" icon="delete" @click="batchDel" v-has="'otherMeeting:batchDel'">批量删除</a-button>
       </div>
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 5adbf74..75c0ce1 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -1,63 +1,66 @@
 <template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
+ <div>
+   <page-header-title :img-for-icon="IconImg"></page-header-title>
+   <a-card :bordered="false">
+     <!-- 查询区域 -->
+     <div class="table-page-search-wrapper">
+       <a-form layout="inline" @keyup.enter.native="searchQuery">
+         <a-row :gutter="24">
 
-          <a-col :xl="7" :lg="8" :md="8" :sm="24">
-            <a-form-item label="提醒类型">
-              <j-dict-select-tag dict-code="message_type" placeholder="请选择提醒类型"
-                                 v-model="queryParam.titile"></j-dict-select-tag>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="10" :lg="11" :md="12" :sm="24">
-            <a-form-item label="提醒时间">
-              <j-date
-                placeholder="请选择开始日期"
-                class="query-group-cust"
-                v-model="queryParam.meetingStartTime"
-                :disabled-date="disabledStartDate">
-              </j-date>
-              <span class="query-group-split-cust"></span>
-              <j-date
-                placeholder="请选择结束日期"
-                class="query-group-cust"
-                v-model="queryParam.meetingEndTime"
-                :disabled-date="disabledEndDate">
-              </j-date>
-            </a-form-item>
-          </a-col>
+           <a-col :xl="7" :lg="8" :md="8" :sm="24">
+             <a-form-item label="提醒类型">
+               <j-dict-select-tag dict-code="notice_type" placeholder="请选择提醒类型"
+                                  v-model="queryParam.titile"></j-dict-select-tag>
+             </a-form-item>
+           </a-col>
+           <a-col :xl="10" :lg="11" :md="12" :sm="24">
+             <a-form-item label="提醒时间">
+               <j-date
+                 placeholder="请选择开始日期"
+                 class="query-group-cust"
+                 v-model="queryParam.meetingStartTime"
+                 :disabled-date="disabledStartDate">
+               </j-date>
+               <span class="query-group-split-cust"></span>
+               <j-date
+                 placeholder="请选择结束日期"
+                 class="query-group-cust"
+                 v-model="queryParam.meetingEndTime"
+                 :disabled-date="disabledEndDate">
+               </j-date>
+             </a-form-item>
+           </a-col>
 
-          <a-col :xl="6" :lg="8" :md="8" :sm="24">
+           <a-col :xl="6" :lg="8" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchQuery" icon="search" v-has="'messge:list'">查询</a-button>
               <a-button class="reset-button" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
-          </a-col>
+           </a-col>
 
-        </a-row>
-      </a-form>
-    </div>
+         </a-row>
+       </a-form>
+     </div>
 
-    <a-table
-      ref="table"
-      size="default"
-      bordered
-      rowKey="id"
-      :columns="columns"
-      :dataSource="dataSource"
-      :pagination="ipagination"
-      :loading="loading"
-      class="j-table-force-nowrap"
-      @change="handleTableChange">
+     <a-table
+       ref="table"
+       size="default"
+       bordered
+       rowKey="id"
+       :columns="columns"
+       :dataSource="dataSource"
+       :pagination="ipagination"
+       :loading="loading"
+       class="j-table-force-nowrap"
+       @change="handleTableChange">
       <span slot="action" class="action-span-cell" slot-scope="text, record">
-        <a @click="showAnnouncement(record)">查看</a>
-          <a @click="haveRead(record)">已读</a>
+        <a @click="showAnnouncement(record)" v-has=" 'message:show' ">查看</a>
+        <a @click="haveRead(record)" v-if="record.readFlag === '0' " v-has=" 'message:read' ">已读</a>
+         <a class="readed" v-if="record.readFlag === '1' ">已读</a>
       </span>
 
-      <span slot="templateContent" slot-scope="text">
-          <a-tooltip>
+       <span slot="templateContent" slot-scope="text">
+          <a-tooltip placemen="topRight" arrow-point-at-center>
             <template slot="title">
               <span v-html="text"></span>
             </template>
@@ -65,14 +68,15 @@
           </a-tooltip>
         </span>
 
-      <template slot="text" slot-scope="text">
-        <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
-        <span v-else></span>
-      </template>
-    </a-table>
-    <show-announcement ref="ShowAnnouncement"></show-announcement>
-    <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>
-  </a-card>
+       <template slot="text" slot-scope="text">
+         <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
+         <span v-else></span>
+       </template>
+     </a-table>
+     <show-announcement ref="ShowAnnouncement"></show-announcement>
+     <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>
+   </a-card>
+ </div>
 </template>
 
 <script>
@@ -84,6 +88,8 @@ import DynamicNotice from '../../components/tools/DynamicNotice'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import '@/assets/less/TableExpand.less'
 import JDate from '@comp/tools/JDate'
+import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
+import IconImg from '@/assets/imgs/icon/icon_message.png'
 
 export default {
   name: 'UserAnnouncementList',
@@ -92,12 +98,14 @@ export default {
     DynamicNotice,
     ShowAnnouncement,
     JDictSelectTag,
-    JDate
+    JDate,
+    PageHeaderTitle
   },
   data() {
     return {
       description: '系统通告表管理页面',
       queryParam: {},
+      IconImg,
       columns: [
         {
           title: '序号',
@@ -165,11 +173,15 @@ export default {
       })
       if (record.openType === 'component') {
         this.openPath = record.openPage
+        // 将参数传入
         this.formData = {id: record.busId}
         this.$refs.showDynamNotice.detail()
-      } else if(record.openType === 'url1') {
+      } else if(record.openType === 'url') {
+        const param = {id: record.busId}
+        // 如果是url 跳转页面
         this.$router.push({
-          path:record.openPage
+          path:record.openPage,
+          query:param
         })
       }else {
         this.$refs.ShowAnnouncement.detail(record)
@@ -241,4 +253,9 @@ z
   height: 90% !important;
   overflow-y: hidden
 }
+.readed {
+  user-select: none;
+  color: #999;
+  pointer-events: none;
+}
 </style>
\ No newline at end of file