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

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

master
王金鹏 6 years ago
parent
0b8a45a6dd 4ce747dcd1
commit
3e13a0da42
2 changed files with 325 additions and 58 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. 59
      src/views/modules/user/user-add-or-update.vue
  2. 318
      src/views/modules/user/user.vue

59
src/views/modules/user/user-add-or-update.vue
View File

@ -1,15 +1,41 @@
<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="nickname">
<!-- <el-form-item label="昵称" prop="nickname">
<el-input v-model="dataForm.nickname" placeholder="昵称"></el-input>
</el-form-item> -->
<el-form-item label="真实姓名" prop="realName">
<span >{{dataForm.realName}}</span>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
<span >{{dataForm.mobile}}</span>
</el-form-item>
<el-form-item label="密码" prop="password">
<el-input v-model="dataForm.password" placeholder="密码"></el-input>
<el-form-item label="身份证号" prop="identityNo">
<span >{{dataForm.identityNo}}</span>
</el-form-item>
<el-form-item label="是否党员">
<el-select v-model="dataForm.partyFlag" placeholder="请选择" >
<el-option
v-for="item in partyFlagOptions"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="扫码网格" >
<span >{{dataForm.street}} - </span>
<span >{{dataForm.community}} - </span>
<span >{{dataForm.grid}}</span>
</el-form-item>
<el-form-item label="居民住址" prop="address">
<el-input v-model="dataForm.address" placeholder="居民住址"></el-input>
</el-form-item>
<template>
<span>是否通过审核</span>&nbsp;&nbsp;
<el-radio v-model="radio" label="1">是</el-radio>
<el-radio v-model="radio" label="0">否</el-radio>
</template>
<el-form-item label="注册时间" prop="registerTime">
<el-input v-model="dataForm.registerTime" placeholder="注册时间"></el-input>
</el-form-item>
@ -54,15 +80,9 @@
</el-form-item>
<el-form-item label="最近登录位置维度" prop="lastLatitude">
<el-input v-model="dataForm.lastLatitude" placeholder="最近登录位置维度"></el-input>
</el-form-item>
<el-form-item label="真实姓名" prop="realName">
<el-input v-model="dataForm.realName" placeholder="真实姓名"></el-input>
</el-form-item>
<el-form-item label="身份证号" prop="identityNo">
<el-input v-model="dataForm.identityNo" placeholder="身份证号"></el-input>
</el-form-item>
<el-form-item label="居民住址" prop="address">
<el-input v-model="dataForm.address" placeholder="居民住址"></el-input>
</el-form-item>
<el-form-item label="微信OPENID" prop="wxOpenId">
<el-input v-model="dataForm.wxOpenId" placeholder="微信OPENID"></el-input>
@ -150,7 +170,6 @@ export default {
identityNo: '',
address: '',
wxOpenId: '',
partyFlag: '',
registerWay: '',
registerSource: '',
phoneProvince: '',
@ -164,8 +183,20 @@ export default {
createdTime: '',
updatedBy: '',
updatedTime: '',
delFlag: ''
}
delFlag: '',
partyFlag: ''
},
radio: '0',
partyFlagOptions: [{
id: '0',
name: '不是'
}, {
id: '1',
name: '是'
}, {
id: '1',
name: '全部'
}]
}
},
computed: {
@ -297,7 +328,7 @@ export default {
},
// 获取信息
getInfo () {
this.$http.get(`/epdc/user/${this.dataForm.id}`).then(({ data: res }) => {
this.$http.get(`/app-user/user/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}

318
src/views/modules/user/user.vue
View File

@ -1,12 +1,12 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-epdc__user}">
<template>
<el-tabs v-model="tabFlag" type="border-card" @tab-click="handleClick">
<el-tab-pane name="0">
<span slot="label"><i class="el-icon-date"></i> 待审核用户</span>
<template>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-row>
<el-button type="primary" plain>主要按钮</el-button>
<el-button type="primary" plain>成功按钮</el-button>
<el-button type="primary" plain>信息按钮</el-button>
</el-row>
<P></P>
<el-form-item label="街道">
<el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
@ -41,24 +41,257 @@
<p></p>
<el-form-item label="姓名">
<el-form-item>
<el-input v-model="dataForm.realName" placeholder="realName" clearable></el-input>
<el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-form-item>
<el-form-item label="手机号">
<el-form-item>
<el-input v-model="dataForm.mobile" placeholder="mobile" clearable></el-input>
<el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-form-item>
<el-form-item label="身份证号">
<el-form-item>
<el-input v-model="dataForm.identityNo" placeholder="identityNo" clearable></el-input>
<el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-form-item>
<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-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
</div>
<el-form-item>
<el-button v-if="$hasPermission('epdc:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('epdc:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item>
</el-form>
<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 prop="id" label="主键" header-align="center" align="center"></el-table-column> -->
<el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
<!-- <el-table-column prop="nickname" 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="partyFlag" label="是否是党员" :formatter="formatPartyFlag" header-align="center" align="center"></el-table-column>
<el-table-column prop="state" label="审核状态" header-align="center" align="center"></el-table-column>
<el-table-column prop="registerTime" label="注册时间" header-align="center" align="center"></el-table-column>
<!-- <el-table-column prop="phoneProvince" label="手机号所属省份" header-align="center" align="center"></el-table-column> -->
<el-table-column prop="street" label="所属街道" header-align="center" align="center"></el-table-column>
<el-table-column prop="community" label="所属社区" header-align="center" align="center"></el-table-column>
<el-table-column prop="grid" label="所属网格" header-align="center" align="center"></el-table-column>
<el-table-column prop="address" 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" @click="addOrUpdateHandle(scope.row.id)">审核</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> -->
</template>
</el-tab-pane>
<el-tab-pane name="1">
<span slot="label"><i class="el-icon-date"></i> 已审核用户</span>
<template>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<P></P>
<el-form-item label="街道">
<el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
<el-option
v-for="item in streetOptions"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="社区">
<el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
<el-option
v-for="item in communityOptions"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="网格">
<el-select v-model="dataForm.gridId" placeholder="请选择">
<el-option
v-for="item in gridOptions"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<p></p>
<el-form-item label="姓名">
<el-form-item>
<el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-form-item>
<el-form-item label="手机号">
<el-form-item>
<el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-form-item>
<el-form-item label="身份证号">
<el-form-item>
<el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-form-item>
<div class="block">
<el-form-item label="是否是党员">
<el-select v-model="dataForm.isParty" placeholder="请选择" >
<el-option
v-for="item in partyFlagOptions"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<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-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
</div>
<el-form-item>
<el-button v-if="$hasPermission('epdc:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('epdc:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item>
</el-form>
<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 prop="id" label="主键" header-align="center" align="center"></el-table-column> -->
<el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
<!-- <el-table-column prop="nickname" 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="partyFlag" label="是否是党员" :formatter="formatPartyFlag" header-align="center" align="center"></el-table-column>
<el-table-column prop="state" label="审核状态" header-align="center" align="center"></el-table-column>
<el-table-column prop="registerTime" label="注册时间" header-align="center" align="center"></el-table-column>
<!-- <el-table-column prop="phoneProvince" label="手机号所属省份" header-align="center" align="center"></el-table-column> -->
<el-table-column prop="street" label="所属街道" header-align="center" align="center"></el-table-column>
<el-table-column prop="community" label="所属社区" header-align="center" align="center"></el-table-column>
<el-table-column prop="grid" label="所属网格" header-align="center" align="center"></el-table-column>
<el-table-column prop="address" 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" @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> -->
</template>
</el-tab-pane>
<el-tab-pane name="2">
<span slot="label"><i class="el-icon-date"></i> 未通过用户</span>
<template>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<P></P>
<el-form-item label="街道">
<el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
<el-option
v-for="item in streetOptions"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="社区">
<el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
<el-option
v-for="item in communityOptions"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="网格">
<el-select v-model="dataForm.gridId" placeholder="请选择">
<el-option
v-for="item in gridOptions"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<p></p>
<el-form-item label="姓名">
<el-form-item>
<el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-form-item>
<el-form-item label="手机号">
<el-form-item>
<el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-form-item>
<el-form-item label="身份证号">
<el-form-item>
<el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-form-item>
<div class="block">
<span class="demonstration">注册时间</span>
<span class="demonstration">注册时间</span>&nbsp;&nbsp;
<el-date-picker
v-model="value1"
@change='setRegistTime'
v-model="time"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
@ -85,7 +318,7 @@
<!-- <el-table-column prop="nickname" 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="partyFlag" label="是否是党员(0-否，1-是)" :formatter="formatPartyFlag" header-align="center" align="center"></el-table-column>
<el-table-column prop="partyFlag" label="是否是党员" :formatter="formatPartyFlag" header-align="center" align="center"></el-table-column>
<el-table-column prop="state" label="审核状态" header-align="center" align="center"></el-table-column>
<el-table-column prop="registerTime" label="注册时间" header-align="center" align="center"></el-table-column>
<!-- <el-table-column prop="phoneProvince" label="手机号所属省份" header-align="center" align="center"></el-table-column> -->
@ -93,34 +326,6 @@
<el-table-column prop="community" label="所属社区" header-align="center" align="center"></el-table-column>
<el-table-column prop="grid" label="所属网格" header-align="center" align="center"></el-table-column>
<el-table-column prop="address" label="居民住址" header-align="center" align="center"></el-table-column>
<!-- <el-table-column prop="faceImg" label="头像" header-align="center" align="center"></el-table-column>
<el-table-column prop="sex" label="性别(女性-female，男性-male)" header-align="center" align="center"></el-table-column>
<el-table-column prop="birthday" label="生日" header-align="center" align="center"></el-table-column>
<el-table-column prop="email" label="邮箱" header-align="center" align="center"></el-table-column>
<el-table-column prop="telephone" label="电话" header-align="center" align="center"></el-table-column>
<el-table-column prop="zipCode" label="邮编" header-align="center" align="center"></el-table-column>
<el-table-column prop="profession" label="职业" header-align="center" align="center"></el-table-column>
<el-table-column prop="hobbies" label="爱好" header-align="center" align="center"></el-table-column>
<el-table-column prop="userSign" label="个性签名" header-align="center" align="center"></el-table-column>
<el-table-column prop="invitationCode" label="邀请码" header-align="center" align="center"></el-table-column>
<el-table-column prop="lastLoginTime" label="最近登录时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="lastLoginIp" label="最近登录IP" header-align="center" align="center"></el-table-column>
<el-table-column prop="lastLongitude" label="最近登录位置经度" header-align="center" align="center"></el-table-column>
<el-table-column prop="lastLatitude" label="最近登录位置维度" header-align="center" align="center"></el-table-column>
<el-table-column prop="wxOpenId" label="微信OPENID" header-align="center" align="center"></el-table-column>
<el-table-column prop="registerWay" label="注册方式（wx：微信注册）" header-align="center" align="center"></el-table-column>
<el-table-column prop="registerSource" label="用户来源(wp:公众号)" header-align="center" align="center"></el-table-column>
<el-table-column prop="phoneCity" label="手机号所属城市" header-align="center" align="center"></el-table-column>
<el-table-column prop="phoneCarrier" label="手机号所属运营商" header-align="center" align="center"></el-table-column>
<el-table-column prop="points" label="用户积分" header-align="center" align="center"></el-table-column>
<el-table-column prop="inviteUserId" label="邀请人ID" header-align="center" align="center"></el-table-column>
<el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
<el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
<el-table-column prop="createdBy" 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="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
<el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="delFlag" 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" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@ -137,8 +342,12 @@
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
</template>
</el-tab-pane>
</el-tabs>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</template>
</div>
</el-card>
</template>
@ -164,12 +373,27 @@ export default {
gridId: '',
realName: '',
mobile: '',
identityNo: ''
identityNo: '',
startTime: '',
endTime: '',
isParty: '',
tabFlag: '0'
},
streetOptions: [],
communityOptions: [],
gridOptions: [],
value1: ''
time: '',
state: '待审核用户',
partyFlagOptions: [{
id: '0',
name: '不是'
}, {
id: '1',
name: '是'
}, {
id: '1',
name: '全部'
}]
}
},
created () {
@ -203,8 +427,20 @@ export default {
this.gridOptions = res.data
}).catch(() => {})
},
setRegistTime () {
console.log(this.time[0])
this.dataForm.startTime = this.time[0]
this.dataForm.endTime = this.time[1]
},
formatPartyFlag: function (row, column) {
return row.partyFlag === 1 ? '是' : row.partyFlag === 0 ? '否' : '未知'
},
handleClick (tab, event) {
console.log(tab, event)
console.log(this.tabFlag)
if (this.tabFlag !== 1) {
this.dataForm.isParty = ''
}
}
},
components: {

Write Preview
Loading…
Cancel
Save