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

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

master
lihenian 6 years ago
parent
cfa264bc68 f886c8b281
commit
2ec58e2d78
5 changed files with 201 additions and 63 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. 74
      src/views/modules/sys/deptmacode.vue
  2. 65
      src/views/modules/sys/role-add-or-update.vue
  3. 71
      src/views/modules/sys/role.vue
  4. 2
      src/views/modules/user/partymembers-add-or-update.vue

74
src/views/modules/sys/deptmacode.vue
View File

@ -38,6 +38,16 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="小程序码类别">
<el-select v-model="dataForm.leaderFlag"
placeholder="小程序码类别">
<el-option v-for="item in maCodeCategorys"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
@ -46,7 +56,7 @@
@click="clearDataForm()">清空</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:deptmacode:delete')"
<el-button v-if="$hasPermission('sys:deptmacode:delete') && dataForm.leaderFlag === '0'"
type="danger"
@click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item>
@ -55,6 +65,11 @@
type="primary"
@click="initDeptMaCodeHandle()">初始化</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:deptmacode:leader')"
type="primary"
@click="createGridLeaderMaCodeHandle()">生成网格长注册码</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading"
:data="dataList"
@ -77,16 +92,35 @@
label="网格"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="codeUrl"
<!-- <el-table-column prop="codeUrl"
label="小程序码"
header-align="center"
align="center">
<template slot-scope="scope">
<img v-if="scope.row.codeUrl"
:src="scope.row.codeUrl"
:preview-src-list="[scope.row.codeUrl]"
min-width="70"
height="70" />
</template>
</el-table-column> -->
<el-table-column align="center"
label="小程序码"
:show-overflow-tooltip="true"
prop="codeUrl">
<template slot-scope="scope">
<el-popover placement="right"
title=""
trigger="click">
<el-image slot="reference"
min-width="70"
height="70"
v-if="scope.row.codeUrl"
:src="scope.row.codeUrl"
:alt="scope.row.codeUrl"></el-image>
<el-image :src="scope.row.codeUrl"></el-image>
</el-popover>
</template>
</el-table-column>
<el-table-column prop="createdTime"
label="创建时间"
@ -98,10 +132,14 @@
align="center"
width="150">
<template slot-scope="scope">
<el-button v-if="$hasPermission('sys:deptmacode:delete') && scope.row.codeUrl"
<el-button v-if="$hasPermission('sys:deptmacode:delete') && scope.row.codeUrl && scope.row.leaderFlag === '0'"
type="danger"
size="mini"
@click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
<el-button v-if="scope.row.codeUrl"
type="danger"
size="mini"
@click="downloadHandle(scope.row.codeUrl)">下载</el-button>
<el-button v-if="$hasPermission('sys:deptmacode:create') && !scope.row.codeUrl"
type="primary"
size="mini"
@ -136,11 +174,13 @@ export default {
dataForm: {
streetId: null,
communityId: null,
gridId: null
gridId: null,
leaderFlag: '0'
},
streetList: [],
communityList: [],
gridList: []
gridList: [],
maCodeCategorys: [{ id: '0', name: '群众注册码' }, { id: '1', name: '网格长注册码' }]
}
},
components: {
@ -170,6 +210,27 @@ export default {
}).catch(() => { })
}).catch(() => { })
},
createGridLeaderMaCodeHandle () {
this.$confirm(this.$t('prompt.info', { 'handle': '生成网格长注册小程序码' }), this.$t('生成'), {
confirmButtonText: this.$t('confirm'),
cancelButtonText: this.$t('cancel'),
type: 'warning'
}).then(() => {
this.$http.post(`/sys/deptmacode/gridLeader`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.getDataList()
}
})
}).catch(() => { })
}).catch(() => { })
},
initDeptMaCodeHandle () {
this.$confirm('初始化所有网格的小程序码', this.$t('初始化'), {
confirmButtonText: this.$t('confirm'),
@ -229,6 +290,9 @@ export default {
clearDataForm () {
this.dataForm.streetId = this.dataForm.communityId = this.dataForm.gridId = null
this.communityList = this.gridList = []
},
downloadHandle (codeUrl) {
window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${codeUrl}`
}
}
}

65
src/views/modules/sys/role-add-or-update.vue
View File

@ -1,17 +1,38 @@
<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="120px">
<el-form-item prop="name" :label="$t('role.name')">
<el-input v-model="dataForm.name" :placeholder="$t('role.name')"></el-input>
<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="120px">
<el-form-item prop="name"
:label="$t('role.name')">
<el-input v-model="dataForm.name"
:placeholder="$t('role.name')"></el-input>
</el-form-item>
<el-form-item prop="remark" :label="$t('role.remark')">
<el-input v-model="dataForm.remark" :placeholder="$t('role.remark')"></el-input>
<el-form-item label="角色编码">
<el-select v-model="dataForm.code"
placeholder="角色编码">
<el-option v-for="item in roleCodeList"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="remark"
:label="$t('role.remark')">
<el-input v-model="dataForm.remark"
:placeholder="$t('role.remark')"></el-input>
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item size="mini" :label="$t('role.menuList')">
<el-tree
:data="menuList"
<el-form-item size="mini"
:label="$t('role.menuList')">
<el-tree :data="menuList"
:props="{ label: 'name', children: 'children' }"
node-key="id"
ref="menuListTree"
@ -21,9 +42,9 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item size="mini" :label="$t('role.deptList')">
<el-tree
:data="deptList"
<el-form-item size="mini"
:label="$t('role.deptList')">
<el-tree :data="deptList"
:props="{ label: 'name', children: 'children' }"
node-key="id"
ref="deptListTree"
@ -36,7 +57,8 @@
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
<el-button type="primary"
@click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
</template>
</el-dialog>
</template>
@ -49,12 +71,14 @@ export default {
visible: false,
menuList: [],
deptList: [],
roleCodeList: [],
dataForm: {
id: '',
name: '',
menuIdList: [],
deptIdList: [],
remark: ''
remark: '',
code: ''
}
}
},
@ -67,6 +91,9 @@ export default {
}
}
},
created () {
this.getRoleCodeList()
},
methods: {
init () {
this.visible = true
@ -142,7 +169,15 @@ export default {
})
}).catch(() => { })
})
}, 1000, { 'leading': true, 'trailing': false })
}, 1000, { 'leading': true, 'trailing': false }),
getRoleCodeList () {
this.$http.get(`/sys/dict/listSimple/sysRoleCode`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.roleCodeList = res.data
}).catch(() => { })
}
}
}
</script>

71
src/views/modules/sys/role.vue
View File

@ -1,40 +1,75 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<el-card shadow="never"
class="aui-card--fill">
<div class="mod-sys__role">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.name" :placeholder="$t('role.name')" clearable></el-input>
<el-input v-model="dataForm.name"
:placeholder="$t('role.name')"
clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:role:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
<el-button v-if="$hasPermission('sys:role:save')"
type="primary"
@click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:role:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
<el-button v-if="$hasPermission('sys:role:delete')"
type="danger"
@click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="dataListLoading"
<el-table v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
@sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="name" :label="$t('role.name')" header-align="center" align="center"></el-table-column>
<el-table-column prop="remark" :label="$t('role.remark')" header-align="center" align="center"></el-table-column>
<el-table-column prop="createDate" :label="$t('role.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">
<el-table-column type="selection"
header-align="center"
align="center"
width="50"></el-table-column>
<el-table-column prop="name"
:label="$t('role.name')"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="code"
label="角色编码"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="remark"
:label="$t('role.remark')"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createDate"
:label="$t('role.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">
<el-button v-if="$hasPermission('sys:role:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('sys:role:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
<el-button v-if="$hasPermission('sys:role:update')"
type="text"
size="small"
@click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('sys:role:delete')"
type="text"
size="small"
@click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="page"
<el-pagination :current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
@ -43,7 +78,9 @@
@current-change="pageCurrentChangeHandle">
</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>
</el-card>
</template>

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

@ -24,6 +24,7 @@
placeholder="身份证号"></el-input>
</el-form-item>
<el-form-item label="街道党工委"
label-width='auto'
prop="streetId">
<el-select v-model="dataForm.streetId"
placeholder="请选择"
@ -48,6 +49,7 @@
</el-select>
</el-form-item>
<el-form-item label="网格党支部"
label-width='auto'
prop="gridId">
<el-select v-model="dataForm.gridId"
placeholder="请选择"

Write Preview
Loading…
Cancel
Save