公告消息bug修复

src/store/modules/ibps/modules/user.js

@@ -185,7 +185,7 @@ export default {
         getDeptList ({ state, dispatch }, { first, second }) {
             const params = second ? ` and (pe.path_ like '%${second}%' or pe.id_ = '${first}')` : first ? ` and pe.path_ like '%${first}%'` : ''
             // const sql = `select id_ as positionId, name_ as positionName, path_ as path, depth_ as depth, sn_ as sn from ibps_party_entity where party_type_ = 'position'${params} order by depth_ asc, sn_ asc`
-            const sql = `select pe.id_ as positionId, pe.name_ as positionName, pe.path_ as path, pe.depth_ as depth, pe.sn_ as sn, ifnull(r.name_, '') as manager, ifnull(r.id_, '') as managerId from ibps_party_entity as pe left join (select em.id_, em.positions_, em.name_ from ibps_party_employee as em left join ibps_party_user_role as ur on em.id_ = ur.user_id_ left join ibps_party_role as pr on pr.id_ = ur.role_id_ where role_alias_ in ('zhsfzr', 'syszr', 'zhglzzc')) as r on find_in_set(pe.id_, r.positions_) > 0 where pe.party_type_ = 'position'${params} order by pe.depth_ asc, pe.sn_ asc`
+            const sql = `select pe.id_ as positionId, pe.name_ as positionName, pe.path_ as path, pe.depth_ as depth, pe.sn_ as sn, ifnull(r.name_, '') as manager, ifnull(r.id_, '') as managerId from ibps_party_entity as pe left join (select em.id_, em.positions_, em.name_ from ibps_party_employee as em left join ibps_party_user_role as ur on em.id_ = ur.user_id_ left join ibps_party_role as pr on pr.id_ = ur.role_id_ where role_alias_ in ('zhsfzr', 'syszr', 'zhglzzc')) as r on find_in_set(pe.id_, r.positions_) > 0 where pe.party_type_ = 'position'${params} group by pe.id_ order by pe.depth_ asc, pe.sn_ asc`
             common.request('sql', sql).then(res => {
                 const { data = [] } = res.variables || {}
                 dispatch('ibps/param/setDeptList', data, {

src/views/platform/message/inner/receive.vue

@@ -50,6 +50,9 @@
                     <i class="ibps-icon-paperclip" />
                 </el-tooltip>
             </template>
+            <template slot="file" slot-scope="v">
+                <span> {{ v.fileMsg ? '有' : '无' }}</span>
+            </template>
         </ibps-crud>
         <!-- 明细 -->
         <detail
@@ -138,13 +141,13 @@ export default {
                 },
                 // 表格字段配置
                 columns: [
-                    {
-                        prop: 'stateIcon',
-                        label: '',
-                        slotName: 'handIcon',
-                        width: '60',
-                        renderHeader: renderHeader
-                    },
+                    // {
+                    //     prop: 'stateIcon',
+                    //     label: '',
+                    //     slotName: 'handIcon',
+                    //     width: '60',
+                    //     renderHeader: renderHeader
+                    // },
                     {
                         prop: 'subject',
                         sortBy: 'SUBJECT_',
@@ -153,10 +156,11 @@ export default {
                         sortable: 'custom',
                         width: '150'
                     },
-                    { prop: 'ownerName', label: '发送人', width: '100' },
+                    { prop: 'ownerName', label: '发送人', width: '90' },
                     { prop: 'messageType', label: '消息类型', tags: typeOptions, width: '100' },
                     { prop: 'content', label: '消息描述', minWidth: '200' },
-                    { prop: 'createTime', label: '发送时间', dateFormat: 'yyyy-MM-dd HH:mm:ss', width: '150' }
+                    { prop: 'fileMsg', label: '有无附件', slotName: 'file', width: '90' },
+                    { prop: 'createTime', label: '发送时间', sortable: 'custom', dateFormat: 'yyyy-MM-dd HH:mm:ss', width: '150' }
                 ],
                 rowHandle: {
                     actions: [
@@ -241,11 +245,10 @@ export default {
             this.loadData()
         },
         handleLinkClick (data, columns) {
-            console.log('data', data)
             this.handleEdit(data.id, true)
             this.tableId = data.tableId
             this.tableName = data.tableName
-            this.title = '信息明细'
+            this.title = '消息明细'
         },
         /**
          * 处理按钮事件
@@ -262,29 +265,29 @@ export default {
                     //     // this.isEnvelope = false
                     // }).catch(() => { })
                     try {
-                        if(data == undefined){
+                        if (data === undefined) {
                             throw new Error('请选择数据再标记已读。')
                         }
-                        let fitDatas=[]
+                        const fitDatas = []
                         data.forEach(el => {
-                            if(el.subject !=='文件发放通知'){
+                            if (el.subject !== '文件发放通知') {
                                 fitDatas.push(el.id)
                             }
-                        });
-                        if(fitDatas.length !== data.length){
+                        })
+                        if (fitDatas.length !== data.length) {
                             const comfirm = confirm('文件发放通知并不会被标记为已读')
-                            if(comfirm){
+                            if (comfirm) {
                                 ActionUtils.selectedMultiRecord(fitDatas).then(id => {
-                                this.handleAlreadyRead(id)
+                                    this.handleAlreadyRead(id)
                                 }).catch(() => { })
                             }
-                        }else{
+                        } else {
                             ActionUtils.selectedMultiRecord(fitDatas).then(id => {
-                            this.handleAlreadyRead(id)
+                                this.handleAlreadyRead(id)
                             }).catch(() => { })
                         }
                     } catch (error) {
-                        ActionUtils.warning(error.message) 
+                        ActionUtils.warning(error.message)
                     }
                     break
                 case 'reply': // 回复

src/views/platform/system/news/detail.vue

@@ -28,7 +28,7 @@
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="发布人：" prop="author">
-                            <el-input v-model="form.author" />
+                            <el-input v-model="form.author || form.userName" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">

src/views/platform/system/news/list.vue

@@ -8,6 +8,7 @@
             :search-form="listConfig.searchForm"
             :pk-key="pkKey"
             :columns="listConfig.columns"
+            display-field="通知公告"
             :row-handle="listConfig.rowHandle"
             :pagination="pagination"
             :loading="loading"
@@ -81,6 +82,7 @@ export default {
                     forms: [
                         { prop: 'Q^TITLE_^SL', label: '标题' },
                         { prop: 'Q^USER_NAME_^SL', label: '发布人' },
+                        { prop: 'Q^DEP_NAME_^SL', label: '发布部门' },
                         { prop: ['Q^PUBLIC_DATE_^DL', 'Q^PUBLIC_DATE_^DG'], label: '发布时间', fieldType: 'daterange' },
                         { prop: 'Q^STATUS_^SL', label: '发布状态', fieldType: 'select', options: typeOptions }
                     ]

src/views/system/dashboard/components/workbench.vue

@@ -701,7 +701,7 @@ export default {
                     addList.push(obj)
                     const msg = {
                         subject: msgTitle[item.workType],
-                        content: `<p>事务【${item.workName}】${msgContent[item.workType]}<p>`,
+                        content: `事务【${item.workName}】${msgContent[item.workType]}`,
                         receiverId: userId,
                         canreply: '0',
                         taskId: item.taskId