diff --git a/src/views/modules/user/volunteerinfo-check.vue b/src/views/modules/user/volunteerinfo-check.vue
index 6fcf4b73..f45ca672 100644
--- a/src/views/modules/user/volunteerinfo-check.vue
+++ b/src/views/modules/user/volunteerinfo-check.vue
@@ -9,6 +9,7 @@
:model="dataForm"
:rules="dataRule"
ref="dataForm"
+ v-if="clickStatus === 1"
@keyup.enter.native="dataFormSubmitHandle()"
:label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"
>
@@ -27,10 +28,31 @@
>
-
+
+
+
+
+
+
{{ $t('cancel') }}
{{ $t('confirm') }}
+
+ {{ $t('cancel') }}
+ {{ $t('confirm') }}
+
@@ -46,6 +68,7 @@ export default {
failureReason: '',
tagIds: []
},
+ clickStatus: '',
tagOptions: [],
userGridList: []
}
@@ -110,6 +133,42 @@ export default {
1000,
{ leading: true, trailing: false }
),
+ // 拉黑
+ blackListSubmitHandle: debounce(
+ function () {
+ this.$refs['dataForm'].validate(valid => {
+ if (!valid) {
+ return false
+ }
+ let postData = {
+ id: this.dataForm.id,
+ auditStatus: '3',
+ failureReason: this.dataForm.failureReason
+ }
+ this.$http['post'](
+ '/app-user/volunteerinfo/volunteerInfoCheck',
+ postData
+ )
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.$message({
+ message: this.$t('prompt.success'),
+ type: 'success',
+ duration: 500,
+ onClose: () => {
+ this.visible = false
+ this.$emit('refreshDataList')
+ }
+ })
+ })
+ .catch(() => {})
+ })
+ },
+ 1000,
+ { leading: true, trailing: false }
+ ),
showLeaderFlagFormatter (row, column, cellValue, index) {
if (cellValue === '1') {
return '是'
diff --git a/src/views/modules/user/volunteerinfo-detail.vue b/src/views/modules/user/volunteerinfo-detail.vue
index 8bdb2834..752bcb18 100644
--- a/src/views/modules/user/volunteerinfo-detail.vue
+++ b/src/views/modules/user/volunteerinfo-detail.vue
@@ -16,13 +16,13 @@
{{dataForm.fullName}}
- {{dataForm.mobile}}
+ {{dataForm.sex}}
-
- {{dataForm.identityNo}}
+
+ {{dataForm.birthdayString}}
- {{dataForm.identityNo}}
+ {{dataForm.mobile}}
{{dataForm.identityNo}}
@@ -36,8 +36,8 @@
{{dataForm.points}}
-
- {{dataForm.registTime}}
+
+ {{dataForm.registTimeString}}
diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue
index 95090433..1260e044 100644
--- a/src/views/modules/user/volunteerinfo.vue
+++ b/src/views/modules/user/volunteerinfo.vue
@@ -44,10 +44,10 @@
header-align="center"
align="center"
>
-
+
-
+
审批
+ 拉入黑名单
积分调整
@@ -202,10 +206,11 @@ export default {
})
},
// 审批
- checkHandle (userId) {
+ checkHandle (userId, clickStatus) {
this.volunteerinfoCheckVisible = true
this.$nextTick(() => {
this.$refs.volunteerinfoCheck.dataForm.id = userId
+ this.$refs.volunteerinfoCheck.clickStatus = clickStatus
this.$refs.volunteerinfoCheck.init()
})
},
@@ -235,6 +240,8 @@ export default {
return '审核通过'
} else if (state === '2') {
return '审核不通过'
+ } else if (state === '3') {
+ return '已拉入黑名单'
}
}
},