kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 29268

Browse Source
This commit is contained in:
kubbo
2022-04-24 10:12:13 +08:00
parent 6a75a3470f
commit 5ea1728dbb
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/party/partyMember/AppPartyMember.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="AppPartyMember"> <div class="AppPartyMember">
<component ref="component" :is="component" :selected.sync="selected" :instance="instance" :dict="dict"/> <component ref="component" :is="currentPage" :selected.sync="selected" v-bind="$props"/>
</div> </div>
</template> </template>
@@ -22,7 +22,8 @@ export default {
}, },
props: { props: {
instance: Function, instance: Function,
dict: Object dict: Object,
permissions:Function
}, },
data() { data() {
return { return {
@@ -31,7 +32,7 @@ export default {
}, },
computed: { computed: {
...mapState(['user']), ...mapState(['user']),
component() { currentPage() {
if (this.$route.hash == "#add") { if (this.$route.hash == "#add") {
return Add return Add
} else if (this.$route.hash == "#ns") { } else if (this.$route.hash == "#ns") {

2
packages/party/partyMember/components/List.vue
View File

@@ -179,7 +179,7 @@ export default {
// render: (h, {row}) => h('span', {class: `audit-${row.auditStatus}`}, this.dict.getLabel('auditStatus', row.auditStatus)) // render: (h, {row}) => h('span', {class: `audit-${row.auditStatus}`}, this.dict.getLabel('auditStatus', row.auditStatus))
// }, // },
{prop: 'partyStatus', label: '党籍状态', align: 'center', dict: 'partyStatus'}, {prop: 'partyStatus', label: '党籍状态', align: 'center', dict: 'partyStatus'},
{prop: 'joinPartyTime', label: '入党日期', align: 'center', formart: v => v ? v.split(' ')[0] : '-'}, {prop: 'joinPartyTime', label: '入党日期', align: 'center'},
{prop: 'partyPosition', label: '党内职务', align: 'center', dict: 'partyPosition'}, {prop: 'partyPosition', label: '党内职务', align: 'center', dict: 'partyPosition'},
{prop: 'flowStatus', label: '流动状态', align: 'center', dict: 'flowStatus'}, {prop: 'flowStatus', label: '流动状态', align: 'center', dict: 'flowStatus'},
], ],