diff --git a/src/views/modules/points/pointsrule-add-or-update.vue b/src/views/modules/points/pointsrule-add-or-update.vue index ed9ee25a..d9c809ec 100644 --- a/src/views/modules/points/pointsrule-add-or-update.vue +++ b/src/views/modules/points/pointsrule-add-or-update.vue @@ -58,20 +58,20 @@ - - + + - - + + @@ -184,7 +184,7 @@ export default { ], limitTimeType: [ { - required: true, + required: false, message: this.$t('validate.required'), trigger: 'blur' } diff --git a/src/views/modules/points/volunteerinfo-points-adjust.vue b/src/views/modules/points/volunteerinfo-points-adjust.vue new file mode 100644 index 00000000..790f3df8 --- /dev/null +++ b/src/views/modules/points/volunteerinfo-points-adjust.vue @@ -0,0 +1,118 @@ + + + diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue index c52a7cb7..95090433 100644 --- a/src/views/modules/user/volunteerinfo.vue +++ b/src/views/modules/user/volunteerinfo.vue @@ -72,7 +72,7 @@ @click="checkHandle(scope.row.id)" v-if="scope.row.auditStatus == 0" >审批 - + 积分调整 @@ -115,7 +115,7 @@ import mixinViewModule from '@/mixins/view-module' import AddOrUpdate from './volunteerinfo-add-or-update' // import debounce from 'lodash/debounce' import volunteerinfoDetail from './volunteerinfo-detail' -import volunteerinfoPointsAdjust from './volunteerinfo-points-adjust' +import volunteerinfoPointsAdjust from '../points/volunteerinfo-points-adjust.vue' import volunteerinfoCheck from './volunteerinfo-check' // import func from '../../../../vue-temp/vue-editor-bridge' export default { @@ -210,10 +210,10 @@ export default { }) }, // 积分调整 - pointsAdjustHandle (userId) { + pointsAdjustHandle (id) { this.volunteerinfoPointsAdjustVisible = true this.$nextTick(() => { - this.$refs.volunteerinfoPointsAdjust.dataForm.id = userId + this.$refs.volunteerinfoPointsAdjust.dataForm.id = id this.$refs.volunteerinfoPointsAdjust.init() }) },