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

Merge remote-tracking branch 'origin/build' into build

Browse Source
This commit is contained in:
aixianling
2023-01-09 13:53:30 +08:00
parent a176ee54fa 825c7210e2
commit 039cfb5673
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
project/pingchang/apps/AppPartyMember/components/Detail.vue
View File

@@ -71,14 +71,14 @@
<template #content> <template #content>
<div> <div>
<el-steps direction="vertical"> <el-steps direction="vertical">
<el-stepJ <el-step
v-for="(item, ind) in info.orgChangeLogs" :key="ind"> v-for="(item, ind) in info.orgChangeLogs" :key="ind">
<template slot="title"> <template slot="title">
<p style="color: #333; font-size:14px;">{{ item.createTime }}</p> <p style="color: #333; font-size:14px">{{ item.createTime }}</p>
<p style="color: #333; font-size:14px;">原组织：{{ item.oldPartyOrgName }}</p> <p style="color: #333; font-size:14px">原组织：{{ item.oldPartyOrgName }}</p>
<p style="color: #333; font-size:14px;">新组织：{{ item.newPartyOrgName }}</p> <p style="color: #333; font-size:14px">新组织：{{ item.newPartyOrgName }}</p>
</template> </template>
</el-stepJ> </el-step>
</el-steps> </el-steps>
</div> </div>
</template> </template>
@@ -307,7 +307,7 @@ export default {
activeName: '五星党员', activeName: '五星党员',
textlist: ['一星党员', '二星党员', '三星党员', '四星党员', '五星党员'], textlist: ['一星党员', '二星党员', '三星党员', '四星党员', '五星党员'],
colConfigs1: [ colConfigs1: [
{prop: 'starTime', label: '评定时间', align: 'center', format: v => v ? v.split(' ')[0] : '-'}, {prop: 'starTime', label: '评定时间', align: 'center', formart: v => v ? v.split(' ')[0] : '-'},
{slot: 'level'} {slot: 'level'}
], ],
colConfigs2: [ colConfigs2: [
@@ -316,7 +316,7 @@ export default {
{prop: 'position', label: '职务', align: 'center'} {prop: 'position', label: '职务', align: 'center'}
], ],
colConfigs3: [ colConfigs3: [
{prop: 'starTime', label: '时间', align: 'center', format: v => v ? v.split(' ')[0] : '-'}, {prop: 'starTime', label: '时间', align: 'center', formart: v => v ? v.split(' ')[0] : '-'},
{prop: 'disciplinaryInfo', label: '违纪原因', align: 'center'}, {prop: 'disciplinaryInfo', label: '违纪原因', align: 'center'},
{prop: 'result', label: '处理结果', align: 'center'} {prop: 'result', label: '处理结果', align: 'center'}
] ]