Browse Source

Merge branch 'dev_1114' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_1114

master
李鹏飞 6 years ago
parent
commit
0fe77cc0cd
  1. 20
      src/views/modules/custom/evaluatedept.vue
  2. 44
      src/views/modules/custom/evaluateofficer-add-or-update.vue
  3. 160
      src/views/modules/custom/evaluateofficer-add.vue
  4. 110
      src/views/modules/custom/evaluateofficer.vue
  5. 19
      src/views/modules/custom/evaluateoption-add-or-update.vue
  6. 63
      src/views/modules/custom/evaluateoption.vue
  7. 18
      src/views/modules/custom/evaluaterole-add-or-update.vue
  8. 69
      src/views/modules/custom/evaluaterole-switch.vue
  9. 2
      src/views/modules/custom/evaluaterole.vue
  10. 29
      src/views/modules/heart/actinfo-add-or-update.vue
  11. 8
      src/views/modules/heart/actinfo-cancel.vue
  12. 4
      src/views/modules/heart/actinfo-detail-view.vue
  13. 12
      src/views/modules/heart/actphrase-add-or-update.vue
  14. 2
      src/views/modules/heart/actphrase.vue
  15. 53
      src/views/modules/heart/actuserclock-detail.vue
  16. 12
      src/views/modules/heart/actuserclocklog.vue
  17. 4
      src/views/modules/heart/actuserrelation-add-or-update.vue
  18. 22
      src/views/modules/heart/actuserrelation-detail.vue
  19. 11
      src/views/modules/heart/actuserrelation.vue
  20. 2
      src/views/modules/points/volunteerinfo-points-adjust.vue
  21. 4
      src/views/modules/user/volunteerinfo-check.vue
  22. 20
      src/views/modules/user/volunteerinfo-detail.vue

20
src/views/modules/custom/evaluatedept.vue

@ -2,8 +2,11 @@
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-custom__evaluatedept}"> <div class="mod-custom__evaluatedept}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <!-- <el-form-item>
<el-input v-model="dataForm.id" placeholder="id" clearable></el-input> <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
</el-form-item> -->
<el-form-item label="街道名称" prop="deptName">
<el-input v-model="dataForm.deptName" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
@ -25,6 +28,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('custom:evaluatedept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> <el-button v-if="$hasPermission('custom:evaluatedept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('custom:evaluatedept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button> <el-button v-if="$hasPermission('custom:evaluatedept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
<el-button type="text" size="small" @click="manageHandle(scope.row.deptId)">管理</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -39,6 +43,7 @@
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<evaluateofficer v-if="evaluateofficerVisible" ref="evaluateofficer" @refreshDataList="getDataList"></evaluateofficer>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -46,6 +51,7 @@
<script> <script>
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './evaluatedept-add-or-update' import AddOrUpdate from './evaluatedept-add-or-update'
import Evaluateofficer from './evaluateofficer'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data () { data () {
@ -58,11 +64,19 @@ export default {
}, },
dataForm: { dataForm: {
id: '' id: ''
} },
evaluateofficerVisible: false
} }
}, },
components: { components: {
AddOrUpdate AddOrUpdate,
Evaluateofficer
},
methods: {
manageHandle (deptId) {
this.$parent.selectComponent = 'Evaluateofficer'
this.$router.push({ path: '/custom-evaluateofficer', query: { deptId: deptId } })
}
} }
} }
</script> </script>

44
src/views/modules/custom/evaluateofficer-add-or-update.vue

