修改登录页样式，调整公告详情页、消息跳转，体系运行记录盒样式调整

src/business/platform/bpmn/constants/index.js

@@ -67,11 +67,11 @@ export const unreadMessageOptions = [
     label: '系统消息',
     type: 'danger'
   },
-  {
-    value: 'bulletin',
-    label: '公告',
-    type: 'yellow'
-  }
+//   {
+//     value: 'bulletin',
+//     label: '公告',
+//     type: 'yellow'
+//   }
 ]
 export const statusOptions = [
   {

src/business/platform/bpmn/form/action.js

@@ -322,7 +322,6 @@ export default {
 
             if (actionName === 'agree') {
                 agree(params).then(response => {
-                    console.log(response)
                     this.handleResponse(actionName, loading, response)
                     this.createSnapshot()
                 }).catch(() => {
@@ -408,7 +407,6 @@ export default {
                 taskId: this.taskId ? this.taskId : this.endProcessTaskId,
                 endReason: params.opinion
             }).then(response => {
-                console.log(response)
                 loading.close()
                 this.$alert(response.message, {
                     showClose: false
@@ -674,7 +672,6 @@ export default {
                 const path = data[0].bao_biao_lu_jing_
                 const url = this.$getReportFile(path, `id_=${id}`)
                 const fileName = name + this.$common.getDateNow(16, 'string')
-                console.log(url, fileName)
                 this.$common.snapshoot({
                     url,
                     name: fileName,

src/business/platform/data/templaterender/templates/list.vue

@@ -376,15 +376,13 @@ export default {
     },
     methods: {
         getDatabaseType () {
-            getDatabaseType()
-                .then((response) => {
-                    this.databaseType = response.data
-                    this.checkPk(this.dataTemplate.unique)
-                    this.initData()
-                })
-                .catch(() => {
-                    this.loading = false
-                })
+            getDatabaseType().then((response) => {
+                this.databaseType = response.data
+                this.checkPk(this.dataTemplate.unique)
+                this.initData()
+            }).catch(() => {
+                this.loading = false
+            })
         },
         checkPk (pk) {
             let pkKey = pk || 'id_'
@@ -609,23 +607,21 @@ export default {
         loadData (outerKey) {
             this.loading = true
             if (this.$utils.isEmpty(this.template)) return
-            queryDataTable(this.getFormatParams(outerKey))
-                .then((response) => {
-                    this.loading = false
-                    ActionUtils.handleListData(this, response.data)
-                    this.setSelectRow()
-                    if (this.$refs.crud) {
-                        this.$refs.crud.handleTableHeight()
-                        debounce(() => {
-                            if (this.$refs.crud) {
-                                this.$refs.crud.handleTableHeight()
-                            }
-                        }, 100)()
-                    }
-                })
-                .catch(() => {
-                    this.loading = false
-                })
+            queryDataTable(this.getFormatParams(outerKey)).then((response) => {
+                this.loading = false
+                ActionUtils.handleListData(this, response.data)
+                this.setSelectRow()
+                if (this.$refs.crud) {
+                    this.$refs.crud.handleTableHeight()
+                    debounce(() => {
+                        if (this.$refs.crud) {
+                            this.$refs.crud.handleTableHeight()
+                        }
+                    }, 100)()
+                }
+            }).catch(() => {
+                this.loading = false
+            })
         },
         /**
          * 获取格式化参数
@@ -735,15 +731,13 @@ export default {
          */
         handleDisplayField (data, callback, hasMessage) {
             if (!this.preview) {
-                this.saveCustomDataDisplay(data, this.listIdentity)
-                    .then((response) => {
-                        if (hasMessage) ActionUtils.success(response.message)
-                        callback(true)
-                        this.search()
-                    })
-                    .catch(() => {
-                        callback(false)
-                    })
+                this.saveCustomDataDisplay(data, this.listIdentity).then((response) => {
+                    if (hasMessage) ActionUtils.success(response.message)
+                    callback(true)
+                    this.search()
+                }).catch(() => {
+                    callback(false)
+                })
             } else {
                 ActionUtils.success('保存成功,该为演示,不保存数据库！')
                 callback(true)
@@ -774,40 +768,32 @@ export default {
                         break
                     case 'edit': // 编辑
                     case 'detail': // 明细
-                        ActionUtils.selectedRecord(selection)
-                            .then((id) => {
-                                this.handleEdit(id, command, position, selection, data)
-                            })
-                            .catch(() => {})
+                        ActionUtils.selectedRecord(selection).then((id) => {
+                            this.handleEdit(id, command, position, selection, data)
+                        }).catch(() => {})
                         break
                     case 'remove': // 删除
-                        ActionUtils.removeRecord(selection)
-                            .then((ids) => {
-                                this.handleRemove(ids, command, position, selection, data)
-                            })
-                            .catch(() => {})
+                        ActionUtils.removeRecord(selection).then((ids) => {
+                            this.handleRemove(ids, command, position, selection, data)
+                        }).catch(() => {})
                         break
                     case 'sefStartFlow': // 启动自定义流程
-                        ActionUtils.selectedMultiRecord(selection)
-                            .then((ids) => {
-                                if (button.deflow) {
-                                    this.$confirm('确定启动流程吗？', '消息', {
-                                        confirmButtonText: '确定',
-                                        cancelButtonText: '取消',
-                                        type: 'warning'
-                                    })
-                                        .then(() => {
-                                            this.$message.success('流程任务正在[异步操作]启动中...(期间可做其它操作！)')
-                                            this.handleStartFlowFromList(ids, button.deflow, this.getFormKey())
-                                        })
-                                        .catch(() => {})
-                                } else {
-                                    this.dialogVisible = true
-                                    this.dialogValue = {}
-                                    this.sefStartFlowId = ids
-                                }
-                            })
-                            .catch(() => {})
+                        ActionUtils.selectedMultiRecord(selection).then((ids) => {
+                            if (button.deflow) {
+                                this.$confirm('确定启动流程吗？', '消息', {
+                                    confirmButtonText: '确定',
+                                    cancelButtonText: '取消',
+                                    type: 'warning'
+                                }).then(() => {
+                                    this.$message.success('流程任务正在[异步操作]启动中...(期间可做其它操作！)')
+                                    this.handleStartFlowFromList(ids, button.deflow, this.getFormKey())
+                                }).catch(() => {})
+                            } else {
+                                this.dialogVisible = true
+                                this.dialogValue = {}
+                                this.sefStartFlowId = ids
+                            }
+                        }).catch(() => {})
                         break
                     case 'custom': // 自定义按钮
                         break
@@ -834,26 +820,22 @@ export default {
                             this.$message.warning('请先配置对应报表路径！')
                             return
                         }
-                        this.$common
-                            .snapshoot({
-                                url: this.$getReportFile(button.reportPath, `id_=${selection}`),
-                                name: selection,
-                                type: 'pdf'
-                            })
-                            .then((res) => {
-                                if (!res.data || !res.data.id) {
-                                    this.$message.error('生成文件失败，请重试！')
-                                    return
-                                }
-                                this.$common.download(res.data)
-                            })
+                        this.$common.snapshoot({
+                            url: this.$getReportFile(button.reportPath, `id_=${selection}`),
+                            name: selection,
+                            type: 'pdf'
+                        }).then((res) => {
+                            if (!res.data || !res.data.id) {
+                                this.$message.error('生成文件失败，请重试！')
+                                return
+                            }
+                            this.$common.download(res.data)
+                        })
                         break
                     case 'print': // 打印
-                        ActionUtils.selectedRecord(selection)
-                            .then((id) => {
-                                this.handlePrint(id)
-                            })
-                            .catch(() => {})
+                        ActionUtils.selectedRecord(selection).then((id) => {
+                            this.handlePrint(id)
+                        }).catch(() => {})
                         break
                     case 'import': // 导入
                         this.importColumnsVisible = true
@@ -865,12 +847,10 @@ export default {
                         this.exportActions(buttonType)
                         break
                     case 'exportSelected': // 导出选中
-                        ActionUtils.selectedMultiRecord(selection)
-                            .then((ids) => {
-                                this.selecteds = ids
-                                this.exportActions(buttonType, ids)
-                            })
-                            .catch(() => {})
+                        ActionUtils.selectedMultiRecord(selection).then((ids) => {
+                            this.selecteds = ids
+                            this.exportActions(buttonType, ids)
+                        }).catch(() => {})
                         break
                     case 'exportCurPage': // 导出当前页
                         this.exportActions(buttonType)
@@ -996,11 +976,9 @@ export default {
                 saveData = ActionUtils.formatParams(params, pagination, sorts)
             }
 
-            checkExportData(saveData)
-                .then((res) => {
-                    this.handleExportData(saveData)
-                })
-                .catch((err) => console.error(err))
+            checkExportData(saveData).then((res) => {
+                this.handleExportData(saveData)
+            }).catch((err) => console.error(err))
         },
         handleExportData (saveData) {
             exportData(saveData).then((response) => {
@@ -1019,18 +997,16 @@ export default {
                 ids: id,
                 defKey: defKey,
                 formKey: formKey
-            })
-                .then((response) => {
-                    this.$message({
-                        message: '流程启动成功！',
-                        type: 'success'
-                    })
-                    this.dialogVisible = false
-                    this.search()
-                })
-                .catch(() => {
-                    this.dialogVisible = false
+            }).then((response) => {
+                this.$message({
+                    message: '流程启动成功！',
+                    type: 'success'
                 })
+                this.dialogVisible = false
+                this.search()
+            }).catch(() => {
+                this.dialogVisible = false
+            })
         },
         handleDialogActionEvent (key, data) {
             if (key === 'clean') {
@@ -1536,14 +1512,12 @@ export default {
             removeFormData({
                 formKey: this.formKey,
                 ids: ids
-            })
-                .then((response) => {
-                    this.afterScript(action, position, selection, data, () => {
-                        ActionUtils.removeSuccessMessage()
-                        this.search()
-                    })
+            }).then((response) => {
+                this.afterScript(action, position, selection, data, () => {
+                    ActionUtils.removeSuccessMessage()
+                    this.search()
                 })
-                .catch(() => {})
+            }).catch(() => {})
         },
         handlePrint (ids) {
             if (this.$utils.isNotEmpty(this.printTemplateId)) {

src/components/ibps-ueditor/ueditor.config.js

@@ -12,7 +12,7 @@ const config = function() {
     // 编辑器不自动被内容撑高
     autoHeightEnabled: false,
     // 初始容器高度
-    initialFrameHeight: 240,
+    initialFrameHeight: 360,
     // 初始容器宽度
     initialFrameWidth: '100%',
     // 关闭自动保存

src/layout/header-aside/components/header-message/index.vue

@@ -1,81 +1,110 @@
 <template>
-  <div class="ibps-mr-5">
-    <el-tooltip v-if="messageCount === 0"
-                :content="tooltipContent"
-                effect="dark"
-                placement="bottom">
-      <el-button class="ibps-ml-0 ibps-mr btn-text can-hover"
-                 type="text"
-                 @click="clickMore">
-        <el-badge :max="9999"
-                  :value="messageCount">
-          <ibps-icon name="bell-o"
-                     size="16" />
-        </el-badge>
-      </el-button>
-    </el-tooltip>
-    <el-popover v-else
-                v-model="popShow"
-                placement="bottom-end"
-                width="350"
-                trigger="manual"
-                popper-class="header-message-popper">
-      <el-button slot="reference"
-                 class="ibps-ml-0 ibps-mr btn-text can-hover"
-                 type="text"
-                 @click="openPop">
-        <el-badge :max="9999"
-                  :value="messageCount">
-          <ibps-icon name="bell-o"
-                     size="16" />
-        </el-badge>
-      </el-button>
-      <el-card body-style="padding:0;">
-        <div slot="header"
-             style="font-size: 20px; font-weight: 600">
-          {{ $t('layout.header-aside.header-message.message-count', { messageCount: messageCount }) }}
-        </div>
-        <div style="height: 250px">
-          <el-scrollbar style="height: 100%; width: 100%"
-                        wrap-class="ibps-scrollbar-wrapper ">
-            <ibps-list class="ibps-p-10">
-              <ibps-list-item v-for="(message, index) in messageList"
-                              :key="index"
-                              @click.native="handelInteriorClick(message)">
-                <ibps-list-item-meta :title="message.subject"
-                                     :description="message.ownerName">
-                  <el-avatar slot="avatar"
-                             :icon="message.messageType === 'bulletin' ? 'ibps-icon-bullhorn' : 'ibps-icon-user'"
-                             shape="circle"
-                             style="background-color: #87d068" />
-                </ibps-list-item-meta>
-                <div slot="extra">
-                  {{ message.createTime | formatRelativeTime({ year: 'yyyy-MM-dd' }) }}
+    <div class="ibps-mr-5">
+        <el-tooltip
+            :content="tooltipContent"
+            effect="dark"
+            placement="bottom"
+        >
+            <el-button
+                class="ibps-ml-0 ibps-mr btn-text can-hover"
+                type="text"
+                @click="clickMore"
+            >
+                <el-badge
+                    :max="9999"
+                    :value="messageCount"
+                >
+                    <ibps-icon
+                        name="bell-o"
+                        size="16"
+                    />
+                </el-badge>
+            </el-button>
+        </el-tooltip>
+        <!-- <el-popover
+            v-else
+            v-model="popShow"
+            placement="bottom-end"
+            width="350"
+            trigger="manual"
+            popper-class="header-message-popper"
+        >
+            <el-button
+                slot="reference"
+                class="ibps-ml-0 ibps-mr btn-text can-hover"
+                type="text"
+                @click="openPop"
+            >
+                <el-badge
+                    :max="9999"
+                    :value="messageCount"
+                >
+                    <ibps-icon
+                        name="bell-o"
+                        size="16"
+                    />
+                </el-badge>
+            </el-button>
+            <el-card body-style="padding:0;">
+                <div
+                    slot="header"
+                    style="font-size: 20px; font-weight: 600"
+                >
+                    {{ $t('layout.header-aside.header-message.message-count', { messageCount: messageCount }) }}
                 </div>
-              </ibps-list-item>
-            </ibps-list>
-          </el-scrollbar>
-        </div>
-        <div class="message-more">
-          <el-link type="primary"
-                   @click="clickMore">{{ $t('layout.header-aside.header-message.viewmore') }}</el-link>
-        </div>
-      </el-card>
-    </el-popover>
+                <div style="height: 250px">
+                    <el-scrollbar
+                        style="height: 100%; width: 100%"
+                        wrap-class="ibps-scrollbar-wrapper "
+                    >
+                        <ibps-list class="ibps-p-10">
+                            <ibps-list-item
+                                v-for="(message, index) in messageList"
+                                :key="index"
+                                @click.native="handelInteriorClick(message)"
+                            >
+                                <ibps-list-item-meta
+                                    :title="message.subject"
+                                    :description="message.ownerName"
+                                >
+                                    <el-avatar
+                                        slot="avatar"
+                                        :icon="message.messageType === 'bulletin' ? 'ibps-icon-bullhorn' : 'ibps-icon-user'"
+                                        shape="circle"
+                                        style="background-color: #87d068"
+                                    />
+                                </ibps-list-item-meta>
+                                <div slot="extra">
+                                    {{ message.createTime | formatRelativeTime({ year: 'yyyy-MM-dd' }) }}
+                                </div>
+                            </ibps-list-item>
+                        </ibps-list>
+                    </el-scrollbar>
+                </div>
+                <div class="message-more">
+                    <el-link
+                        type="primary"
+                        @click="clickMore"
+                    >{{ $t('layout.header-aside.header-message.viewmore') }}</el-link>
+                </div>
+            </el-card>
+        </el-popover> -->
 
-    <!-- 消息明细 -->
-    <inner-detail-dialog :id="editId"
-                         :subId="subId"
-                         :visible="dialogFormVisible"
-                         :type="type"
-                         :tableId="tableId"
-                         :tableName="tableName"
-                         :title="$t('layout.header-aside.header-message.details')"
-                         inside
-                         readonly
-                         @callback="loadData"
-                         @close="closeDialog" />
-  </div>
+        <!-- 消息明细 -->
+        <inner-detail-dialog
+            :id="editId"
+            :sub-id="subId"
+            :visible="dialogFormVisible"
+            :type="type"
+            :table-id="tableId"
+            :table-name="tableName"
+            :title="$t('layout.header-aside.header-message.details')"
+            inside
+            readonly
+            @callback="loadData"
+            @close="closeDialog"
+        />
+    </div>
 </template>
 
 <script>
@@ -84,161 +113,161 @@ import InnerDetailDialog from '@/views/platform/message/inner/detail/dialog'
 import Watermark from './watermark/watermark-cont.js'
 import Bus from '@/utils/EventBus'
 export default {
-  components: {
-    InnerDetailDialog
-  },
-  data() {
-    return {
-      editId: '',
-      subId: '',
-      type: '',
-      tableId: '',
-      tableName: '',
-      dialogFormVisible: false,
-      isControl: true,
-      messageList: [],
-      messageCount: 0,
-      infoMessage: '',
-      countNumber: 0,
-      popShow: false,
-      readonly: true
-    }
-  },
-  computed: {
-    tooltipContent() {
-      return this.messageCount === 0 ? this.$t('layout.header-aside.header-message.empty') : ''
-    }
-  },
-  mounted() {
-    //轮询弹窗任务提醒
-    // setTimeout(() => {
-    //     this.isControl=true
-    //     this.loadData()
-    // }, 1000)
-    // Watermark.set('线上试用版本','深圳市金源信通')
-    this.loadData()
-    Bus.$on('getMessageCount', (count) => {
-      this.messageCount = count
-    })
-  },
-  beforeDestroy() {
-    Watermark.set('', '')
-    this.isControl = false
-  },
-  methods: {
-    // 加载数据
-    loadData() {
-      getMsgList({
-        parameters: [
-          // { key: 'Q^subject^SL', value: '提醒' },
-          // { key: 'Q^messageType^SL', value: 'system' }
-        ],
-        requestPage: { limit: 5, pageNo: 1, totalCount: 0 },
-        sorts: []
-      }).then((response) => {
-        const data = response.data
-
-        this.messageList = data.dataResult
-        this.messageCount = data.pageResult ? data.pageResult.totalCount : 0
-        this.countNumber = data.pageResult.totalCount
-        // if (this.countNumber == 0) {
-        //     // if(response.data.pageResult.totalCount>0){
-        //     //     this.$message.warning('您有'+response.data.pageResult.totalCount+'条未处理的 [ 待审批 / 被驳回任务消息 ]，请及时处理！！！')
-        //     // }
-        // } else if (this.countNumber < data.pageResult.totalCount) {
-        //     //如果上次记录数量低于本次  进行提醒，准备待办
-        //     let _this = this
-        //     let h = this.$createElement
-        //     let num = data.pageResult.totalCount - this.countNumber
-        //     this.infoMessage = this.$notify({
-        //         title: '您有新的待办任务产生！',
-        //         message: h('p', null, [
-        //             h('span', null, '任务内容: ' + data.dataResult[0].subject),
-        //             h('br'),
-        //             h('span', null, '生成时间: '),
-        //             h('span', { style: 'color: #FF8C00;font-size:12px;' }, data.dataResult[0].createTime),
-        //             h('br'),
-        //             h('el-button', {
-        //                 attrs: {
-        //                     size: 'mini',
-        //                     type: 'primary',
-        //                     plain: true
-        //                 },
-        //                 on: {
-        //                     click: () => {
-        //                         _this.cancelInfo()
-        //                     }
-        //                 }
-        //             }, '进入办理'),
-        //             h('el-button', {
-        //                 attrs: {
-        //                     size: 'mini',
-        //                     plain: true
-        //                 },
-        //                 on: {
-        //                     click: () => {
-        //                         _this.$notify.closeAll()
-        //                     } // 路由加载之后，调用关闭消息弹窗的方法
-        //                 }
-        //             }, '忽略全部')
-        //         ]),
-        //         type: 'warning',
-        //         duration: 0
-        //     })
-        // }
-        // if (this.countNumber == 0) {
-        //     this.countNumber = data.pageResult.totalCount
-        //     // setInterval(() => {
-        //     //     if(this.isControl &&  response.message == "获取收到的内部消息列表成功！"){
-        //     //         this.loadData()
-        //     //     }
-        //     // }, 60000)
-        // } else {
-        //     this.countNumber = data.pageResult.totalCount
-        // }
-      }).catch(() => {
-        this.isControl = false
-      })
+    components: {
+        InnerDetailDialog
     },
-    cancelInfo() {
-      this.$router.push('/officeDesk/pendingItems')
-      this.$notify.closeAll()
+    data () {
+        return {
+            editId: '',
+            subId: '',
+            type: '',
+            tableId: '',
+            tableName: '',
+            dialogFormVisible: false,
+            isControl: true,
+            messageList: [],
+            messageCount: 0,
+            infoMessage: '',
+            countNumber: 0,
+            popShow: false,
+            readonly: true
+        }
     },
-    handelInteriorClick(message) {
-      this.subId = message.subId
-      this.editId = message.id
-      this.dialogFormVisible = true
-      //   this.type = message.tableName ? message.tableName : ''
-      this.tableName = message.tableName ? message.tableName : ''
-      this.tableId = message.tableId ? message.tableId : ''
-      this.readonly = message.tableName ? true : false
+    computed: {
+        tooltipContent () {
+            return this.messageCount === 0 ? this.$t('layout.header-aside.header-message.empty') : ''
+        }
     },
-    openPop() {
-      this.popShow = !this.popShow
-      if (this.popShow) {
+    mounted () {
+        // 轮询弹窗任务提醒
+        // setTimeout(() => {
+        //     this.isControl=true
+        //     this.loadData()
+        // }, 1000)
+        // Watermark.set('线上试用版本','深圳市金源信通')
         this.loadData()
-      }
+        Bus.$on('getMessageCount', (count) => {
+            this.messageCount = count
+        })
     },
-    clickMore() {
-      // 更多消息
-      this.popShow = !this.popShow
-      this.$router.push('/message')
+    beforeDestroy () {
+        Watermark.set('', '')
+        this.isControl = false
     },
-    closeDialog(visible) {
-      this.dialogFormVisible = visible
-      this.loadData()
+    methods: {
+        // 加载数据
+        loadData () {
+            getMsgList({
+                parameters: [
+                    // { key: 'Q^subject^SL', value: '提醒' },
+                    // { key: 'Q^messageType^SL', value: 'system' }
+                ],
+                requestPage: { limit: 5, pageNo: 1, totalCount: 0 },
+                sorts: []
+            }).then((response) => {
+                const data = response.data
+
+                this.messageList = data.dataResult
+                this.messageCount = data.pageResult ? data.pageResult.totalCount : 0
+                this.countNumber = data.pageResult.totalCount
+                // if (this.countNumber == 0) {
+                //     // if(response.data.pageResult.totalCount>0){
+                //     //     this.$message.warning('您有'+response.data.pageResult.totalCount+'条未处理的 [ 待审批 / 被驳回任务消息 ]，请及时处理！！！')
+                //     // }
+                // } else if (this.countNumber < data.pageResult.totalCount) {
+                //     // 如果上次记录数量低于本次  进行提醒，准备待办
+                //     const _this = this
+                //     const h = this.$createElement
+                //     const num = data.pageResult.totalCount - this.countNumber
+                //     this.infoMessage = this.$notify({
+                //         title: '您有新的待办任务产生！',
+                //         message: h('p', null, [
+                //             h('span', null, '任务内容: ' + data.dataResult[0].subject),
+                //             h('br'),
+                //             h('span', null, '生成时间: '),
+                //             h('span', { style: 'color: #FF8C00;font-size:12px;' }, data.dataResult[0].createTime),
+                //             h('br'),
+                //             h('el-button', {
+                //                 attrs: {
+                //                     size: 'mini',
+                //                     type: 'primary',
+                //                     plain: true
+                //                 },
+                //                 on: {
+                //                     click: () => {
+                //                         _this.cancelInfo()
+                //                     }
+                //                 }
+                //             }, '进入办理'),
+                //             h('el-button', {
+                //                 attrs: {
+                //                     size: 'mini',
+                //                     plain: true
+                //                 },
+                //                 on: {
+                //                     click: () => {
+                //                         _this.$notify.closeAll()
+                //                     } // 路由加载之后，调用关闭消息弹窗的方法
+                //                 }
+                //             }, '忽略全部')
+                //         ]),
+                //         type: 'warning',
+                //         duration: 0
+                //     })
+                // }
+                // if (this.countNumber == 0) {
+                //     this.countNumber = data.pageResult.totalCount
+                //     // setInterval(() => {
+                //     //     if(this.isControl &&  response.message == "获取收到的内部消息列表成功！"){
+                //     //         this.loadData()
+                //     //     }
+                //     // }, 60000)
+                // } else {
+                //     this.countNumber = data.pageResult.totalCount
+                // }
+            }).catch(() => {
+                this.isControl = false
+            })
+        },
+        cancelInfo () {
+            this.$router.push('/officeDesk/pendingItems')
+            this.$notify.closeAll()
+        },
+        handelInteriorClick (message) {
+            this.subId = message.subId
+            this.editId = message.id
+            this.dialogFormVisible = true
+            //   this.type = message.tableName ? message.tableName : ''
+            this.tableName = message.tableName ? message.tableName : ''
+            this.tableId = message.tableId ? message.tableId : ''
+            this.readonly = !!message.tableName
+        },
+        openPop () {
+            this.popShow = !this.popShow
+            if (this.popShow) {
+                this.loadData()
+            }
+        },
+        clickMore () {
+            // 更多消息
+            this.popShow = !this.popShow
+            this.$router.push('/message')
+        },
+        closeDialog (visible) {
+            this.dialogFormVisible = visible
+            this.loadData()
+        }
     }
-  }
 }
 </script>
 <style lang="scss">
-.header-message-popper {
-  padding: 0 !important;
+    .header-message-popper {
+        padding: 0 !important;
 
-  .message-more {
-    padding: 15px 0;
-    text-align: center;
-    border-top: 1px solid #ebeef5;
-  }
-}
+        .message-more {
+            padding: 15px 0;
+            text-align: center;
+            border-top: 1px solid #ebeef5;
+        }
+    }
 </style>

src/views/platform/bpmn/bpmInstHis/list.vue

@@ -5,6 +5,7 @@
                 :width="width"
                 :height="height"
                 :location="location"
+                title="记录分类"
                 category-key="FLOW_TYPE"
                 :has-permission="hasPermission"
                 @node-click="handleNodeClick"
@@ -192,7 +193,7 @@ export default {
     },
     data () {
         return {
-            width: 250,
+            width: 220,
             selection: false,
             dialogFormVisible: false,
             // 编辑dialog需要使用
@@ -273,7 +274,7 @@ export default {
         const hasRole = roleList.some(item => item.name === '系统管理角色')
         if (hasRole) {
             // 系统管理角色不做分类过滤
-            this.hasPermission = false
+            // this.hasPermission = false
             this.listConfig.toolbars.push({ key: 'remove' })
             this.selection = true
         }

src/views/platform/message/inner/constants/index.js

@@ -13,11 +13,11 @@ export const typeOptions = [
         label: '系统消息',
         type: 'danger'
     },
-    {
-        value: 'bulletin',
-        label: '公告',
-        type: 'yellow'
-    }
+    // {
+    //     value: 'bulletin',
+    //     label: '公告',
+    //     type: 'yellow'
+    // }
 ]
 export const renderHeader = function (h, { column, $index }) {
     return h('span', [

src/views/platform/message/inner/detail/dialog.vue

@@ -93,7 +93,6 @@ export default {
                 const btn2 = [
                     { key: 'cancel', label: '关闭' }
                 ]
-                console.log('val',val)
                 if (val) {
                     this.toolbars = btn1
                     this.type = '1'

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

@@ -13,7 +13,7 @@
     >
         <el-row style="padding: 10px 10px 0 10px; max-height: 600px;">
             <el-form ref="form" :model="form" label-width="100px" disabled>
-                <el-form-item label="公告分类：" prop="typeId">
+                <!-- <el-form-item label="公告分类：" prop="typeId">
                     <ibps-type-select v-model="form.typeId" category-key="NOTICE_TYPE" />
                 </el-form-item>
                 <el-form-item label="标题：" prop="title">
@@ -24,9 +24,14 @@
                 </el-form-item>
                 <el-form-item label="关键字：" prop="key">
                     <el-input v-model="form.key" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-row>
-                    <el-col :span="12">
+                    <el-col :span="8">
+                        <el-form-item label="发布人：" prop="author">
+                            <el-input v-model="form.author" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
                         <el-form-item label="发布时间：" prop="publicDate">
                             <el-date-picker
                                 v-model="form.publicDate"
@@ -37,7 +42,7 @@
                             />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="失效时间：" prop="loseDate">
                             <el-date-picker
                                 v-model="form.loseDate"

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

@@ -81,7 +81,7 @@
         />
         <news-detail
             :id="newsId"
-            title="公告明细"
+            :title="newsTitle"
             :visible="newsDialogVisible"
             readonly
             @close="visible => newsDialogVisible = visible"
@@ -208,6 +208,7 @@ export default {
             loading: false,
             dialogFormVisible: false,
             newsDialogVisible: false,
+            newsTitle: '公告明细',
             orgName: '',
             roleName: '',
             FlowName: '',
@@ -476,6 +477,7 @@ export default {
             if (this.activeTab === 'news') {
                 this.newsId = data.id
                 this.newsDialogVisible = true
+                this.newsTitle = data.title
                 return
             }
             this.taskId = data.id || ''

src/views/system/login/page.vue

@@ -110,7 +110,7 @@ export default {
             height: 100%;
             overflow: hidden;
             border: 0;
-            padding: 0 7.5%;
+            padding: 0 2.5%;
         }
         .footerclass{
             width: 80%;
@@ -131,7 +131,7 @@ export default {
             position: absolute;
             top:40%;
             transform: translateY(-50%);
-            margin-left: 50px;
+            // margin-left: 50px;
         }
     // }