From becb61f9e12ad6ab354706f85ca58926b5fa5a90 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 16 Nov 2023 11:24:38 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=88=91=E7=9A=84=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/personCenter.js                     |   8 +-
 src/common/lang/en-us.js                    |   7 +-
 src/common/lang/zh-cn.js                    |   9 +-
 src/views/system/UserAnnouncementDetail.vue |  35 ++++
 src/views/system/UserAnnouncementList.vue   | 180 +++++++++++---------
 5 files changed, 148 insertions(+), 91 deletions(-)
 create mode 100644 src/views/system/UserAnnouncementDetail.vue

diff --git a/src/api/personCenter.js b/src/api/personCenter.js
index bb788a50..03bfd997 100644
--- a/src/api/personCenter.js
+++ b/src/api/personCenter.js
@@ -1,4 +1,4 @@
-import { postAction } from './manage'
+import { getAction, postAction } from './manage'
 
 // 我的收藏-取消收藏
 const cancelCollect = (params) => postAction('/personal/lawsStandardCollection/delete', params)
@@ -6,7 +6,11 @@ const cancelCollect = (params) => postAction('/personal/lawsStandardCollection/d
 // 浏览记录-清除浏览记录
 const clearBrowsingHistory = (params) => postAction('/personal/lawsBrowsingHistory/delete', params)
 
+// 我的消息-详情
+const getMsgDetail = (params) => getAction('/sys/sysAnnouncementSend/getDetailsById', params)
+
 export {
   cancelCollect,
-  clearBrowsingHistory
+  clearBrowsingHistory,
+  getMsgDetail
 }
diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js
index f47a17c9..e8eaa2c8 100644
--- a/src/common/lang/en-us.js
+++ b/src/common/lang/en-us.js
@@ -501,13 +501,16 @@ module.exports = {
   message: {
     // 我的消息
     my: {
+      title: 'title',
+      publisher: 'publisher',
+      readingStatus: 'readingStatus',
       messageContent: 'Message Content',
       messageType: 'Message Type',
-      allLabelsRead: 'Mark as Read',
+      allLabelsRead: 'All Mark as Read',
       subscriptionNotification: 'Subscription Notification',
       warningInformation: 'Warning Information',
       forwardPush: 'Forward Push',
-      notificationTime: 'Notification Time',
+      notificationTime: 'Release Time',
       areAllLabelsRead: 'Are All Mark as Read'
     }
   },
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index c84afdcc..333253a4 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -458,7 +458,7 @@ module.exports = {
     },
     // 文档比对
     comparison: {
-      textNumber:'文本号',
+      textNumber: '文本号',
       textName: '文本名称',
       oldDocumentTextNumber: '旧文档文本号',
       oldDocumentTextName: '旧文档文本名称',
@@ -531,13 +531,16 @@ module.exports = {
   message: {
     // 我的消息
     my: {
+      title: '标题',
+      publisher: '发布人',
+      readingStatus: '阅读状态',
       messageContent: '消息内容',
       messageType: '消息类型',
-      allLabelsRead: '标记已读',
+      allLabelsRead: '全部标记已读',
       subscriptionNotification: '订阅通知',
       warningInformation: '预警信息',
       forwardPush: '转发推送',
-      notificationTime: '通知时间',
+      notificationTime: '发布时间',
       areAllLabelsRead: '是否全部标记已读'
     }
   },
diff --git a/src/views/system/UserAnnouncementDetail.vue b/src/views/system/UserAnnouncementDetail.vue
new file mode 100644
index 00000000..9c016faa
--- /dev/null
+++ b/src/views/system/UserAnnouncementDetail.vue
@@ -0,0 +1,35 @@
+<template>
+  <internal-detail-page :title="title" :loading="loading" :content-padding="0">
+    {{data}}
+  </internal-detail-page>
+</template>
+
+<script>
+import InternalDetailPage from '@comp/InternalDetailPage'
+import { getMsgDetail } from '@api/personCenter'
+export default {
+  name: 'UserAnnouncementDetail',
+  components: { InternalDetailPage },
+  data () {
+    return {
+      title: '',
+      loading: false,
+      data: {}
+    }
+  },
+  created () {
+    this.initPage()
+  },
+  methods: {
+    initPage () {
+      getMsgDetail({ ids: this.$route.query.id }).then(res => {
+        this.data = res
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 1bb99151..f8fb667f 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -6,84 +6,70 @@
         <a-row :gutter="24">
 
           <a-col :span="6">
-            <a-form-item :label="$t('message.my.messageContent')">
-              <a-input :placeholder="$t('pleaseEnter') + $t('message.my.messageContent')" v-model="queryParam.msgContent"></a-input>
+            <a-form-item :label="$t('message.my.title')">
+              <a-input :placeholder="$t('pleaseEnter') + $t('message.my.title')" v-model="queryParam.titile"></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item :label="$t('message.my.messageType')">
-              <a-select class="box-input"
-                        :placeholder="$t('pleaseSelect')+$t('message.my.messageType')"
-                        v-model="queryParam.msgCategory">
-                <a-select-option :value="undefined">{{ $t('pleaseSelect') }}</a-select-option>
-                <a-select-option v-for="(item, key) in Object.keys(msgCategoryQuery)"
-                                 :key="key" :value="item">
-                  <span style="display: inline-block;width: 100%" :title="msgCategoryQuery[item]">
-                               {{ msgCategoryQuery[item] }}
-                    </span>
-                </a-select-option>
-              </a-select>
+            <a-form-item :label="$t('message.my.publisher')">
+              <a-input :placeholder="$t('pleaseEnter') + $t('message.my.publisher')" v-model="queryParam.sender"></a-input>
             </a-form-item>
           </a-col>
+          <!--<a-col :span="6">-->
+          <!--  <a-form-item :label="$t('message.my.messageType')">-->
+          <!--    <a-select class="box-input"-->
+          <!--              :placeholder="$t('pleaseSelect')+$t('message.my.messageType')"-->
+          <!--              v-model="queryParam.msgCategory">-->
+          <!--      <a-select-option :value="undefined">{{ $t('pleaseSelect') }}</a-select-option>-->
+          <!--      <a-select-option v-for="(item, key) in Object.keys(msgCategoryQuery)"-->
+          <!--                       :key="key" :value="item">-->
+          <!--        <span style="display: inline-block;width: 100%" :title="msgCategoryQuery[item]">-->
+          <!--                     {{ msgCategoryQuery[item] }}-->
+          <!--          </span>-->
+          <!--      </a-select-option>-->
+          <!--    </a-select>-->
+          <!--  </a-form-item>-->
+          <!--</a-col>-->
 
-          <a-col :span="8" >
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
-              <a-button @click="searchReset" style="margin-left: 8px">{{ $t('reset') }}</a-button>
-            </span>
-          </a-col>
+          <div style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-button v-if="'system:userAnnouncementList:search'" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
+            <a-button @click="searchReset" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+          </div>
 
         </a-row>
       </a-form>
     </div>
 
     <div class="table-operator">
-      <div @click="readAll" class="operator-text" :title="$t('message.my.allLabelsRead')">
+      <!-- 标记已读 -->
+      <a-button type="primary" ghost @click="readAll" v-has="'system:userAnnouncementList:allLabelsRead'">
         <a-icon type="eye" />
         {{ $t('message.my.allLabelsRead') }}
-      </div>
-      <div @click="handleDel" class="operator-text">
-        <a-icon type="delete" />
-        {{ $t('batchDelete') }}
-      </div>
+      </a-button>
     </div>
 
-    <a-table
-      :components="drag(columns,'columns')"
-      ref="table"
-      rowKey="id"
-      :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-      :columns="columns"
-      :dataSource="dataSource"
-      :scroll="{x: '100%'}"
-      :pagination="ipagination"
-      :expandIconAsCell="false"
-      :expandIconColumnIndex="5"
-      :expandIcon="expandIcon"
-      :expandRowByClick="true"
-      :loading="loading"
-      @expand="expandChange"
-      @change="handleTableChange">
-      <span slot="msgTitile" slot-scope="text,scope">
-<!--         @click="msgContentClick(scope)"-->
-           <a :style="{'color':scope.readFlag === 0 ? 'red':'#00A0E9'}"
-              :title="language === 'zh-cn' && scope.msgContentCn? scope.msgContentCn : scope.msgContent">
-             {{ language === 'zh-cn' && scope.msgContentCn ? scope.msgContentCn : scope.msgContent }}
-           </a>
-      </span>
-      <span slot="msgCategory" slot-scope="text">
-<!--        :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" @click="msgContentClick(scope)"-->
-           <span :title="msgCategoryQuery[text]">
-             {{ msgCategoryQuery[text] }}
-           </span>
-      </span>
-      <p slot="expandedRowRender" slot-scope="record" style="margin: 0;padding-left: 58px;">
-        <span v-html="language === 'zh-cn' && record.msgContentInfoCn? record.msgContentInfoCn : record.msgContentInfo">
-        </span>
-      </p>
-    </a-table>
-<!--    <show-announcement ref="ShowAnnouncement"></show-announcement>-->
-<!--    <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>-->
+    <div>
+      <j-table
+        :can-drag="true"
+        :scroll="{x: '100%', y: yScrollHeight}"
+        ref="table"
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <!-- 操作 -->
+        <template v-slot:action="{text, record}">
+          <a-tooltip overlay-class-name="tooltip-style">
+            <a class="table-del" @click="handleGoDetail(record)" v-has="'system:userAnnouncementList:detail'">{{$t('view')}}</a>
+          </a-tooltip>
+        </template>
+
+      </j-table>
+    </div>
   </a-card>
 </template>
 
@@ -93,13 +79,15 @@
 // import DynamicNotice from '../../components/tools/DynamicNotice'
 import { getAction, deleteAction } from '@/api/manage'
 import { JeroListMixin } from '@/mixins/JeroListMixin'
-import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+// import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
+import JTable from '@comp/jero/JTable'
 
 export default {
   name: 'UserAnnouncementList',
-  mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
+  components: { JTable },
+  mixins: [JeroListMixin],
   // components: {
   //   DynamicNotice,
   //   ShowAnnouncement
@@ -132,34 +120,49 @@ export default {
       },
       columns: [
         {
-          title: this.$t('message.my.messageContent'),
-          align: 'left',
-          dataIndex: 'msgContent',
-          ellipsis: true,
-          width: 450,
-          scopedSlots: { customRender: 'msgTitile' }
+          title: this.$t('message.my.title'),
+          align: 'center',
+          dataIndex: 'titile',
+          width: 150,
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: this.$t('message.my.messageType'),
-          align: 'left',
-          ellipsis: true,
-          dataIndex: 'msgCategory',
+          align: 'center',
+          dataIndex: 'msgCategory_dictText',
           width: 150,
-          scopedSlots: { customRender: 'msgCategory' }
+          scopedSlots: { customRender: 'text' }
+        },
+        {
+          title: this.$t('message.my.publisher'),
+          align: 'center',
+          dataIndex: 'sender_dictText',
+          width: 150,
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: this.$t('message.my.notificationTime'),
-          align: 'left',
-          ellipsis: true,
-          width: 180,
-          dataIndex: 'sendTime'
+          align: 'center',
+          width: 120,
+          dataIndex: 'sendTime',
+          scopedSlots: { customRender: 'text' }
+        },
+        {
+          title: this.$t('message.my.readingStatus'),
+          align: 'center',
+          width: 120,
+          dataIndex: 'readFlag_dictText',
+          scopedSlots: { customRender: 'text' }
+        },
+        {
+          // 操作
+          // fixed: 'right',
+          title: this.$t('operation'),
+          dataIndex: 'action',
+          align: 'center',
+          width: 100,
+          scopedSlots: { customRender: 'action' }
         }
-        // {
-        //   title: '',
-        //   align: 'left',
-        //   ellipsis: true,
-        //   width: 50
-        // }
       ],
       url: {
         list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
@@ -177,6 +180,15 @@ export default {
     this.language = localStorage.getItem('language') || ''
   },
   methods: {
+    // 跳转详情
+    handleGoDetail (record) {
+      this.$router.push({
+        path: '/isps/userAnnouncementDetail',
+        query: {
+          id: record.id
+        }
+      })
+    },
     expandIcon (props) {
       if (props.expanded) {
         return <a-icon type = 'down' onClick = { e => {