@ -1,44 +1,30 @@
<template> <template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <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 :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="部门ID 部门表主键ID" prop="deptId"> <el-form-item v-if=false label="街道名称" prop="deptId">
<el-input v-model="dataForm.deptId" placeholder="部门ID 部门表主键ID"></el-input> <el-input v-model="dataForm.deptId" placeholder="部门ID 部门表主键ID"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="姓名" prop="fullName"> <el-form-item label="姓名" prop="fullName">
<el-input v-model="dataForm.fullName" placeholder="姓名"></el-input> <el-input v-model="dataForm.fullName" placeholder="姓名"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="性别(0-女,1-男)" prop="sex"> <el-form-item label="性别" prop="sex">
<el-input v-model="dataForm.sex" placeholder="性别(0-女,1-男)"></el-input> <el-select v-model="dataForm.sex" placeholder="性别">
<el-option v-for="item in sexFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="职位" prop="position"> <el-form-item label="单位职务" prop="position">
<el-input v-model="dataForm.position" placeholder="职位"></el-input> <el-input v-model="dataForm.position" placeholder="单位职务"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="点赞次数" prop="likesCount"> <!-- <el-form-item label="点赞次数" prop="likesCount">
<el-input v-model="dataForm.likesCount" placeholder="点赞次数"></el-input> <el-input v-model="dataForm.likesCount" placeholder="点赞次数"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="被踩次数" prop="opposeCount"> <el-form-item label="被踩次数" prop="opposeCount">
<el-input v-model="dataForm.opposeCount" placeholder="被踩次数"></el-input> <el-input v-model="dataForm.opposeCount" placeholder="被踩次数"></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">
<el-input v-model="dataForm.sort" placeholder="排序"></el-input> <!-- <el-input v-model="dataForm.sort" placeholder="排序"></el-input> -->
</el-form-item> <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
<el-form-item label="乐观锁" prop="revision">
<el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
</el-form-item>
<el-form-item label="删除标识 0:否,1:是" prop="delFlag">
<el-input v-model="dataForm.delFlag" placeholder="删除标识 0:否,1:是"></el-input>
</el-form-item>
<el-form-item label="创建人" prop="createdBy">
<el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
</el-form-item>
<el-form-item label="创建时间" prop="createdTime">
<el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
</el-form-item>
<el-form-item label="更新人" prop="updatedBy">
<el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
</el-form-item>
<el-form-item label="更新时间" prop="updatedTime">
<el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">
@ -69,7 +55,11 @@ export default {
createdTime: '', createdTime: '',
updatedBy: '', updatedBy: '',
updatedTime: '' updatedTime: ''
} },
sexFlagArr: [
{ dictValue: '1', dictName: '男' },
{ dictValue: '0', dictName: '女' }
]
} }
}, },
computed: { computed: {

160
src/views/modules/custom/evaluateofficer-add.vue

@ -0,0 +1,160 @@
<template>
<el-dialog :visible.sync="visible" :title="$t('add')" :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 v-if=false label="街道ID" prop="deptId">
<el-input v-model="dataForm.deptId" placeholder="部门ID 部门表主键ID"></el-input>
</el-form-item>
<el-form-item label="姓名" prop="fullName">
<el-input v-model="dataForm.fullName" placeholder="姓名"></el-input>
</el-form-item>
<el-form-item label="性别" prop="sex">
<el-select v-model="dataForm.sex" placeholder="性别">
<el-option v-for="item in sexFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="单位职务" prop="position">
<el-input v-model="dataForm.position" placeholder="单位职务"></el-input>
</el-form-item>
<!-- <el-form-item label="点赞次数" prop="likesCount">
<el-input v-model="dataForm.likesCount" placeholder="点赞次数"></el-input>
</el-form-item>
<el-form-item label="被踩次数" prop="opposeCount">
<el-input v-model="dataForm.opposeCount" placeholder="被踩次数"></el-input>
</el-form-item> -->
<el-form-item label="排序" prop="sort">
<!-- <el-input v-model="dataForm.sort" placeholder="排序"></el-input> -->
<el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
</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: '',
deptId: '',
fullName: '',
sex: '',
position: '',
likesCount: '',
opposeCount: '',
sort: '',
revision: '',
delFlag: '',
createdBy: '',
createdTime: '',
updatedBy: '',
updatedTime: ''
},
sexFlagArr: [
{ dictValue: '1', dictName: '男' },
{ dictValue: '0', dictName: '女' }
]
}
},
// mounted () {
// // this.dataForm.id = this.$route.query.id
// this.dataForm.deptId = this.$route.query.deptId
// },
computed: {
dataRule () {
return {
deptId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
fullName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
sex: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
position: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
likesCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
opposeCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
sort: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
revision: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
delFlag: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
createdBy: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
createdTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
updatedBy: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
updatedTime: [
{ 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(`/custom/evaluateofficer/${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']('/custom/evaluateofficer/', 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>

110
src/views/modules/custom/evaluateofficer.vue

@ -2,14 +2,54 @@
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-custom__evaluateofficer}"> <div class="mod-custom__evaluateofficer}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <!-- <el-form-item>
<el-input v-model="dataForm.id" placeholder="id" clearable></el-input> <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
</el-form-item> -->
<el-form-item label="干部名称" prop="fullName">
<el-input v-model="dataForm.fullName" placeholder="干部名称" clearable></el-input>
</el-form-item>
<el-form-item label="时间"
prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> <el-button type="primary" @click="evaluateofficerAddHandle(dataForm.deptId)">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('epdc:topic:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
<el-form-item>
<el-upload class="upload-demo"
ref="upload"
v-loading="dataListLoading"
:action="uploadUrl"
:on-preview="handlePreview"
multiple
:limit="1"
:on-success='uploadSuccess'
:on-error='errorExceed'>
<el-button type="primary">导入</el-button>
</el-upload>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('custom:evaluateofficer:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button> <el-button v-if="$hasPermission('custom:evaluateofficer:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@ -17,9 +57,9 @@
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="fullName" label="姓名" header-align="center" align="center"></el-table-column> <el-table-column prop="fullName" label="干部姓名" header-align="center" align="center"></el-table-column>
<el-table-column prop="sex" label="性别(0-女,1-男)" header-align="center" align="center"></el-table-column> <el-table-column prop="sex" label="性别" header-align="center" align="center" :formatter="showFlagFormat"></el-table-column>
<el-table-column prop="position" label="职位" header-align="center" align="center"></el-table-column> <el-table-column prop="position" label="单位职务" header-align="center" align="center"></el-table-column>
<el-table-column prop="likesCount" label="点赞次数" header-align="center" align="center"></el-table-column> <el-table-column prop="likesCount" label="点赞次数" header-align="center" align="center"></el-table-column>
<el-table-column prop="opposeCount" label="被踩次数" header-align="center" align="center"></el-table-column> <el-table-column prop="opposeCount" label="被踩次数" header-align="center" align="center"></el-table-column>
<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column> <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
@ -42,6 +82,7 @@
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<evaluateofficer-add v-if="evaluateofficerAddVisible" ref="evaluateofficerAdd" @refreshDataList="getDataList"></evaluateofficer-add>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -49,6 +90,8 @@
<script> <script>
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './evaluateofficer-add-or-update' import AddOrUpdate from './evaluateofficer-add-or-update'
import evaluateofficerAdd from './evaluateofficer-add'
import Cookies from 'js-cookie'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data () { data () {
@ -57,15 +100,64 @@ export default {
getDataListURL: '/custom/evaluateofficer/page', getDataListURL: '/custom/evaluateofficer/page',
getDataListIsPage: true, getDataListIsPage: true,
deleteURL: '/custom/evaluateofficer', deleteURL: '/custom/evaluateofficer',
deleteIsBatch: true deleteIsBatch: true,
exportURL: '/custom/evaluateofficer/export'
}, },
dataForm: { dataForm: {
id: '' id: '',
} deptId: ''
},
evaluateofficerAddVisible: false,
upLoadUrl: ''
} }
}, },
mounted () {
// this.dataForm.id = this.$route.query.id
this.dataForm.deptId = this.$route.query.deptId
},
components: { components: {
AddOrUpdate AddOrUpdate,
evaluateofficerAdd
},
created: function () {
this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/evaluateofficer/importExcel/${this.$route.query.deptId}?token=${Cookies.get('token')}`
},
methods: {
showFlagFormat (row, column) {
if (row.sex === '0') {
return '女'
} else {
return '男'
}
},
evaluateofficerAddHandle (deptId) {
this.evaluateofficerAddVisible = true
this.$nextTick(() => {
this.$refs.evaluateofficerAdd.dataForm.deptId = deptId
this.$refs.evaluateofficerAdd.init()
})
},
errorExceed (file, fileList) {
this.$message.error('上传失败请重试')
},
uploadSuccess (response, file, fileList) {
this.getDataList()//
this.dataListLoading = false
this.$refs.upload.clearFiles()
if (response.data !== null && response.data.length > 0) {
this.faultDataVisible = true
this.errordataList = response.data
return
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.getDataList()
}
})
}
} }
} }
</script> </script>

