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

Merge remote-tracking branch 'origin/dev_0814' into dev_0814

master
liuchuang 6 years ago
parent
28041ae0e9 fe9ee46c3e
commit
203dacb82b
4 changed files with 59 additions and 252 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. 6
      src/views/modules/user/partymembers-add-or-update.vue
  2. 13
      src/views/modules/user/partymembers.vue
  3. 273
      src/views/modules/user/user-add-or-update.vue
  4. 19
      src/views/modules/user/user.vue

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

@ -52,7 +52,7 @@
</el-form-item>
<el-form-item label="用户角色" prop="tagIds">
<el-checkbox-group v-model="dataForm.tagIds">
<el-checkbox v-for="item in tagOptions" :key="item.id" :label="item.id">{{item.tagName}}</el-checkbox>
<el-checkbox v-for="item in tagOptions" :key="item.tagName" :label="item.id">{{item.tagName}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-form>
@ -144,11 +144,10 @@ export default {
return this.$message.error(res.msg)
}
this.tagOptions = res.data
console.log(this.tagOptions)
}).catch(() => {})
},
getStreetList () {
this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -192,6 +191,7 @@ export default {
...this.dataForm,
...res.data
}
this.dataForm.tagIds = res.data.tagIdsNew
this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)

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

@ -85,10 +85,7 @@
<el-button v-if="$hasPermission('partymembers:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('partymembers:import')" type="primary" @click="importData()">{{ $t('import') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('partymembers:export')" type="primary" @click="exportData()">{{ $t('export') }}</el-button>
<el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@ -137,7 +134,8 @@ export default {
getDataListURL: '/app-user/partymembers/page',
getDataListIsPage: true,
deleteURL: '/app-user/partymembers',
deleteIsBatch: true
deleteIsBatch: true,
exportURL: '/app-user/partymembers/export'
},
dataForm: {
id: '',
@ -174,7 +172,7 @@ export default {
this.dataForm.endTime = this.timeRange[1]
},
getStreetList () {
this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -220,12 +218,9 @@ export default {
return row.cadreFlag === '1' ? '是' : row.cadreFlag === '0' ? '否' : '未知'
},
formatRegist: function (row, column) {
console.log(row.registFlag)
return row.registFlag === '1' ? '是' : row.registFlag === '0' ? '否' : '未知'
},
importData () {
},
exportData () {
}
}
}

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

@ -22,6 +22,16 @@
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="干部下沉" >
<el-select v-model="dataForm.cadreFlag" placeholder="请选择">
<el-option
v-for="item in cadreOptions"
:key="item.cadreFlag"
:label="item.cadreTitle"
:value="item.cadreFlag">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="扫码网格" >
<span >{{dataForm.street}} - </span>
@ -29,108 +39,19 @@
<span >{{dataForm.grid}}</span>
</el-form-item>
<el-form-item label="居民住址" prop="address">
<el-input v-model="dataForm.address" placeholder="居民住址"></el-input>
<span >{{dataForm.address}}</span>
</el-form-item>
<template>
&nbsp;&nbsp;
<span>是否通过审核</span>&nbsp;&nbsp;
<el-radio v-model="radio" label="1">是</el-radio>
<el-radio v-model="radio" label="0">否</el-radio>
<el-radio v-model="dataForm.pass" label="1">是</el-radio>
<el-radio v-model="dataForm.pass" label="0">否</el-radio>
</template>
<el-form-item label="注册时间" prop="registerTime">
<el-input v-model="dataForm.registerTime" placeholder="注册时间"></el-input>
</el-form-item>
<el-form-item label="头像" prop="faceImg">
<el-input v-model="dataForm.faceImg" placeholder="头像"></el-input>
</el-form-item>
<el-form-item label="性别(女性-female，男性-male)" prop="sex">
<el-input v-model="dataForm.sex" placeholder="性别(女性-female，男性-male)"></el-input>
</el-form-item>
<el-form-item label="生日" prop="birthday">
<el-input v-model="dataForm.birthday" placeholder="生日"></el-input>
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="dataForm.email" placeholder="邮箱"></el-input>
</el-form-item>
<el-form-item label="电话" prop="telephone">
<el-input v-model="dataForm.telephone" placeholder="电话"></el-input>
</el-form-item>
<el-form-item label="邮编" prop="zipCode">
<el-input v-model="dataForm.zipCode" placeholder="邮编"></el-input>
</el-form-item>
<el-form-item label="职业" prop="profession">
<el-input v-model="dataForm.profession" placeholder="职业"></el-input>
</el-form-item>
<el-form-item label="爱好" prop="hobbies">
<el-input v-model="dataForm.hobbies" placeholder="爱好"></el-input>
</el-form-item>
<el-form-item label="个性签名" prop="userSign">
<el-input v-model="dataForm.userSign" placeholder="个性签名"></el-input>
</el-form-item>
<el-form-item label="邀请码" prop="invitationCode">
<el-input v-model="dataForm.invitationCode" placeholder="邀请码"></el-input>
</el-form-item>
<el-form-item label="最近登录时间" prop="lastLoginTime">
<el-input v-model="dataForm.lastLoginTime" placeholder="最近登录时间"></el-input>
</el-form-item>
<el-form-item label="最近登录IP" prop="lastLoginIp">
<el-input v-model="dataForm.lastLoginIp" placeholder="最近登录IP"></el-input>
</el-form-item>
<el-form-item label="最近登录位置经度" prop="lastLongitude">
<el-input v-model="dataForm.lastLongitude" placeholder="最近登录位置经度"></el-input>
</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="identityNo">
<el-input v-model="dataForm.identityNo" placeholder="身份证号"></el-input>
</el-form-item>
<el-form-item label="微信OPENID" prop="wxOpenId">
<el-input v-model="dataForm.wxOpenId" placeholder="微信OPENID"></el-input>
</el-form-item>
<el-form-item label="是否是党员(0-否，1-是)" prop="partyFlag">
<el-input v-model="dataForm.partyFlag" placeholder="是否是党员(0-否，1-是)"></el-input>
</el-form-item>
<el-form-item label="注册方式（wx：微信注册）" prop="registerWay">
<el-input v-model="dataForm.registerWay" placeholder="注册方式（wx：微信注册）"></el-input>
</el-form-item>
<el-form-item label="用户来源(wp:公众号)" prop="registerSource">
<el-input v-model="dataForm.registerSource" placeholder="用户来源(wp:公众号)"></el-input>
</el-form-item>
<el-form-item label="手机号所属省份" prop="phoneProvince">
<el-input v-model="dataForm.phoneProvince" placeholder="手机号所属省份"></el-input>
</el-form-item>
<el-form-item label="手机号所属城市" prop="phoneCity">
<el-input v-model="dataForm.phoneCity" placeholder="手机号所属城市"></el-input>
</el-form-item>
<el-form-item label="手机号所属运营商" prop="phoneCarrier">
<el-input v-model="dataForm.phoneCarrier" placeholder="手机号所属运营商"></el-input>
</el-form-item>
<el-form-item label="用户积分" prop="points">
<el-input v-model="dataForm.points" placeholder="用户积分"></el-input>
</el-form-item>
<el-form-item label="邀请人ID" prop="inviteUserId">
<el-input v-model="dataForm.inviteUserId" placeholder="邀请人ID"></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="网格ID" prop="gridId">
<el-input v-model="dataForm.gridId" placeholder="网格ID"></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 label="删除标记" prop="delFlag">
<el-input v-model="dataForm.delFlag" placeholder="删除标记"></el-input>
<p></p>
<el-form-item label="用户角色" prop="tagIds">
<el-checkbox-group v-model="dataForm.tagIds">
<el-checkbox v-for="item in tagOptions" :key="item.tagName" :label="item.id">{{item.tagName}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-form>
<template slot="footer">
@ -148,55 +69,29 @@ export default {
visible: false,
dataForm: {
id: '',
nickname: '',
mobile: '',
password: '',
registerTime: '',
faceImg: '',
sex: '',
birthday: '',
email: '',
telephone: '',
zipCode: '',
profession: '',
hobbies: '',
userSign: '',
invitationCode: '',
lastLoginTime: '',
lastLoginIp: '',
lastLongitude: '',
lastLatitude: '',
realName: '',
identityNo: '',
address: '',
wxOpenId: '',
registerWay: '',
registerSource: '',
phoneProvince: '',
phoneCity: '',
phoneCarrier: '',
points: '',
inviteUserId: '',
revision: '',
gridId: '',
createdBy: '',
createdTime: '',
updatedBy: '',
updatedTime: '',
delFlag: '',
partyFlag: ''
partyFlag: '',
cadreFlag: '',
pass: '',
street: '',
community: '',
grid: '',
tagIds: []
},
radio: '0',
partyFlagOptions: [{
id: '0',
name: '不是'
}, {
id: '1',
name: '是'
}],
cadreOptions: [{
cadreFlag: '1',
cadreTitle: '是'
}, {
id: '1',
name: '全部'
}]
cadreFlag: '0',
cadreTitle: '否'
}],
tagOptions: []
}
},
computed: {
@ -208,54 +103,6 @@ export default {
mobile: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
password: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
registerTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
faceImg: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
sex: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
birthday: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
email: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
telephone: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
zipCode: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
profession: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
hobbies: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
userSign: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
invitationCode: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
lastLoginTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
lastLoginIp: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
lastLongitude: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
lastLatitude: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
realName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
@ -265,53 +112,14 @@ export default {
address: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
wxOpenId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
partyFlag: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
registerWay: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
registerSource: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
phoneProvince: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
phoneCity: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
phoneCarrier: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
points: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
inviteUserId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
revision: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
gridId: [
{ 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' }
],
delFlag: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
@ -325,6 +133,15 @@ export default {
this.getInfo()
}
})
this.getTagOptions()
},
getTagOptions () {
this.$http.get(`/app-user/usertag/list`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.tagOptions = res.data
}).catch(() => {})
},
// 获取信息
getInfo () {
@ -338,13 +155,13 @@ export default {
}
}).catch(() => {})
},
// 表单提交
// 审核
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http[!this.dataForm.id ? 'post' : 'put']('/epdc/user/', this.dataForm).then(({ data: res }) => {
this.$http[!this.dataForm.id ? 'post' : 'post']('/app-user/user/audit/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}

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

@ -38,7 +38,6 @@
</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>
@ -86,8 +85,8 @@
<!-- <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="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>
@ -97,7 +96,7 @@
<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>
<!-- <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button> -->
</template>
</el-table-column>
</el-table>
@ -118,7 +117,6 @@
<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
@ -149,7 +147,6 @@
</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>
@ -215,12 +212,12 @@
<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">
<!-- <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-column> -->
</el-table>
<el-pagination
:current-page="page"
@ -239,7 +236,6 @@
<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
@ -270,7 +266,6 @@
</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>
@ -326,12 +321,12 @@
<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">
<!-- <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-column> -->
</el-table>
<el-pagination
:current-page="page"

Write Preview
Loading…
Cancel
Save