elink-star
/
esua-epdc-admin
8
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
qushutong 7 years ago
parent
7a7340aac7 10e4f356dc
commit
4ce747dcd1
4 changed files with 228 additions and 89 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. 1
      src/i18n/zh-CN.js
  2. 119
      src/views/modules/sys/dict.vue
  3. 142
      src/views/modules/user/partymembers-add-or-update.vue
  4. 55
      src/views/modules/user/partymembers.vue

1
src/i18n/zh-CN.js
View File

@ -14,6 +14,7 @@ t.query = '查询'
t.export = '导出' t.export = '导出'
t.handle = '操作' t.handle = '操作'
t.confirm = '确定' t.confirm = '确定'
t.import = '导入'
t.cancel = '取消' t.cancel = '取消'
t.logout = '退出' t.logout = '退出'

119
src/views/modules/sys/dict.vue
View File

@ -1,64 +1,109 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-sys__dict"> <div class="mod-sys__dict">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')" clearable></el-input> <el-input v-model="dataForm.dictName"
:placeholder="$t('dict.dictName')"
clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="dataForm.pid === '0'"> <el-form-item v-if="dataForm.pid === '0'">
<el-input v-model="dataForm.dictType" :placeholder="$t('dict.dictType')" clearable></el-input> <el-input v-model="dataForm.dictType"
:placeholder="$t('dict.dictType')"
clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="dataForm.pid !== '0'"> <el-form-item v-if="dataForm.pid !== '0'">
<el-input v-model="dataForm.dictValue" :placeholder="$t('dict.dictValue')" clearable></el-input> <el-input v-model="dataForm.dictValue"
:placeholder="$t('dict.dictValue')"
clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('sys:dict:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> <el-button v-if="$hasPermission('sys:dict:save')"
type="primary"
@click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <!-- <el-form-item>
<el-button v-if="$hasPermission('sys:dict:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button> <el-button v-if="$hasPermission('sys:dict:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<el-table <el-table v-loading="dataListLoading"
v-loading="dataListLoading" :data="dataList"
:data="dataList" border
border @selection-change="dataListSelectionChangeHandle"
@selection-change="dataListSelectionChangeHandle" @sort-change="dataListSortChangeHandle"
@sort-change="dataListSortChangeHandle" style="width: 100%;">
style="width: 100%;"> <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> <el-table-column prop="dictName"
<el-table-column prop="dictName" :label="$t('dict.dictName')" header-align="center" align="center"></el-table-column> :label="$t('dict.dictName')"
<el-table-column prop="dictType" :label="$t('dict.dictType')" header-align="center" align="center"> header-align="center"
align="center"></el-table-column>
<el-table-column prop="dictType"
:label="$t('dict.dictType')"
header-align="center"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="dataForm.pid !== '0'">{{ scope.row.dictType }}</span> <span v-if="dataForm.pid !== '0'">{{ scope.row.dictType }}</span>
<el-button v-else type="text" @click="childHandle(scope.row)">{{ scope.row.dictType }}</el-button> <el-button v-else
type="text"
@click="childHandle(scope.row)">{{ scope.row.dictType }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="dataForm.pid !== '0'" prop="dictValue" label="字典值" header-align="center" align="center"></el-table-column> <el-table-column v-if="dataForm.pid !== '0'"
<el-table-column prop="sort" :label="$t('dict.sort')" sortable="custom" header-align="center" align="center"></el-table-column> prop="dictValue"
<el-table-column prop="remark" :label="$t('dict.remark')" header-align="center" align="center"></el-table-column> label="字典值"
<el-table-column prop="createDate" :label="$t('dict.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column> header-align="center"
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> align="center"></el-table-column>
<el-table-column prop="sort"
:label="$t('dict.sort')"
sortable="custom"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="remark"
:label="$t('dict.remark')"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createDate"
:label="$t('dict.createDate')"
sortable="custom"
header-align="center"
align="center"
width="180"></el-table-column>
<el-table-column :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('sys:dict:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row)">{{ $t('update') }}</el-button> <el-button v-if="$hasPermission('sys:dict:update')"
<el-button v-if="$hasPermission('sys:dict:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button> type="text"
size="small"
@click="addOrUpdateHandle(scope.row)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('sys:dict:delete')"
type="text"
size="small"
@click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination v-if="dataForm.pid === '0'"
v-if="dataForm.pid === '0'" :current-page="page"
:current-page="page" :page-sizes="[10, 20, 50, 100]"
:page-sizes="[10, 20, 50, 100]" :page-size="limit"
:page-size="limit" :total="total"
:total="total" layout="total, sizes, prev, pager, next, jumper"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@size-change="pageSizeChangeHandle" @current-change="pageCurrentChangeHandle">
@current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> <add-or-update v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList"></add-or-update>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -76,7 +121,7 @@ export default {
getDataListURL: '/sys/dict/page', getDataListURL: '/sys/dict/page',
getDataListIsPage: true, getDataListIsPage: true,
deleteURL: '/sys/dict', deleteURL: '/sys/dict',
deleteIsBatch: true deleteIsBatch: false
}, },
dataForm: { dataForm: {
pid: '0', pid: '0',

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

@ -10,47 +10,37 @@
<el-form-item label="身份证号" prop="identityNo"> <el-form-item label="身份证号" prop="identityNo">
<el-input v-model="dataForm.identityNo" placeholder="身份证号"></el-input> <el-input v-model="dataForm.identityNo" placeholder="身份证号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="街道党工委"> <el-form-item label="街道党工委" prop="streetId">
<el-select v-model="dataForm.streetId" placeholder="请选择"> <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
<el-option <el-option
v-for="item in streetOptions" v-for="item in streetOptions"
:key="item.streetId" :key="item.id"
:label="item.streetName" :label="item.name"
:value="item.streetId"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区党委"> <el-form-item label="社区党委" prop="communityId">
<el-select v-model="dataForm.communityId" placeholder="请选择"> <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
<el-option <el-option
v-for="item in communityOptions" v-for="item in communityOptions"
:key="item.communityId" :key="item.id"
:label="item.communityName" :label="item.name"
:value="item.communityId"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网格党支部"> <el-form-item label="网格党支部" prop="gridId">
<el-select v-model="dataForm.gridId" placeholder="请选择"> <el-select v-model="dataForm.gridId" placeholder="请选择" @change="evaluation">
<el-option <el-option
v-for="item in gridOptions" v-for="item in gridOptions"
:key="item.gridId" :key="item.id"
:label="item.gridName" :label="item.name"
:value="item.gridId"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="职务"> <el-form-item label="干部下沉" prop="cadreFlag">
<el-select v-model="postId" placeholder="请选择">
<el-option
v-for="item in postOptions"
:key="item.postId"
:label="item.post"
:value="item.postId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="干部下沉">
<el-select v-model="dataForm.cadreFlag" placeholder="请选择"> <el-select v-model="dataForm.cadreFlag" placeholder="请选择">
<el-option <el-option
v-for="item in cadreOptions" v-for="item in cadreOptions"
@ -60,14 +50,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="用户角色"> <el-form-item label="用户角色" prop="tagIds">
<el-checkbox-group v-model="checkList"> <el-checkbox-group v-model="dataForm.tagIds">
<el-checkbox <el-checkbox v-for="item in tagOptions" :key="item.id" :label="item.id">{{item.tagName}}</el-checkbox>
v-for="item in tagOptions"
:key="item.tagId"
:label="item.tagValue"
:value="item.tadId">
</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -89,17 +74,25 @@ export default {
realName: '', realName: '',
mobile: '', mobile: '',
identityNo: '', identityNo: '',
post: '',
cadreFlag: '', cadreFlag: '',
streetId: '',
streetName: '', streetName: '',
communityId: '',
communityName: '', communityName: '',
gridName: '' gridId: '',
gridName: '',
tagIds: []
}, },
streetOptions: [], streetOptions: [],
communityOptions: [], communityOptions: [],
gridOptions: [], gridOptions: [],
postOptions: [], cadreOptions: [{
cadreOptions: [], cadreFlag: '1',
cadreTitle: '是'
}, {
cadreFlag: '0',
cadreTitle: '否'
}],
tagOptions: [] tagOptions: []
} }
}, },
@ -114,12 +107,29 @@ export default {
], ],
identityNo: [ identityNo: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
streetId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
communityId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
gridId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
cadreFlag: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
tagIds: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
] ]
} }
} }
}, },
methods: { methods: {
init () { init () {
this.getStreetList()
this.getTagOptions()
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
@ -128,6 +138,50 @@ export default {
} }
}) })
}, },
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
console.log(this.tagOptions)
}).catch(() => {})
},
getStreetList () {
this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.streetOptions = res.data
}).catch(() => {})
},
getCommunityList () {
let choosenItem = this.streetOptions.filter(item => item.id === this.dataForm.streetId)[0]
this.dataForm.streetName = choosenItem.name
this.dataForm.communityId = ''
this.dataForm.gridId = ''
this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.communityOptions = res.data
}).catch(() => {})
},
getGridList () {
let choosenItem = this.communityOptions.filter(item => item.id === this.dataForm.communityId)[0]
this.dataForm.communityName = choosenItem.name
this.dataForm.gridId = ''
this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.gridOptions = res.data
}).catch(() => {})
},
evaluation () {
let choosenItem = this.gridOptions.filter(item => item.id === this.dataForm.gridId)[0]
this.dataForm.gridName = choosenItem.name
},
// 获取信息 // 获取信息
getInfo () { getInfo () {
this.$http.get(`/app-user/partymembers/${this.dataForm.id}`).then(({ data: res }) => { this.$http.get(`/app-user/partymembers/${this.dataForm.id}`).then(({ data: res }) => {
@ -138,6 +192,18 @@ export default {
...this.dataForm, ...this.dataForm,
...res.data ...res.data
} }
this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.communityOptions = res.data
}).catch(() => {})
this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.gridOptions = res.data
}).catch(() => {})
}).catch(() => {}) }).catch(() => {})
}, },
// 表单提交 // 表单提交

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