19
src/views/modules/custom/evaluateoption-add-or-update.vue

@ -2,16 +2,19 @@
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <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 :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="类别" prop="roleCode"> <el-form-item label="类别" prop="roleCode">
<el-input v-model="dataForm.roleCode" placeholder="权限编码(1.点赞,2.吐槽)"></el-input> <el-select v-model="dataForm.roleCode" placeholder="类别" clearable=true>
<el-option v-for="item in roleFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="available"> <el-form-item label="是否启用" prop="available">
<el-input v-model="dataForm.available" placeholder="可用标记(0-不可用,1-可用)"></el-input> <el-switch v-model="dataForm.available" active-color="#13ce66" inactive-color="#ff4949" active-value="1" inactive-value="0"></el-switch>
</el-form-item> </el-form-item>
<el-form-item label="显示顺序" prop="sort"> <el-form-item label="显示顺序" prop="sort">
<el-input v-model="dataForm.sort" placeholder="显示顺序"></el-input> <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="评价选项" prop="optionContent"> <el-form-item label="评价选项" prop="optionContent">
<el-input v-model="dataForm.optionContent" placeholder="评价选项"></el-input> <el-input type="textarea" :rows="2" placeholder="评价选项" v-model="dataForm.optionContent"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">
@ -32,14 +35,18 @@ export default {
roleCode: '', roleCode: '',
optionContent: '', optionContent: '',
sort: '', sort: '',
available: '', available: '1',
revision: '', revision: '',
delFlag: '', delFlag: '',
createdBy: '', createdBy: '',
createdTime: '', createdTime: '',
updatedBy: '', updatedBy: '',
updatedTime: '' updatedTime: ''
} },
roleFlagArr: [
{ dictValue: 1, dictName: '点赞' },
{ dictValue: 2, dictName: '吐槽' }
]
} }
}, },
computed: { computed: {

63
src/views/modules/custom/evaluateoption.vue

@ -2,8 +2,17 @@
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-custom__evaluateoption}"> <div class="mod-custom__evaluateoption}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <!-- <el-form-item>
<el-input v-model="dataForm.id" placeholder="id" clearable></el-input> <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
</el-form-item> -->
<el-form-item label="评价选项" prop="optionContent">
<el-input v-model="dataForm.optionContent" placeholder="评价选项" clearable></el-input>
</el-form-item>
<el-form-item label="类别" prop="roleCode">
<el-select v-model="dataForm.roleCode" placeholder="类别" clearable=true>
<el-option v-for="item in roleFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
@ -16,12 +25,16 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
<el-table-column prop="sort" label="序号" header-align="center" align="center"></el-table-column> <el-table-column prop="sort" label="序号" header-align="center" align="center"></el-table-column>
<el-table-column prop="optionContent" label="评价选项" header-align="center" align="center"></el-table-column> <el-table-column prop="optionContent" label="评价选项" header-align="center" align="center"></el-table-column>
<el-table-column prop="roleCode" label="类别" header-align="center" align="center"></el-table-column> <el-table-column prop="roleCode" label="类别" header-align="center" align="center" :formatter="showFlagFormat"></el-table-column>
<el-table-column prop="available" label="可用标记(0-不可用,1-可用)" header-align="center" align="center"></el-table-column> <el-table-column prop="available" label="操作" header-align="center" align="center">
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <template slot-scope="scope">
<el-switch v-model="scope.row.available" active-color="#13ce66" inactive-color="#ff4949" active-value="1" inactive-value="0" @change="availableHandle(scope.row.id,scope.row.available)"></el-switch>
</template>
</el-table-column>
<el-table-column v-if=false :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('custom:evaluateoption:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> <el-button v-if="$hasPermission('custom:evaluateoption:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('custom:evaluateoption:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button> <el-button v-if="$hasPermission('custom:evaluateoption:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
@ -58,11 +71,49 @@ export default {
}, },
dataForm: { dataForm: {
id: '' id: ''
} },
roleFlagArr: [
{ dictValue: 1, dictName: '点赞' },
{ dictValue: 2, dictName: '吐槽' }
]
} }
}, },
components: { components: {
AddOrUpdate AddOrUpdate
},
methods: {
showFlagFormat (row, column) {
if (row.roleCode === 1) {
return '点赞'
} else {
return '吐槽'
}
},
availableHandle (id, availableValue) {
let postData = {
id: id,
available: availableValue
}
this.$http['post'](
'/custom/evaluateoption/updateOptionInfo',
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(() => {})
}
} }
} }
</script> </script>

