elink-star
/
esua-epdc-admin
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug

master
曲树通 6 years ago
parent
4ce1aadb0c
commit
d9fd5097a2
3 changed files with 225 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 128
      src/views/modules/heart/actuserclocklog.vue
  2. 139
      src/views/modules/heart/actuserrelation.vue
  3. 3
      src/views/modules/user/volunteerinfo.vue

128
src/views/modules/heart/actuserclocklog.vue
View File

@ -1,50 +1,118 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<el-card shadow="never"
class="aui-card--fill">
<div class="mod-heart__actuserclocklog}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item>
<el-button type="primary" @click="backToActList">返回</el-button>
<el-button type="primary"
@click="backToActList">返回</el-button>
</el-form-item>
<div>
<el-form-item label="状态">
<el-select v-model="dataForm.status" placeholder="状态" clearable>
<el-option label="审核通过" :value="1"></el-option>
<el-option label="打卡" :value="2"></el-option>
<el-option label="确认加积分" :value="5"></el-option>
<el-option label="拒绝加积分" :value="6"></el-option>
<el-select v-model="dataForm.status"
placeholder="状态"
clearable>
<el-option label="审核通过"
:value="1"></el-option>
<el-option label="打卡"
:value="2"></el-option>
<el-option label="确认加积分"
:value="5"></el-option>
<el-option label="拒绝加积分"
:value="6"></el-option>
</el-select>
</el-form-item>
<el-form-item label="姓名"><el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input></el-form-item>
<el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></el-form-item>
<el-form-item label="姓名">
<el-input v-model="dataForm.realName"
placeholder="请输入"
clearable></el-input>
</el-form-item>
<el-form-item label="手机号">
<el-input v-model="dataForm.mobile"
placeholder="请输入"
clearable></el-input>
</el-form-item>
</div>
<div class="block">
<span class="demonstration">注册时间</span>&nbsp;&nbsp;
<el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
<el-date-picker @change='setRegistTime'
v-model="time"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"></el-date-picker>&nbsp;
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
</div>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
<el-table-column prop="realName" label="报名人" header-align="center" align="center"></el-table-column>
<el-table-column prop="sex" label="性别" :formatter="formatSex" header-align="center" align="center"></el-table-column>
<el-table-column prop="age" 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="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="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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<el-table v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;">
<el-table-column label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="realName"
label="报名人"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="sex"
label="性别"
:formatter="formatSex"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="age"
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="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="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 :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150">
<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 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>
</el-table-column>
</el-table>
<el-pagination
:current-page="page"
<el-pagination :current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
@ -53,7 +121,9 @@
@current-change="pageCurrentChangeHandle">
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<actuserclock-detai v-if="detailVisible" ref="actuserrelationDetail" @refreshDataList="getDataList"></actuserclock-detai>
<actuserclock-detai v-if="detailVisible"
ref="actuserrelationDetail"
@refreshDataList="getDataList"></actuserclock-detai>
</div>
</el-card>
</template>
@ -95,6 +165,10 @@ export default {
this.$router.push({ path: '/heart-actinfo', query: { id: id, actId: this.dataForm.actId } })
},
setRegistTime () {
if (this.time === null) {
this.dataForm.startTime = ''
this.dataForm.endTime = ''
}
this.dataForm.startTime = this.time[0]
this.dataForm.endTime = this.time[1]
},

139
src/views/modules/heart/actuserrelation.vue
View File

@ -1,52 +1,123 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<el-card shadow="never"
class="aui-card--fill">
<div class="mod-heart__actuserrelation}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item>
<el-button type="primary" @click="backToActList">返回</el-button>
<el-button type="primary"
@click="backToActList">返回</el-button>
</el-form-item>
<div>
<el-form-item label="状态">
<el-select v-model="dataForm.status" placeholder="状态" clearable>
<el-option label="报名" :value="0"></el-option>
<el-option label="审核通过" :value="1"></el-option>
<el-option label="打卡" :value="2"></el-option>
<el-option label="取消报名" :value="3"></el-option>
<el-option label="审核不通过" :value="4"></el-option>
<el-select v-model="dataForm.status"
placeholder="状态"
clearable>
<el-option label="报名"
:value="0"></el-option>
<el-option label="审核通过"
:value="1"></el-option>
<el-option label="打卡"
:value="2"></el-option>
<el-option label="取消报名"
:value="3"></el-option>
<el-option label="审核不通过"
:value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="姓名"><el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input></el-form-item>
<el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></el-form-item>
<el-form-item label="姓名">
<el-input v-model="dataForm.realName"
placeholder="请输入"
clearable></el-input>
</el-form-item>
<el-form-item label="手机号">
<el-input v-model="dataForm.mobile"
placeholder="请输入"
clearable></el-input>
</el-form-item>
</div>
<div class="block">
<span class="demonstration">注册时间</span>&nbsp;&nbsp;
<el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
<el-date-picker @change='setRegistTime'
v-model="time"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"></el-date-picker>&nbsp;
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
</div>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
<el-table-column prop="realName" label="报名人" header-align="center" align="center"></el-table-column>
<el-table-column prop="sex" label="性别" :formatter="formatSex" header-align="center" align="center"></el-table-column>
<el-table-column prop="age" 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="identityNo" label="身份证号" header-align="center" align="center"></el-table-column>
<el-table-column prop="signupTime" 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="auditTime" 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 v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;">
<el-table-column label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="realName"
label="报名人"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="sex"
label="性别"
:formatter="formatSex"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="age"
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="identityNo"
label="身份证号"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="signupTime"
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="auditTime"
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">
<template slot-scope="scope">
<el-button type="text" size="small" v-if="show" @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>
</el-table-column>
</el-table>
<el-pagination
:current-page="page"
<el-pagination :current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
@ -55,8 +126,12 @@
@current-change="pageCurrentChangeHandle">
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<actuserrelation-detail v-if="detailVisible" ref="actuserrelationDetail" @refreshDataList="getDataList"></actuserrelation-detail>
<add-or-update v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList"></add-or-update>
<actuserrelation-detail v-if="detailVisible"
ref="actuserrelationDetail"
@refreshDataList="getDataList"></actuserrelation-detail>
</div>
</el-card>
</template>
@ -110,6 +185,10 @@ export default {
})
},
setRegistTime () {
if (this.time === null) {
this.dataForm.startTime = ''
this.dataForm.endTime = ''
}
this.dataForm.startTime = this.time[0]
this.dataForm.endTime = this.time[1]
},

3
src/views/modules/user/volunteerinfo.vue
View File

@ -83,8 +83,7 @@
<el-button type="text"
size="small"
@click="userDetailHandle(scope.row.id)">查看</el-button>
<el-button v-if="scope.row.auditStatus == 2"
type="text"
<el-button type="text"
size="small"
@click="checkHandle(scope.row.id,1)">审批</el-button>
<!-- <el-button type="text" size="small" @click="checkHandle(scope.row.id, 2)">拉入黑名单</el-button> -->

Write Preview
Loading…
Cancel
Save