blackteay/vue-element-admin
1
0
Fork 0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-13 23:20:12 +08:00
Code Issues Releases Wiki Activity

bugfix open process activity from process notifications (#276)

Browse Source
This commit is contained in:
Leonel Matos 2020-01-29 16:13:28 -04:00 committed by GitHub
parent 5e20b31640
commit 8d7c37839a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/ADempiere/Badge/index.vue
View File

@ -8,7 +8,7 @@
<el-table <el-table
:data="getRecordNotification" :data="getRecordNotification"
:highlight-current-row="true" :highlight-current-row="true"
@row-click="handleCurrentChange" @cell-click="handleCurrentChange"
> >
<el-table-column prop="name" :label="$t('navbar.badge.Notifications')" /> <el-table-column prop="name" :label="$t('navbar.badge.Notifications')" />
<el-table-column <el-table-column
@ -33,12 +33,11 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="50" width="50"
class-name="procesActivity"
> >
<router-link :to="{ name: 'ProcessActivity' }">
<el-tooltip effect="dark" :content="$t('navbar.badge.link')" placement="top-start"> <el-tooltip effect="dark" :content="$t('navbar.badge.link')" placement="top-start">
<svg-icon icon-class="tree-table" /> <svg-icon icon-class="tree-table" />
</el-tooltip> </el-tooltip>
</router-link>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-button slot="reference" type="text" icon="el-icon-bell" style="float: left;color: #000000;font-size: 121%;font-weight: 615!important;padding-top: 14px;" /> <el-button slot="reference" type="text" icon="el-icon-bell" style="float: left;color: #000000;font-size: 121%;font-weight: 615!important;padding-top: 14px;" />
@ -75,7 +74,7 @@ export default {
}, },
handleCurrentChange(getRecordNotification, val, index, rows) { handleCurrentChange(getRecordNotification, val, index, rows) {
if (val !== null) { if (val !== null) {
if (getRecordNotification && getRecordNotification.isReport) { if (getRecordNotification && getRecordNotification.isReport && val.className !== 'procesActivity') {
this.$router.push({ this.$router.push({
name: 'Report Viewer', name: 'Report Viewer',
params: { params: {

11
src/views/ADempiere/ProcessActivity/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div v-if="getRunProcessAll.length" class="app-container"> <div v-if="getRunProcessAll.length" key="with-process" class="app-container">
<el-timeline> <el-timeline>
<el-timeline-item <el-timeline-item
v-for="(activity, index) in getRunProcessAll" v-for="(activity, index) in getRunProcessAll"
@ -39,7 +39,7 @@
<!-- show only when it is error --> <!-- show only when it is error -->
<el-popover <el-popover
v-if="activity.isError && !activity.summary && !activity.isReport" v-if="activity.isError && !activity.summary && !activity.isReport"
v-key="is-error" :key="index + 'is-error'"
placement="right" placement="right"
width="700" width="700"
trigger="hover" trigger="hover"
@ -54,6 +54,7 @@
<!-- show only when bring logs --> <!-- show only when bring logs -->
<el-popover <el-popover
v-else-if="activity.logsList.length > 0 || activity.summary" v-else-if="activity.logsList.length > 0 || activity.summary"
:key="index + 'is-summary'"
placement="right" placement="right"
width="500" width="500"
trigger="hover" trigger="hover"
@ -74,7 +75,7 @@
<!-- show only when bring output --> <!-- show only when bring output -->
<el-popover <el-popover
v-else-if="activity.isReport" v-else-if="activity.isReport"
v-key="is-output" :key="index + 'is-output'"
placement="right" placement="right"
width="700" width="700"
trigger="hover" trigger="hover"
@ -94,7 +95,7 @@
</el-popover> </el-popover>
<el-popover <el-popover
v-else v-else
v-key="is-other" :key="index + 'is-other'"
placement="top-start" placement="top-start"
:title="$t('table.ProcessActivity.Logs')" :title="$t('table.ProcessActivity.Logs')"
width="200" width="200"
@ -111,7 +112,7 @@
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>
</div> </div>
<div v-else> <div v-else key="without-process">
<h1 class="text-center">{{ $t('views.noProcess') }}</h1> <h1 class="text-center">{{ $t('views.noProcess') }}</h1>
</div> </div>
</template> </template>