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

group by logId (#288)

Browse Source 
* group by logId

* changing structure of the change log
This commit is contained in:
elsiosanchez 2020-01-31 07:41:20 -04:00 committed by GitHub
parent 5beca7630a
commit 045536f4b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/views/ADempiere/Window/index.vue
View File

@ -5,7 +5,7 @@
>
<el-container style="height: 86vh;">
<Split>
<SplitArea :size="!show ? 100 : 70" :min-size="100">
<SplitArea :size="!show ? 100 : 50" :min-size="100">
<el-aside width="100%">
<split-pane :min-percent="10" :default-percent="defaultPorcentSplitPane" split="vertical">
<template>
@ -148,7 +148,7 @@
</split-pane>
</el-aside>
</SplitArea>
<SplitArea :size="show ? 30 : 0">
<SplitArea :size="show ? 50 : 0">
<el-main>
<div style="top: 40%;position: absolute;">
<el-button v-show="show" type="info" icon="el-icon-info" circle style="float: right;" class="el-button-window" @click="conteInfo" />
@ -165,35 +165,32 @@
<div
v-if="getIsChangeLog"
>
<el-card
v-for="(listLogs, index) in getTypeLogs"
:key="index"
>
<el-scrollbar wrap-class="scroll-window-log-change">
<el-timeline>
<el-timeline-item
v-for="(evenType, key) in listLogs.logs"
:key="key"
:timestamp="translateDate(evenType.logDate)"
placement="top"
:color="listLogs.eventType === 1 ? 'rgb(22, 130, 230)' : 'rgba(67, 147, 239, 1)'"
>
<el-card shadow="hover" @click.native="changeField(evenType)">
<div>
<span>{{ evenType.userName }}</span>
<el-link type="primary" style="float: right;" @click="showkey(key, index)"> {{ $t('window.containerInfo.changeDetail') }} </el-link>
<el-scrollbar wrap-class="scroll-window-log-change">
<el-timeline>
<el-timeline-item
v-for="(listLogs, key) in gettersListRecordLogs"
:key="key"
:timestamp="translateDate(listLogs.logDate)"
placement="top"
color="#008fd3"
>
<el-card shadow="hover" class="clearfix">
<div>
{{ listLogs.userName }}
<el-link type="primary" style="float: right;" @click="showkey(key)"> {{ $t('window.containerInfo.changeDetail') }} </el-link>
</div>
<br>
<el-collapse-transition>
<div v-show="(currentKey === key)">
<span v-for="(list, index) in listLogs.changeLogs" :key="index">
<p><b> {{ list.displayColumnName }} :</b> <strike> {{ list.oldDisplayValue }} </strike> {{ list.newDisplayValue }} </p>
</span>
</div>
<br>
<el-collapse-transition>
<div v-show="(currentKey === key) && (typeAction === index)" :key="key" class="text item">
<span><p><b> {{ evenType.displayColumnName }}: </b> <strike>{{ evenType.oldDisplayValue }} </strike> {{ evenType.newDisplayValue }}</p></span>
</div>
</el-collapse-transition>
</el-card>
</el-timeline-item>
</el-timeline>
</el-scrollbar>
</el-card>
</el-collapse-transition>
</el-card>
</el-timeline-item>
</el-timeline>
</el-scrollbar>
</div>
<div
v-else
@ -491,16 +488,16 @@ export default {
},
getTypeLogs() {
const groupLog = this.gettersListRecordLogs.reduce((groupLog, item) => {
if (!groupLog.includes(item.eventType)) {
groupLog.push(item.eventType)
if (!groupLog.includes(item.logId)) {
groupLog.push(item.logId)
}
return groupLog
}, [])
.map(i => {
.map(log => {
// agrup for logId
return {
logs: this.gettersListRecordLogs.filter(b => b.eventType === i),
eventType: i
logs: this.gettersListRecordLogs.filter(change => change.logId === log),
logId: log
}
})
return groupLog
@ -822,7 +819,7 @@ export default {
</style>
<style>
.scroll-window-log-change {
max-height: 45vh !important;
max-height: 74vh !important;
}
.scroll-window-log-workflow {
max-height: 68vh !important;