18
src/views/modules/custom/evaluaterole-add-or-update.vue

@ -9,24 +9,6 @@
</el-form-item> </el-form-item>
<el-form-item label="可用标记(0-不可用,1-可用)" prop="available"> <el-form-item label="可用标记(0-不可用,1-可用)" prop="available">
<el-input v-model="dataForm.available" placeholder="可用标记(0-不可用,1-可用)"></el-input> <el-input v-model="dataForm.available" placeholder="可用标记(0-不可用,1-可用)"></el-input>
</el-form-item>
<el-form-item label="删除标识 0:否,1:是" prop="delFlag">
<el-input v-model="dataForm.delFlag" placeholder="删除标识 0:否,1:是"></el-input>
</el-form-item>
<el-form-item label="乐观锁" prop="revision">
<el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
</el-form-item>
<el-form-item label="创建人" prop="createdBy">
<el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
</el-form-item>
<el-form-item label="创建时间" prop="createdTime">
<el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
</el-form-item>
<el-form-item label="更新人" prop="updatedBy">
<el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
</el-form-item>
<el-form-item label="更新时间" prop="updatedTime">
<el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">

69
src/views/modules/custom/evaluaterole-switch.vue

@ -0,0 +1,69 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-custom__evaluaterole}">
<el-form :inline="true" :model="dataForm" ref="dataForm">
<!-- <el-form-item>
<el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
</el-form-item> -->
<el-form-item label="是否开启“干部评价”功能" prop="available">
<el-switch v-model="dataForm.available" active-color="#13ce66" inactive-color="#ff4949" active-value="1" inactive-value="0" @change="availableHandle()"></el-switch>
</el-form-item>
</el-form>
</div>
</el-card>
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
export default {
mixins: [mixinViewModule],
data () {
return {
dataForm: {
id: ''
}
}
},
created () {
this.getInfo()
},
methods: {
//
getInfo () {
this.$http.get(`/custom/evaluaterole/getAvailable`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data
}
}).catch(() => {})
},
availableHandle () {
let postData = {
available: this.dataForm.available
}
this.$http['post'](
'/custom/evaluaterole/updateRoleInfo',
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(() => {})
}
}
}
</script>

2
src/views/modules/custom/evaluaterole.vue

