elink-star
/
esua-epdc-admin
9
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
efdfa4cdef eb18ecdafc
commit
47b1898ae0
1 changed files with 8 additions and 69 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. 77
      src/views/modules/user/user.vue

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

@ -68,15 +68,9 @@
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
<el-button v-if="$hasPermission('epdc:user:export')" type="primary" @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>
@ -87,15 +81,11 @@
{{scope.$index+1}}
</template>
</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="formatRegist" 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 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>
@ -103,7 +93,6 @@
<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>
@ -116,8 +105,6 @@
@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">
@ -194,19 +181,12 @@
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
<el-button v-if="$hasPermission('epdc:user:export')" type="primary" @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
label="序号"
width="70px">
@ -215,23 +195,15 @@
</template>
</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="partyFlag" label="是否党员" :formatter="formatPartyFlag" 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 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"
@ -242,8 +214,6 @@
@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">
@ -310,15 +280,9 @@
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
<el-button v-if="$hasPermission('epdc:user:export')" type="primary" @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>
@ -329,25 +293,15 @@
{{scope.$index+1}}
</template>
</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="审核状态" :formatter="formatState" 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"
@ -380,7 +334,7 @@ export default {
getDataListIsPage: true,
deleteURL: '/app-use/user',
deleteIsBatch: true,
exportURL: '/sys/log/login/export'
exportURL: '/app-user/user/export'
},
dataForm: {
id: '',
@ -393,24 +347,15 @@ export default {
startTime: '',
endTime: '',
isParty: '',
tabFlag: '0',
auditState: '0'
},
streetOptions: [],
communityOptions: [],
gridOptions: [],
time: '',
tabFlag: '0',
state: '待审核用户',
partyFlagOptions: [{
id: '0',
name: '不是'
}, {
id: '1',
name: '是'
}, {
id: '',
name: '全部'
}]
partyFlagOptions: [{ id: '', name: '不限' }, { id: '1', name: '是' }, { id: '0', name: '否' }]
}
},
created () {
@ -456,17 +401,14 @@ export default {
}).catch(() => {})
},
setRegistTime () {
console.log(this.time[0])
this.dataForm.startTime = this.time[0]
this.dataForm.endTime = this.time[1]
},
formatState: function (row, column) {
console.log(row.state)
return row.state === '1' ? '审核通过' : row.state === '0' ? '待审核' : '审核未通过'
},
formatPartyFlag: function (row, column) {
console.log(row.partyFlag)
return row.partyFlag === '1' ? '党员' : row.state === '0' ? '不是党员' : '未知'
return row.partyFlag === '1' ? '是' : row.state === '0' ? '未知' : '否'
},
handleClick (tab, event) {
this.dataForm.streetId = ''
@ -478,9 +420,7 @@ export default {
this.dataForm.startTime = ''
this.dataForm.endTime = ''
this.dataForm.isParty = ''
this.dataForm.tabFlag = '0'
this.dataForm.auditState = ''
console.log(tab, event)
if (this.tabFlag === '0') {
this.dataForm.auditState = 0
this.dataForm.isParty = ''
@ -490,7 +430,6 @@ export default {
this.dataForm.auditState = 2
this.dataForm.isParty = ''
}
console.log(this.dataForm.auditState)
this.getDataList()
}
},

Write Preview
Loading…
Cancel
Save