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

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

Browse Source
This commit is contained in:
aixianling
2022-02-23 15:16:39 +08:00
parent 8ab0d46eaf fc65a3a481
commit f85b24310b
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mods/AppIntegralApply/AppIntegralApply.vue
View File

@@ -25,7 +25,14 @@
</div>
<div class="card">
<span :class="item.auditStatus == 0 ? 'status0' : item.auditStatus == 1 ? 'status1' : 'status2'" class="status status0">{{ $dict.getLabel('auditStatus', item.auditStatus) }}</span>
<span :class="item.auditStatus == 0 ? 'status2' : item.auditStatus == 1 ? 'status0' : 'status1'" class="status">
<span>{{ $dict.getLabel('auditStatus', item.auditStatus) }}</span>
<span v-if="item.auditStatus == 1">
<span v-if="item.auditIntegral * 1 > 0">+</span>
<span>{{ item.auditIntegral }}分</span>
</span>
</span>
</div>
</div>
</template>
@@ -95,7 +102,7 @@ export default {
residentId: this.user.residentId,
description: this.searchObj,
applyIntegralType: this.value,
auditStatus: this.currentTab == '0' ? '' : this.currentTab == '1' ? '0' : this.currentTab == 2 ? '1|2' : '',
auditType: this.currentTab == '0' ? '' : this.currentTab == '1' ? '0' : this.currentTab == 2 ? '1|2' : '',
},
})
.then((res) => {

32
src/mods/AppIntegralApply/detail.vue
View File

@@ -37,53 +37,51 @@
<div class="middle">
<div class="img-title">审核详情</div>
<div class="cards">
<div class="cards" v-if="detail.auditStatus == 1 || detail.auditStatus == 2">
<div class="cards-left">审核结果</div>
<div class="cards-right" :style="{ class: detail.auditStatus == 0 ? 'status0' : detail.auditStatus == 1 ? 'status1' : 'status2' }">
<div class="cards-right" :class="detail.auditStatus == 0 ? 'status2' : detail.auditStatus == 1 ? 'status0' : detail.auditStatus == 2 ? 'status1' : ''">
{{ $dict.getLabel('auditStatus', detail.auditStatus) }}
</div>
</div>
<div class="cards">
<div class="cards" v-if="detail.auditStatus == 1">
<div class="cards-left">积分规则类型</div>
<div class="cards-right">
<span style="color: #1c6bdf">
<span>
{{ $dict.getLabel('atWillReportType', detail.applyIntegralType) }}
</span>
</div>
</div>
<div class="cards">
<div class="cards" v-if="detail.auditStatus == 1">
<div class="cards-left">积分规则事项</div>
<div class="cards-right" style="width: 75%; text-align: right">{{ detail.areaName }}</div>
<div class="cards-right" style="width: 75%; text-align: right">{{ detail.auditRuleName }}</div>
</div>
<div class="cards">
<div class="cards" v-if="detail.auditStatus == 1">
<div class="cards-left">积分调整</div>
<div class="cards-right" style="width: 75%; text-align: right">{{ detail.auditIntegral }}</div>
<div class="cards-right" style="width: 75%; text-align: right">
<span v-if="detail.auditIntegral * 1 > 0">+</span>
<span>{{ detail.auditIntegral }}分</span>
</div>
</div>
<div class="cards">
<div class="cards" v-if="detail.auditStatus == 1 || detail.auditStatus == 2">
<div class="cards-left">审核人</div>
<div class="cards-right" style="width: 75%; text-align: right">{{ detail.auditUserName }}</div>
</div>
<div class="cards">
<div class="cards" v-if="detail.auditStatus == 1 || detail.auditStatus == 2">
<div class="cards-left">审核时间</div>
<div class="cards-right" style="width: 75%; text-align: right">{{ detail.auditTime }}</div>
</div>
</div>
<div class="bottom">
<div class="cards">
<div class="cards-left">审核结果备份</div>
<div class="cards-right">{{ detail.beginTime }}</div>
</div>
<div class="bottom" v-if="detail.auditStatus == 2">
<div class="cards">
<div class="cards-left">驳回理由</div>
<div class="cards-right">
<span style="color: #1c6bdf">{{ detail.realNum }}</span>
<span>{{ detail.auditOpinion }}</span>
</div>
</div>
</div>