elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug

shibei_master
zhaoyongnian 3 years ago
parent
b312456295
commit
7c96a8692c
3 changed files with 62 additions and 21 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. 20
      src/views/modules/partymember/icpartyorg-add-or-update.vue
  2. 10
      src/views/modules/partymember/icpartyorgtree.vue
  3. 53
      src/views/modules/partymember/lookMember.vue

20
src/views/modules/partymember/icpartyorg-add-or-update.vue
View File

@ -160,8 +160,8 @@
this.getInfo() this.getInfo()
} else { } else {
this.initMap() this.initMap()
if(this.dataForm.orgPids) { if(this.dataForm.id) {
this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':') this.dataForm.mySelectOrg = this.dataForm.id
} else { } else {
this.dataForm.mySelectOrg = '' this.dataForm.mySelectOrg = ''
} }
@ -221,7 +221,7 @@
} }
this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => { this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} }
this.agencyOrgList = this.removeEmptyChildren(res.data) this.agencyOrgList = this.removeEmptyChildren(res.data)
}).catch(() => {}) }).catch(() => {})
@ -230,8 +230,8 @@
getOrgList() { getOrgList() {
return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => { return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} }
this.orgList = this.removeEmptyChildren(res.data) this.orgList = this.removeEmptyChildren(res.data)
this.orgList.unshift({ this.orgList.unshift({
partyOrgName: '一级组织', partyOrgName: '一级组织',
@ -269,14 +269,16 @@
getInfo() { getInfo() {
this.$http.get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`).then(({data: res}) => { this.$http.get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`).then(({data: res}) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} }
this.dataForm = { this.dataForm = {
...this.dataForm, ...this.dataForm,
...res.data ...res.data
} }
// 党组织组织 // 党组织组织
this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':') this.dataForm.mySelectOrg = this.dataForm.id
// this.dataForm.mySelectOrg.push(this.dataForm.id)
console.log(JSON.stringify(this.dataForm.mySelectOrg))
// 行政组织 // 行政组织
this.dataForm.agencyId = this.dataForm.agencyId this.dataForm.agencyId = this.dataForm.agencyId
this.initMap() this.initMap()
@ -293,7 +295,7 @@
orgType:this.dataForm.partyOrgType} orgType:this.dataForm.partyOrgType}
}).then(({data: res}) => { }).then(({data: res}) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} }
this.agencyOrgList = res.data this.agencyOrgList = res.data
}).catch(() => { }).catch(() => {
@ -426,7 +428,7 @@
} }
this.$http[!this.dataForm.id ? 'post' : 'put']('/resi/partymember/icPartyOrg/', this.dataForm).then(({data: res}) => { this.$http[!this.dataForm.id ? 'post' : 'put']('/resi/partymember/icPartyOrg/', this.dataForm).then(({data: res}) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} }
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),

10
src/views/modules/partymember/icpartyorgtree.vue
View File

@ -19,7 +19,7 @@
<el-table-column label="操作" align="center" width="300"> <el-table-column label="操作" align="center" width="300">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)" <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
@click="handleLook(scope.row.agencyId)" @click="handleLook(scope.row.agencyPids, scope.row.id, scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--detail">{{'查看党员'}}</el-button> class="div-table-button--detail">{{'查看党员'}}</el-button>
@ -98,7 +98,7 @@
} }
await this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: this.dataForm}).then(({ data: res }) => { await this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: this.dataForm}).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} else { } else {
this.tableData = res.data this.tableData = res.data
} }
@ -125,7 +125,7 @@
}).then(() => { }).then(() => {
this.$http.delete('/resi/partymember/icPartyOrg/delete', {'data': [id]}).then(({ data: res }) => { this.$http.delete('/resi/partymember/icPartyOrg/delete', {'data': [id]}).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} }
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
@ -139,10 +139,10 @@
}).catch(() => {}) }).catch(() => {})
}, },
// 查看党员 // 查看党员
handleLook(agencyId) { handleLook(agencyPids, id, row) {
this.lookMemberShow = true this.lookMemberShow = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_table_Member.initForm(agencyId) this.$refs.ref_table_Member.initForm(agencyPids.split(':')[agencyPids.split(':').length - 1], id)
}) })
}, },
lookMemberClose () { lookMemberClose () {

53
src/views/modules/partymember/lookMember.vue
View File

@ -21,6 +21,25 @@
label="身份证号"> label="身份证号">
</el-table-column> </el-table-column>
</el-table> </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> -->
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total"
:total="total"
>
</el-pagination>
</div> </div>
</div> </div>
</div> </div>
@ -41,7 +60,11 @@ export default {
// 列表相关 // 列表相关
tableData: [], tableData: [],
tableLoading: false, tableLoading: false,
orgPids: '' agencyId: '',
partyOrgId: '',
pageNo: 1,
pageSize: 20,
total: 1,
} }
}, },
props: { props: {
@ -54,8 +77,9 @@ export default {
}, },
components: {}, components: {},
methods: { methods: {
initForm (agencyId) { initForm (agencyId, id) {
this.orgPids = agencyId this.agencyId = agencyId
this.partyOrgId = id
this.tableLoading = true this.tableLoading = true
this.loadTable() this.loadTable()
}, },
@ -66,17 +90,32 @@ export default {
// 查询列表 // 查询列表
async loadTable () { async loadTable () {
let params = { let params = {
partyOrgId: this.orgPids, agencyId: this.agencyId,
pageNo: 1, partyOrgId: this.partyOrgId,
pageSize: 10000000 pageNo: this.pageNo,
pageSize: this.pageSize
} }
const url = `/resi/partymember/icPartyMember/page` const url = `/resi/partymember/icPartyMember/page`
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
this.tableLoading = false this.tableLoading = false
if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
}
if (code === 0) { if (code === 0) {
this.tableData = data.list ? data.list : [] this.tableData = data.list ? data.list : []
this.total = data.total || 0;
} }
} },
handleSizeChange (val) {
console.log(`每页 ${val} 条`)
this.pageSize = val
this.loadTable()
},
handleCurrentChange (val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.loadTable();
},
}, },
} }
</script> </script>

Write Preview
Loading…
Cancel
Save