Browse Source

Merge remote-tracking branch 'origin/master' into feature/syp_residentInfo

feature/syp_points
songyunpeng 5 years ago
parent
commit
106b56e9e8
  1. 129
      src/views/modules/events/eventtag-add-or-update.vue
  2. 77
      src/views/modules/events/eventtag.vue
  3. 17
      src/views/modules/heart/actinfo-add-or-update.vue
  4. 9
      src/views/modules/heart/actinfo-detail-view.vue
  5. 4
      src/views/modules/points/userinfo-points-adjust.vue
  6. 4
      src/views/modules/points/volunteerinfo-points-adjust.vue

129
src/views/modules/events/eventtag-add-or-update.vue

@ -0,0 +1,129 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="标签名称" prop="tagName">
<el-input v-model="dataForm.tagName"
placeholder="请输入标签名称"
maxlength="20"
show-word-limit
clearable></el-input>
</el-form-item>
<el-form-item label="排序"
prop="sort">
<el-input-number v-model="dataForm.sort"
controls-position="right"
:min="0">
</el-input-number>
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-select v-model="dataForm.enableFlag" placeholder="请选择" clearable>
<el-option v-for="item in enableFlagArr"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="description">
<el-input type="text"
:rows="3"
v-model="dataForm.description" placeholder="请输入备注"
show-word-limit
clearable
maxlength="100"></el-input>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
export default {
data () {
return {
visible: false,
dataForm: {
id: '',
tagName: '',
description: '',
sort: '',
enableFlag: ''
},
enableFlagArr: [
{
label: '是',
value: '1'
},
{
label: '否',
value: '0'
}
]
}
},
computed: {
dataRule () {
return {
tagName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
sort: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
enableFlag: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
methods: {
init () {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.getInfo()
}
})
},
//
getInfo () {
this.$http.get(`/events/eventtag/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data
}
}).catch(() => {})
},
//
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http[!this.dataForm.id ? 'post' : 'put']('/events/eventtag/', this.dataForm).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 })
}
}
</script>

77
src/views/modules/events/eventtag.vue

@ -0,0 +1,77 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-news__eventtag}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.tagName" placeholder="标签名称" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column show-overflow-tooltip prop="tagName" label="标签名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="enableFlag" label="是否启用" header-align="center" align="center" width="80" :formatter="enableFlagFormat"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center" width="80"></el-table-column>
<el-table-column show-overflow-tooltip prop="description" label="备注" header-align="center" align="center"></el-table-column>
<el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center" width="160"></el-table-column>
<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="160"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</el-card>
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './eventtag-add-or-update'
export default {
mixins: [mixinViewModule],
data () {
return {
mixinViewModuleOptions: {
getDataListURL: '/events/eventtag/page',
getDataListIsPage: true,
deleteURL: '/events/eventtag',
deleteIsBatch: true
},
dataForm: {
id: '',
tagName: ''
}
}
},
components: {
AddOrUpdate
},
methods: {
enableFlagFormat: function (row, column) {
let enableFlag = row.enableFlag
if (enableFlag === '0') {
return '否'
} else if (enableFlag === '1') {
return '是'
}
}
}
}
</script>

17
src/views/modules/heart/actinfo-add-or-update.vue

@ -111,6 +111,17 @@
</el-date-picker>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="公益时长:"
prop="kindnessTime">
<el-input-number type="number"
:min="0"
v-model="dataForm.kindnessTime"
clearable
style="width:150px">
</el-input-number>&emsp;
</el-form-item>
</el-row>
<el-row>
<div>
<el-form-item label="打卡范围时间:"
@ -313,7 +324,8 @@ export default {
punishmentPoints: '',
reward: '',
actUserDefaultState: '1',
isConReview: false
isConReview: false,
kindnessTime: ''
},
isImgRequired: true,
mapSelectVisible: false,
@ -407,6 +419,9 @@ export default {
signupEndTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
kindnessTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
signinStartTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],

9
src/views/modules/heart/actinfo-detail-view.vue

@ -65,6 +65,12 @@
{{dataForm.actEndTime}}
</el-form-item>
</el-row>
<el-row>
<el-form-item label="公益时长:"
prop="kindnessTime">
{{dataForm.kindnessTime}}&emsp;小时
</el-form-item>
</el-row>
<el-row>
<div>
@ -188,7 +194,8 @@ export default {
deptId: '',
punishmentPoints: '',
actUserDefaultState: '1',
reward: ''
reward: '',
kindnessTime: ''
},
loading: false
}

4
src/views/modules/points/userinfo-points-adjust.vue

@ -46,8 +46,8 @@
<el-form-item label="操作类型 :"
prop="operationType">
<el-radio-group v-model="dataForm.operationType">
<el-radio :label="1">加积分</el-radio>
<el-radio :label="0">减积分</el-radio>
<el-radio v-if="$hasPermission('user:points:plus')" :label="1">加积分</el-radio>
<el-radio v-if="$hasPermission('user:points:less')" :label="0">减积分</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="积分调整 :"

4
src/views/modules/points/volunteerinfo-points-adjust.vue

@ -58,8 +58,8 @@
<el-form-item label="操作类型 :"
prop="operationType">
<el-radio-group v-model="dataForm.operationType">
<el-radio :label="1">加积分</el-radio>
<el-radio :label="0">减积分</el-radio>
<el-radio v-if="$hasPermission('volunteer:points:plus')" :label="1">加积分</el-radio>
<el-radio v-if="$hasPermission('volunteer:points:less')" :label="0">减积分</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="积分调整 :"

Loading…
Cancel
Save