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

修改党员 用户 认证时间 注册时间

master
曲树通 6 years ago
parent
55a5ee97b5
commit
eacf692b09
6 changed files with 318 additions and 130 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 205
      src/views/modules/user/fail-authentication.vue
  2. 6
      src/views/modules/user/hasAuthenticationpartymembers.vue
  3. 2
      src/views/modules/user/partymembers.vue
  4. 4
      src/views/modules/user/pass-authentication.vue
  5. 229
      src/views/modules/user/unauthorized.vue
  6. 2
      src/views/modules/user/wait-authentication.vue

205
src/views/modules/user/fail-authentication.vue
View File

@ -1,59 +1,148 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-epdc__user}"> <div class="mod-epdc__user}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
<el-form-item label="所属机构"> :model="dataForm"
<el-cascader @keyup.enter.native="getDataList()">
v-model="deptIdList" <el-form-item label="所属机构">
:options="options" <el-cascader v-model="deptIdList"
:props="{ checkStrictly: true }" :options="options"
clearable> :props="{ checkStrictly: true }"
</el-cascader> clearable>
</el-form-item> </el-cascader>
<el-form-item label="街道" v-if="false"> </el-form-item>
<el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList"> <el-form-item label="街道"
<el-option v-for="(item, index) in streetOptions" :key="index" :label="item.name" :value="item.id"></el-option> v-if="false">
</el-select> <el-select v-model="dataForm.streetId"
</el-form-item> clearable
<el-form-item label="社区" v-if="false"> placeholder="请选择"
<el-select v-model="dataForm.communityId" clearable placeholder="请选择" @change="getGridList"> @change="getCommunityList">
<el-option v-for="(item,index) in communityOptions" :key="index" :label="item.name" :value="item.id"> </el-option> <el-option v-for="(item, index) in streetOptions"
</el-select> :key="index"
</el-form-item> :label="item.name"
<el-form-item label="网格" v-if="false"> :value="item.id"></el-option>
<el-select v-model="dataForm.gridId" clearable placeholder="请选择"> </el-select>
<el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option> </el-form-item>
</el-select> <el-form-item label="社区"
</el-form-item> v-if="false">
<el-form-item label="姓名"><el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input></el-form-item> <el-select v-model="dataForm.communityId"
<el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></el-form-item> clearable
<div class="block"> placeholder="请选择"
<span class="demonstration">注册时间</span>&nbsp;&nbsp; @change="getGridList">
<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-option v-for="(item,index) in communityOptions"
<el-form-item><el-button @click="getDataList()">{{ $t('query') }}</el-button></el-form-item> :key="index"
<el-form-item> :label="item.name"
<el-button v-if="$hasPermission('epdc:user:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button> :value="item.id"> </el-option>
</el-form-item> </el-select>
</div> </el-form-item>
</el-form> <el-form-item label="网格"
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> v-if="false">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> <el-select v-model="dataForm.gridId"
<el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column> clearable
<el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column> placeholder="请选择">
<el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column> <el-option v-for="(item,index) in gridOptions"
<el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column> :key="index"
<el-table-column prop="nickname" label="昵称" header-align="center" align="center"></el-table-column> :label="item.name"
<el-table-column prop="state" label="审核状态" v-if="false" :formatter="formatState" header-align="center" align="center"></el-table-column> :value="item.id"></el-option>
<el-table-column prop="registerTime" label="注册时间" header-align="center" align="center"></el-table-column> </el-select>
<el-table-column prop="address" label="居住地址" header-align="center" align="center"></el-table-column> </el-form-item>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="100"> <el-form-item label="姓名">
<template slot-scope="scope"><el-button type="text" size="mini" @click="userDetailHandle(scope.row.id)">查看</el-button></template> <el-input v-model="dataForm.realName"
</el-table-column> placeholder="请输入"
</el-table> clearable></el-input>
<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> </el-form-item>
<!-- 弹窗, 新增 / 修改 --> <el-form-item label="手机号">
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> <el-input v-model="dataForm.mobile"
<user-detail v-if="userDetailVisible" ref="userDetail" @refreshDataList="getDataList"></user-detail> placeholder="请输入"
clearable></el-input>
</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 v-if="$hasPermission('epdc:user:export')"
type="primary"
@click="exportHandle()">{{ $t('export') }}</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 type="selection"
header-align="center"
align="center"
width="50"></el-table-column>
<el-table-column label="序号"
width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
<el-table-column prop="realName"
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="nickname"
label="昵称"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="state"
label="审核状态"
v-if="false"
:formatter="formatState"
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="address"
label="居住地址"
header-align="center"
align="center"></el-table-column>
<el-table-column :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="100">
<template slot-scope="scope">
<el-button type="text"
size="mini"
@click="userDetailHandle(scope.row.id)">查看</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>
<user-detail v-if="userDetailVisible"
ref="userDetail"
@refreshDataList="getDataList"></user-detail>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -108,7 +197,7 @@ export default {
} }
this.options = res.data.options this.options = res.data.options
}) })
.catch(() => {}) .catch(() => { })
}, },
watch: { watch: {
'deptIdList': function (val) { 'deptIdList': function (val) {
@ -141,7 +230,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.streetOptions = res.data this.streetOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getCommunityList () { getCommunityList () {
this.communityOptions = this.gridOptions = [] this.communityOptions = this.gridOptions = []
@ -152,7 +241,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.communityOptions = res.data this.communityOptions = res.data
}).catch(() => {}) }).catch(() => { })
} }
}, },
getGridList () { getGridList () {
@ -164,7 +253,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => { })
} }
}, },
setRegistTime () { setRegistTime () {

6
src/views/modules/user/hasAuthenticationpartymembers.vue
View File

@ -95,7 +95,11 @@
:formatter="formatRegist" :formatter="formatRegist"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="registTime" <el-table-column prop="registerTime"
label="认证时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
label="注册时间" label="注册时间"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>

2
src/views/modules/user/partymembers.vue
View File

@ -170,7 +170,7 @@
header-align="center" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="registTime" <el-table-column prop="registTime"
label="注册时间" label="认证时间"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="allDeptNames" <el-table-column prop="allDeptNames"

4
src/views/modules/user/pass-authentication.vue
View File

@ -96,6 +96,10 @@
header-align="center" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="registerTime" <el-table-column prop="registerTime"
label="认证时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
label="注册时间" label="注册时间"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>

229
src/views/modules/user/unauthorized.vue
View File

@ -1,59 +1,150 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-epdc__user}"> <div class="mod-epdc__user}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
<el-form-item label="所属机构"> :model="dataForm"
<el-cascader @keyup.enter.native="getDataList()">
v-model="deptIdList" <el-form-item label="所属机构">
:options="options" <el-cascader v-model="deptIdList"
:props="{ checkStrictly: true }" :options="options"
clearable> :props="{ checkStrictly: true }"
</el-cascader> clearable>
</el-form-item> </el-cascader>
<el-form-item label="街道" v-if="false"> </el-form-item>
<el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList"> <el-form-item label="街道"
<el-option v-for="(item,index) in streetOptions" :key="index" :label="item.name" :value="item.id"></el-option> v-if="false">
</el-select> <el-select v-model="dataForm.streetId"
</el-form-item> clearable
<el-form-item label="社区" v-if="false"> placeholder="请选择"
<el-select v-model="dataForm.communityId" clearable placeholder="请选择" @change="getGridList"> @change="getCommunityList">
<el-option v-for="(item,index) in communityOptions" :key="index" :label="item.name" :value="item.id"></el-option> <el-option v-for="(item,index) in streetOptions"
</el-select> :key="index"
</el-form-item> :label="item.name"
<el-form-item label="网格" v-if="false"> :value="item.id"></el-option>
<el-select v-model="dataForm.gridId" clearable placeholder="请选择"> </el-select>
<el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option> </el-form-item>
</el-select> <el-form-item label="社区"
</el-form-item> v-if="false">
<el-form-item label="昵称"><el-input v-model="dataForm.nickname" placeholder="请输入" clearable></el-input></el-form-item> <el-select v-model="dataForm.communityId"
<el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></el-form-item> clearable
<!-- <div class="block"> --> placeholder="请选择"
<span class="demonstration">注册时间</span>&nbsp;&nbsp; @change="getGridList">
<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-option v-for="(item,index) in communityOptions"
<el-form-item><el-button @click="getDataList()">{{ $t('query') }}</el-button></el-form-item> :key="index"
<el-form-item> :label="item.name"
<el-button v-if="$hasPermission('epdc:user:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button> :value="item.id"></el-option>
</el-form-item> </el-select>
<!-- </div> --> </el-form-item>
</el-form> <el-form-item label="网格"
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> v-if="false">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> <el-select v-model="dataForm.gridId"
<el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column> clearable
<el-table-column prop="myGridName" label="所属网格（街道-社区-网格）" header-align="center" align="center" v-if="false"></el-table-column> placeholder="请选择">
<el-table-column prop="nickname" label="昵称" header-align="center" align="center"></el-table-column> <el-option v-for="(item,index) in gridOptions"
<el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column> :key="index"
<el-table-column prop="realName" label="真实姓名" header-align="center" align="center" v-if="false"></el-table-column> :label="item.name"
<el-table-column prop="identityNo" label="身份证号" header-align="center" align="center" v-if="false"></el-table-column> :value="item.id"></el-option>
<el-table-column prop="registerTime" label="加入网格时间" header-align="center" align="center"></el-table-column> </el-select>
<el-table-column prop="state" label="注册状态" :formatter="formatState" header-align="center" align="center"></el-table-column> </el-form-item>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="100"> <el-form-item label="昵称">
<template slot-scope="scope"><el-button type="text" size="small" @click="userDetailHandle(scope.row.id)">查看</el-button></template> <el-input v-model="dataForm.nickname"
</el-table-column> placeholder="请输入"
</el-table> clearable></el-input>
<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> </el-form-item>
<!-- 弹窗, 新增 / 修改 --> <el-form-item label="手机号">
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> <el-input v-model="dataForm.mobile"
<user-detail v-if="userDetailVisible" ref="userDetail" @refreshDataList="getDataList"></user-detail> placeholder="请输入"
clearable></el-input>
</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 v-if="$hasPermission('epdc:user:export')"
type="primary"
@click="exportHandle()">{{ $t('export') }}</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 type="selection"
header-align="center"
align="center"
width="50"></el-table-column>
<el-table-column label="序号"
width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
<el-table-column prop="myGridName"
label="所属网格（街道-社区-网格）"
header-align="center"
align="center"
v-if="false"></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="realName"
label="真实姓名"
header-align="center"
align="center"
v-if="false"></el-table-column>
<el-table-column prop="identityNo"
label="身份证号"
header-align="center"
align="center"
v-if="false"></el-table-column>
<el-table-column prop="createdTime"
label="加入网格时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="state"
label="注册状态"
:formatter="formatState"
header-align="center"
align="center"></el-table-column>
<el-table-column :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="100">
<template slot-scope="scope">
<el-button type="text"
size="small"
@click="userDetailHandle(scope.row.id)">查看</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>
<user-detail v-if="userDetailVisible"
ref="userDetail"
@refreshDataList="getDataList"></user-detail>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -109,7 +200,7 @@ export default {
} }
this.options = res.data.options this.options = res.data.options
}) })
.catch(() => {}) .catch(() => { })
}, },
watch: { watch: {
'deptIdList': function (val) { 'deptIdList': function (val) {
@ -142,7 +233,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.streetOptions = res.data this.streetOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getCommunityList () { getCommunityList () {
this.communityOptions = this.gridOptions = [] this.communityOptions = this.gridOptions = []
@ -153,7 +244,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.communityOptions = res.data this.communityOptions = res.data
}).catch(() => {}) }).catch(() => { })
} }
}, },
getGridList () { getGridList () {
@ -165,7 +256,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => { })
} }
}, },
setRegistTime () { setRegistTime () {
@ -205,17 +296,17 @@ export default {
...this.dataForm ...this.dataForm
} }
}).then(({ data: res }) => { }).then(({ data: res }) => {
this.dataListLoading = false this.dataListLoading = false
if (res.code !== 0) { if (res.code !== 0) {
this.dataList = [] this.dataList = []
this.total = 0 this.total = 0
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0 this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
}).catch(() => { }).catch(() => {
this.dataListLoading = false this.dataListLoading = false
}) })
}, },
userDetailHandle (userId) { userDetailHandle (userId) {
this.userDetailVisible = true this.userDetailVisible = true

2
src/views/modules/user/wait-authentication.vue
View File

@ -95,7 +95,7 @@
label="手机号" label="手机号"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="registerTime" <el-table-column prop="createdTime"
label="注册时间" label="注册时间"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>

Write Preview
Loading…
Cancel
Save