@ -9,7 +9,7 @@
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('custom:evaluaterole:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('custom:evaluaterole:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button> <el-button v-if="$hasPermission('custom:evaluaterole:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>

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

@ -55,6 +55,7 @@
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm"
:picker-options="isSignupEndTime"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -180,6 +181,8 @@
prop="contacts"> prop="contacts">
<el-input v-model="dataForm.contacts" style="width:150px"></el-input> <el-input v-model="dataForm.contacts" style="width:150px"></el-input>
</el-form-item> </el-form-item>
</el-row>
<el-row>
<el-form-item label="联系电话:" <el-form-item label="联系电话:"
prop="tel"> prop="tel">
<el-input v-model="dataForm.tel" style="width:200px"></el-input> <el-input v-model="dataForm.tel" style="width:200px"></el-input>
@ -238,9 +241,9 @@
prop="isBanner"> prop="isBanner">
<template> <template>
<el-radio v-model="dataForm.isBanner" <el-radio v-model="dataForm.isBanner"
label="1"></el-radio> label="1" @change="changeHandler"></el-radio>
<el-radio v-model="dataForm.isBanner" <el-radio v-model="dataForm.isBanner"
label="0"></el-radio> label="0" @change="changeHandler"></el-radio>
</template> </template>
</el-form-item> </el-form-item>
</el-row> </el-row>
@ -266,7 +269,7 @@
<el-form-item label-width="500px"> <el-form-item label-width="500px">
<el-button type="primary" :disabled="isAble" <el-button type="primary" :disabled="isAble"
@click="dataFormSubmitHandle()">{{$t("confirm")}}</el-button> @click="dataFormSubmitHandle()">{{$t("confirm")}}</el-button>
<el-button @click="backToActList">{{ $t('cancel') }}</el-button> <el-button @click="backToActList">返回</el-button>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
@ -318,6 +321,12 @@ export default {
actUserDefaultState: '1', actUserDefaultState: '1',
bannerUrl:"" bannerUrl:""
}, },
isSignupEndTime: {
disabledDate(time) {
return time < Date.now() - 8.64e7;//8.64e7=1000*60*60*24
}
},
isImgRequired: true,
mapSelectVisible:false, mapSelectVisible:false,
signInIsAble: true, signInIsAble: true,
isAble: false, isAble: false,
@ -497,6 +506,9 @@ export default {
], ],
updatedTime: [ updatedTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
isBanner: [
{ required: this.isImgRequired, message: this.$t('validate.required'), trigger: 'blur' }
] ]
} }
} }
@ -505,6 +517,13 @@ export default {
dateChangeTime(){ dateChangeTime(){
this.dataForm.signinStartTime = this.dataForm.actStartTime this.dataForm.signinStartTime = this.dataForm.actStartTime
}, },
changeHandler(value) {
if(value == 1){
this.isImgRequired = true
} else{
this.isImgRequired = false
}
},
backToActList () { backToActList () {
this.$emit('refreshDataList') this.$emit('refreshDataList')
this.$parent.selectComponent = 'ActInfoList' this.$parent.selectComponent = 'ActInfoList'
@ -607,9 +626,9 @@ export default {
return this.$message.error('活动结束时间必须大于活动开始时间。'); return this.$message.error('活动结束时间必须大于活动开始时间。');
} }
if (signinEndTime < actStarTime) { if (signinEndTime < actEndTime) {
return this.$message.error('签到结束时间必须大于签到开始时间。'); return this.$message.error('签到结束时间必须大于活动结束时间。');
} }
this.isAble = true this.isAble = true

8
src/views/modules/heart/actinfo-cancel.vue

@ -1,13 +1,7 @@
<template> <template>
<el-dialog :visible.sync="visible" :title="$t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible" :title="$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' : '120px'"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
<el-form-item label="取消原因 :" prop="cancelReason">
<el-form-item label=" " >
<p>
活动取消并发送通知给已报名的志愿者是否确定取消
</p>
</el-form-item>
<el-form-item label="取消原因" prop="cancelReason">
<el-input v-model="dataForm.cancelReason" placeholder="请输入原因,50字以内" <el-input v-model="dataForm.cancelReason" placeholder="请输入原因,50字以内"
type="textarea" type="textarea"
style="width:500px" style="width:500px"

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

@ -98,6 +98,8 @@
prop="contacts"> prop="contacts">
{{dataForm.contacts}} {{dataForm.contacts}}
</el-form-item> </el-form-item>
</el-row>
<el-row>
<el-form-item label="联系电话:" <el-form-item label="联系电话:"
prop="tel"> prop="tel">
{{dataForm.tel}} {{dataForm.tel}}
@ -148,7 +150,7 @@
<el-row> <el-row>
<el-form-item label-width="500px"> <el-form-item label-width="500px">
<el-button size="small" style="width: 95px" @click="back">{{ $t('cancel') }}</el-button> <el-button size="small" style="width: 95px" @click="back">返回</el-button>
</el-form-item> </el-form-item>
</el-row> </el-row>

12
src/views/modules/heart/actphrase-add-or-update.vue

@ -1,22 +1,22 @@
<template> <template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <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 :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '100px'">
<el-form-item label="常用语" prop="phrase"> <el-form-item label="常用语 :" prop="phrase">
<el-input v-model="dataForm.phrase" maxlength="500" show-word-limit placeholder="常用语"></el-input> <el-input v-model="dataForm.phrase" maxlength="500" show-word-limit placeholder="常用语"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="编码" prop="code"> <el-form-item label="编码 :" prop="code">
<el-input v-model="dataForm.code" maxlength="20" placeholder="编码"></el-input> <el-input v-model="dataForm.code" maxlength="20" placeholder="编码"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否显示" prop="showFlag"> <el-form-item label="是否显示 :" prop="showFlag">
<el-select v-model="dataForm.showFlag" placeholder="是否显示"> <el-select v-model="dataForm.showFlag" placeholder="是否显示">
<el-option v-for="item in showFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"> <el-option v-for="item in showFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="sort" label="显示顺序"> <el-form-item prop="sort" label="显示顺序 :">
<el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number> <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
</el-form-item> </el-form-item>
<!-- <el-form-item prop="usageNum" label="使用次数"> <!-- <el-form-item prop="usageNum" label="使用次数 :">
<el-input-number v-model="dataForm.usageNum" controls-position="right" :min="0" label="使用次数" disabled="true"></el-input-number> <el-input-number v-model="dataForm.usageNum" controls-position="right" :min="0" label="使用次数" disabled="true"></el-input-number>
</el-form-item> --> </el-form-item> -->
</el-form> </el-form>

2
src/views/modules/heart/actphrase.vue

@ -5,7 +5,7 @@
<!--<el-form-item label="ID" prop="id"> <!--<el-form-item label="ID" prop="id">
<el-input v-model="dataForm.id" placeholder="ID" clearable></el-input> <el-input v-model="dataForm.id" placeholder="ID" clearable></el-input>
</el-form-item>--> </el-form-item>-->
<el-form-item label="常用语" prop="phrase"> <el-form-item label="常用语:" prop="phrase">
<el-input v-model="dataForm.phrase" placeholder="常用语" clearable></el-input> <el-input v-model="dataForm.phrase" placeholder="常用语" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="编码" prop="code"> <el-form-item label="编码" prop="code">

53
src/views/modules/heart/actuserclock-detail.vue

@ -1,9 +1,9 @@
<template> <template>
<div class="project-handle"> <div class="project-handle">
<div class="project-detail"> <div class="project-detail">
<div class="project-detail-tip">处理操作</div> <div class="project-detail-tip">处理操作 :</div>
<el-form ref="dataForm" label-width="120px" label-position="right" style="width: 720px;" :model="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"> <el-form ref="dataForm" label-width="120px" label-position="right" style="width: 720px;" :model="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()">
<el-form-item label="是否加积分" prop="status"> <el-form-item label="是否加积分 :" prop="status">
<el-radio v-model="dataForm.status" :disabled="isAble" label="5">确认加积分</el-radio> <el-radio v-model="dataForm.status" :disabled="isAble" label="5">确认加积分</el-radio>
<el-radio v-model="dataForm.status" :disabled="isAble" label="6">拒绝加积分</el-radio> <el-radio v-model="dataForm.status" :disabled="isAble" label="6">拒绝加积分</el-radio>
</el-form-item> </el-form-item>
@ -30,18 +30,35 @@
<el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column> <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
<el-table-column prop="clockAddress" label="打卡地点" header-align="center" align="center"></el-table-column> <el-table-column prop="clockAddress" label="打卡地点" header-align="center" align="center"></el-table-column>
<el-table-column prop="clockDesc" label="打卡描述" header-align="center" align="center"></el-table-column> <el-table-column prop="clockDesc" label="打卡描述" header-align="center" align="center"></el-table-column>
<el-table-column label="图片" fixed="right" header-align="center" align="center" width="200"> <el-table-column label="图片" fixed="right" header-align="center" align="center" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<img v-if="scope.row.clockPic" <el-image
:src="scope.row.clockPic" class="avatar1"
class="avatar"> v-if="scope.row.clockPic[0]"
:src="scope.row.clockPic[0]"
:key="scope.row.clockPic[0]"
:preview-src-list="previewImgList"
@click="clickImg(scope.row.clockPic[0])"></el-image>
<el-image
class="avatar1"
v-if="scope.row.clockPic[1]"
:src="scope.row.clockPic[1]"
:key="scope.row.clockPic[1]"
:preview-src-list="previewImgList"
@click="clickImg(scope.row.clockPic[1])"></el-image>
<el-image
class="avatar1"
v-if="scope.row.clockPic[2]"
:src="scope.row.clockPic[2]"
:key="scope.row.clockPic[2]"
:preview-src-list="previewImgList"
@click="clickImg(scope.row.clockPic[2])"></el-image>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
var map; var map;
var markerList =[]; var markerList =[];
@ -69,8 +86,10 @@ export default {
address: '', address: '',
latitude: '', latitude: '',
longitude: '', longitude: '',
radius: 200 radius: 200,
clockPic: []
}, },
previewImgList: [],
isAble: false isAble: false
} }
}, },
@ -78,7 +97,6 @@ export default {
this.dataForm.id = this.$route.query.id this.dataForm.id = this.$route.query.id
this.dataForm.actId = this.$route.query.actId this.dataForm.actId = this.$route.query.actId
this.init() this.init()
console.log(this.dataForm);
}, },
computed: { computed: {
dataRule () { dataRule () {
@ -134,6 +152,11 @@ export default {
} }
}) })
}, },
//
clickImg (url) {
this.previewImgList = []
this.previewImgList.push(url)
},
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http.get( this.$http.get(
@ -250,6 +273,18 @@ export default {
} }
} }
</script> </script>
<style lang="scss">
.avatar1 {
width: 120px;
height: 120px;
}
.el-image-viewer__close {
top: 16%;
}
.el-table__fixed-right::before, .el-table__fixed::before {
background: transparent !important;
}
</style>
<style lang="scss"> <style lang="scss">
.project-handle { .project-handle {

12
src/views/modules/heart/actuserclocklog.vue

@ -34,7 +34,7 @@
<el-table-column prop="clockAddress" label="打卡地点" header-align="center" align="center"></el-table-column> <el-table-column prop="clockAddress" label="打卡地点" header-align="center" align="center"></el-table-column>
<el-table-column prop="clockCount" label="打卡次数" header-align="center" align="center"></el-table-column> <el-table-column prop="clockCount" label="打卡次数" header-align="center" align="center"></el-table-column>
<el-table-column prop="status" label="打卡状态" :formatter="formatState" header-align="center" align="center"></el-table-column> <el-table-column prop="status" label="打卡状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
<el-table-column prop="checkPoint" label="是否发放积分" header-align="center" align="center"></el-table-column> <el-table-column prop="checkPoint" :formatter="isCheckPoint" label="是否发放积分" header-align="center" align="center"></el-table-column>
<el-table-column prop="point" label="积分" header-align="center" align="center"></el-table-column> <el-table-column prop="point" label="积分" header-align="center" align="center"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
@ -124,7 +124,15 @@ export default {
return '男' return '男'
} }
}, },
//
isCheckPoint: function (row, column) {
let state = row.checkPoint
if (state === '0') {
return '否'
} else if (state === '1') {
return '是'
}
}
}, },
components: { components: {
ActUserClockDetail ActUserClockDetail

4
src/views/modules/heart/actuserrelation-add-or-update.vue

@ -1,7 +1,7 @@
<template> <template>
<el-dialog :visible.sync="visible" title="审核" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible" title="审核" :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' : '120px'"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
<el-form-item label="审核" prop="auditState"> <el-form-item label="审核 :" prop="auditState">
<template> <template>
<el-radio v-model="dataForm.status" <el-radio v-model="dataForm.status"
label="1">通过</el-radio> label="1">通过</el-radio>
@ -9,7 +9,7 @@
label="4">不通过</el-radio> label="4">不通过</el-radio>
</template> </template>
</el-form-item> </el-form-item>
<el-form-item label="请填写原因" prop="failureReason"> <el-form-item label="请填写原因 :" prop="failureReason">
<el-input v-model="dataForm.failureReason" placeholder="请输入原因,50字以内" <el-input v-model="dataForm.failureReason" placeholder="请输入原因,50字以内"
type="textarea" type="textarea"
style="width:500px" style="width:500px"

22
src/views/modules/heart/actuserrelation-detail.vue

@ -1,40 +1,40 @@
<template> <template>
<el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'"> <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
<el-form-item label="用户昵称" prop="nickname"> <el-form-item label="用户昵称 :" prop="nickname">
{{dataForm.nickname}} {{dataForm.nickname}}
</el-form-item> </el-form-item>
<el-form-item label="真实姓名" prop="realName"> <el-form-item label="真实姓名 :" prop="realName">
{{dataForm.realName}} {{dataForm.realName}}
</el-form-item> </el-form-item>
<el-form-item label="性别" prop="sex"> <el-form-item label="性别 :" prop="sex">
{{formatSex(dataForm.sex)}} {{formatSex(dataForm.sex)}}
</el-form-item> </el-form-item>
<el-form-item label="年龄" prop="age"> <el-form-item label="年龄 :" prop="age">
{{dataForm.age}} {{dataForm.age}}
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="mobile"> <el-form-item label="联系电话 :" prop="mobile">
{{dataForm.mobile}} {{dataForm.mobile}}
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="identityNo"> <el-form-item label="身份证号 :" prop="identityNo">
{{dataForm.identityNo}} {{dataForm.identityNo}}
</el-form-item> </el-form-item>
<el-form-item label="当前状态" prop="status"> <el-form-item label="当前状态 :" prop="status">
{{formatState(dataForm.status)}} {{formatState(dataForm.status)}}
<!-- <el-input v-model="dataForm.status" placeholder="当前状态(0-报名,1-审核通过,2-打卡,3-取消报名,4-审核不通过)"></el-input>--> <!-- <el-input v-model="dataForm.status" placeholder="当前状态(0-报名,1-审核通过,2-打卡,3-取消报名,4-审核不通过)"></el-input>-->
</el-form-item> </el-form-item>
<el-form-item label="原因" prop="failureReason"> <el-form-item label="原因 :" prop="failureReason">
{{dataForm.failureReason}} {{dataForm.failureReason}}
</el-form-item> </el-form-item>
<el-form-item label="审核时间" prop="auditTime"> <el-form-item label="审核时间 :" prop="auditTime">
{{dataForm.auditTime}} {{dataForm.auditTime}}
</el-form-item> </el-form-item>
<el-form-item label="报名时间" prop="signupTime"> <el-form-item label="报名时间 :" prop="signupTime">
{{dataForm.signupTime}} {{dataForm.signupTime}}
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button> <el-button @click="visible = false">返回</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>

11
src/views/modules/heart/actuserrelation.vue

@ -39,7 +39,8 @@
<el-table-column prop="failureReason" label="原因" header-align="center" align="center"></el-table-column> <el-table-column prop="failureReason" label="原因" header-align="center" align="center"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" :disabled="scope.row.status ==='0'? false :true" @click="addOrUpdateHandle(scope.row.id)">审核</el-button> <el-button type="text" size="small" v-if="show" @click="addOrUpdateHandle(scope.row.id)">审核</el-button>
<!-- <el-button type="text" size="small" :disabled="scope.row.status ==='0'? false :true" @click="addOrUpdateHandle(scope.row.id)">审核</el-button> -->
<el-button v-if="$hasPermission('heart:actinfo:look')" type="text" size="small" @click="detailHandle(scope.row.id)">查看</el-button> <el-button v-if="$hasPermission('heart:actinfo:look')" type="text" size="small" @click="detailHandle(scope.row.id)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -76,6 +77,7 @@ export default {
deleteURL: '/heart/actuserrelation', deleteURL: '/heart/actuserrelation',
deleteIsBatch: true deleteIsBatch: true
}, },
show: false,
dataForm: { dataForm: {
id: '', id: '',
actId: '', actId: '',
@ -114,18 +116,25 @@ export default {
formatState: function (row, column) { formatState: function (row, column) {
let state = row.status let state = row.status
if (state === '0') { if (state === '0') {
this.show = true
return '报名' return '报名'
} else if (state === '1') { } else if (state === '1') {
this.show = false
return '审核通过' return '审核通过'
} else if (state === '2') { } else if (state === '2') {
this.show = false
return '打卡' return '打卡'
} else if (state === '3') { } else if (state === '3') {
this.show = false
return '取消报名' return '取消报名'
} else if (state === '4') { } else if (state === '4') {
this.show = false
return '审核不通过' return '审核不通过'
} else if (state === '5') { } else if (state === '5') {
this.show = false
return '确认加积分' return '确认加积分'
} else if (state === '6') { } else if (state === '6') {
this.show = false
return '拒绝加积分' return '拒绝加积分'
} }
}, },

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

@ -36,7 +36,7 @@
<el-form-item label="积分 :"> <el-form-item label="积分 :">
<div>{{dataForm.points}}</div> <div>{{dataForm.points}}</div>
</el-form-item> </el-form-item>
<el-form-item label="积分行为" prop="behaviorCode"> <el-form-item label="积分行为 :" prop="behaviorCode">
<el-select v-model="dataForm.behaviorCode"> <el-select v-model="dataForm.behaviorCode">
<el-option <el-option
v-for="item in behaviorTypeList" v-for="item in behaviorTypeList"

4
src/views/modules/user/volunteerinfo-check.vue

@ -13,13 +13,13 @@
@keyup.enter.native="dataFormSubmitHandle()" @keyup.enter.native="dataFormSubmitHandle()"
:label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"
> >
<el-form-item label="审核" prop="auditStatus"> <el-form-item label="审核 :" prop="auditStatus">
<template> <template>
<el-radio v-model="dataForm.auditStatus" label="1">通过</el-radio> <el-radio v-model="dataForm.auditStatus" label="1">通过</el-radio>
<el-radio v-model="dataForm.auditStatus" label="2">不通过</el-radio> <el-radio v-model="dataForm.auditStatus" label="2">不通过</el-radio>
</template> </template>
</el-form-item> </el-form-item>
<el-form-item v-if="dataForm.auditStatus === '2'" label="填写原因" prop="failureReason"> <el-form-item v-if="dataForm.auditStatus === '2'" label="填写原因 :" prop="failureReason">
<el-input <el-input
v-model="dataForm.failureReason" v-model="dataForm.failureReason"
maxlength="50" maxlength="50"

20
src/views/modules/user/volunteerinfo-detail.vue

@ -10,35 +10,35 @@
:rules="dataRule" :rules="dataRule"
ref="dataForm" ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()" @keyup.enter.native="dataFormSubmitHandle()"
:label-width="$i18n.locale === 'en-US' ? '120px' : '110px'" :label-width="$i18n.locale === 'en-US' ? '120px' : '130px'"
> >
<el-form-item label="姓名" prop="realName" v-if="dataForm.realName"> <el-form-item label="姓名 :" prop="realName" v-if="dataForm.realName">
<span>{{dataForm.realName}}</span> <span>{{dataForm.realName}}</span>
</el-form-item> </el-form-item>
<el-form-item label="性别" prop="sex"> <el-form-item label="性别 :" prop="sex">
<div v-if="dataForm.sex === '1'"></div> <div v-if="dataForm.sex === '1'"></div>
<div v-if="dataForm.sex === '0'"></div> <div v-if="dataForm.sex === '0'"></div>
<div v-if="dataForm.sex !=='0' && dataForm.sex !=='1'">未知</div> <div v-if="dataForm.sex !=='0' && dataForm.sex !=='1'">未知</div>
</el-form-item> </el-form-item>
<el-form-item label="出生日期" prop="birthdayString"> <el-form-item label="出生日期 :" prop="birthdayString">
<span>{{dataForm.birthdayString}}</span> <span>{{dataForm.birthdayString}}</span>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="mobile"> <el-form-item label="手机号 :" prop="mobile">
<span>{{dataForm.mobile}}</span> <span>{{dataForm.mobile}}</span>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="identityNo"> <el-form-item label="身份证号 :" prop="identityNo">
<span>{{dataForm.identityNo}}</span> <span>{{dataForm.identityNo}}</span>
</el-form-item> </el-form-item>
<el-form-item label="地址" prop="address"> <el-form-item label="地址 :" prop="address">
<span>{{dataForm.address}}</span> <span>{{dataForm.address}}</span>
</el-form-item> </el-form-item>
<el-form-item label="自我介绍" prop="introduce"> <el-form-item label="自我介绍 :" prop="introduce">
<span>{{dataForm.introduce}}</span> <span>{{dataForm.introduce}}</span>
</el-form-item> </el-form-item>
<el-form-item label="积分" prop="points"> <el-form-item label="积分 :" prop="points">
<span>{{dataForm.points}}</span> <span>{{dataForm.points}}</span>
</el-form-item> </el-form-item>
<el-form-item label="成为志愿者时间" prop="registTimeString"> <el-form-item label="成为志愿者时间 :" prop="registTimeString">
<span>{{dataForm.registTimeString}}</span> <span>{{dataForm.registTimeString}}</span>
</el-form-item> </el-form-item>
</el-form> </el-form>

Loading…
Cancel
Save