@ -36,9 +36,9 @@
<el-select v-model="dataForm.registFlag" placeholder="请选择"> <el-select v-model="dataForm.registFlag" placeholder="请选择">
<el-option <el-option
v-for="item in registOptions" v-for="item in registOptions"
:key="item.registFlag" :key="item.dictValue"
:label="item.registTitle" :label="item.dictName"
:value="item.registFlag"> :value="item.dictValue">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -56,20 +56,22 @@
<el-select v-model="dataForm.postId" placeholder="请选择"> <el-select v-model="dataForm.postId" placeholder="请选择">
<el-option <el-option
v-for="item in postOptions" v-for="item in postOptions"
:key="item.postId" :key="item.dictValue"
:label="item.post" :label="item.dictName"
:value="item.postId"> :value="item.dictValue">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="注册时间"> <el-form-item label="注册时间">
<el-date-picker <el-date-picker
v-model="dataForm.timeRange" v-model="timeRange"
type="daterange" type="daterange"
range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期"
value-format="yyyy-MM-dd"
:default-time="['00:00:00', '23:59:59']"
@change="selectedTime">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -96,7 +98,7 @@
<el-table-column prop="identityNo" 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="post" label="职务" header-align="center" align="center"></el-table-column> <el-table-column prop="post" label="职务" header-align="center" align="center"></el-table-column>
<el-table-column prop="cadreFlag" label="干部下沉" :formatter="formatCadre" header-align="center" align="center"></el-table-column> <el-table-column prop="cadreFlag" label="干部下沉" :formatter="formatCadre" header-align="center" align="center"></el-table-column>
<el-table-column prop="tag" label="角色" header-align="center" align="center"></el-table-column> <el-table-column prop="tagName" label="角色" header-align="center" align="center"></el-table-column>
<el-table-column prop="registFlag" label="注册状态" :formatter="formatRegist" header-align="center" align="center"></el-table-column> <el-table-column prop="registFlag" label="注册状态" :formatter="formatRegist" header-align="center" align="center"></el-table-column>
<el-table-column prop="registTime" label="注册时间" header-align="center" align="center"></el-table-column> <el-table-column prop="registTime" label="注册时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="streetName" label="街道党工委" header-align="center" align="center"></el-table-column> <el-table-column prop="streetName" label="街道党工委" header-align="center" align="center"></el-table-column>
@ -147,13 +149,15 @@ export default {
gridId: '', gridId: '',
registFlag: '', registFlag: '',
postId: '', postId: '',
timeRange: '' startTime: '',
endTime: ''
}, },
streetOptions: [], streetOptions: [],
communityOptions: [], communityOptions: [],
gridOptions: [], gridOptions: [],
registOptions: [], registOptions: [],
postOptions: [] postOptions: [],
timeRange: []
} }
}, },
components: { components: {
@ -161,8 +165,14 @@ export default {
}, },
created: function () { created: function () {
this.getStreetList() this.getStreetList()
this.getRegistOptions()
this.getPostOptions()
}, },
methods: { methods: {
selectedTime () {
this.dataForm.startTime = this.timeRange[0]
this.dataForm.endTime = this.timeRange[1]
},
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
@ -190,11 +200,28 @@ export default {
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => {})
}, },
getRegistOptions () {
this.$http.get(`/sys/dict/sublist/1168769645576179713`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.registOptions = res.data
}).catch(() => {})
},
getPostOptions () {
this.$http.get(`/sys/dict/sublist/1168770417290366977`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.postOptions = res.data
}).catch(() => {})
},
formatCadre: function (row, column) { formatCadre: function (row, column) {
return row.cadreFlag === 1 ? '是' : row.cadreFlag === 0 ? '否' : '未知' return row.cadreFlag === '1' ? '是' : row.cadreFlag === '0' ? '否' : '未知'
}, },
formatRegist: function (row, column) { formatRegist: function (row, column) {
return row.registFlag === 1 ? '是' : row.registFlag === 0 ? '否' : '未知' console.log(row.registFlag)
return row.registFlag === '1' ? '是' : row.registFlag === '0' ? '否' : '未知'
}, },
importData () { importData () {
}, },

Write Preview
Loading…
Cancel
Save