Browse Source

bug

shibei_master
zhaoyongnian 3 years ago
parent
commit
3fb4c763c3
  1. 57
      src/views/modules/partymember/icpartyorg-add-or-update.vue
  2. 23
      src/views/modules/partymember/icpartyorgtree.vue
  3. 51
      src/views/modules/partymember/lookMember.vue

57
src/views/modules/partymember/icpartyorg-add-or-update.vue

@ -140,6 +140,7 @@
agencyListVisible:false,
orgList: [],
agencyId: '',
level: '',
partyOrgTypeList: [],
agencyOrgList:[]
}
@ -162,14 +163,27 @@
this.$refs['dataForm'].resetFields()
this.dataForm.latitude = ''
if (this.dataForm.id) {
this.setPartyOrgType()
this.getInfo()
} else {
this.setPartyOrgType()
this.initMap()
if(this.dataForm.orgId) {
this.dataForm.mySelectOrg = this.dataForm.orgId
this.dataForm.orgPid = this.dataForm.orgId
this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId
this.dataForm.partyOrgType = this.dataForm._partyOrgType
console.log(this.dataForm.partyOrgType, this.dataForm.orgPid, this.dataForm.orgPids)
this.setPartyOrgType_xzxj()
this.getInfoAgencyLisy()
} else {
this.dataForm.mySelectOrg = ''
}
}
})
},
//
setPartyOrgType_xzxj() {
if (this.dataForm.partyOrgType === '0') { // 0,1,2,3,4,5
this.dataForm.partyOrgType = '1'
} else if (this.dataForm.partyOrgType === '1') {
@ -181,22 +195,12 @@
} else if (this.dataForm.partyOrgType === '4') {
this.dataForm.partyOrgType = '5'
}
console.log(this.dataForm.orgPid)
console.log(this.dataForm.orgPids)
// this.getOrgList()
} else {
this.dataForm.mySelectOrg = ''
}
}
this.setPartyOrgType()
})
},
//
setPartyOrgType() {
// community:street,: district,: city :province
// 0,1,2,3,4,5
this.level = localStorage.getItem('level')
this.level = localStorage.getItem('level') ? localStorage.getItem('level') : ''
if (this.level == 'province') {
this.partyOrgTypeList = [
{value: '0', name: '省委'},
@ -236,35 +240,34 @@
},
//
changeAgencyOrg () {
console.log(this.dataForm.agencyId)
if(!this.dataForm.orgId){ // orgId
this.getOrgList()
}
},
//
changePartyOrgType(value){
if(value != '5'){ //
this.dataForm.agencyId = ''
if(value == '5'){ //
this.dataForm.agencyId = localStorage.getItem('agencyId')
this.dataForm.agencyPids = ''
}
this.getOrgList()
} else {
//
this.getInfoAgencyLisy()
// this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => {
// if (res.code !== 0) {
// return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '')
// }
// this.agencyOrgList = this.removeEmptyChildren(res.data)
// }).catch(() => {})
}
},
//
//
getOrgList() {
if (!this.dataForm.id) { //
this.orgList = []
this.dataForm.mySelectOrg = '', //
this.dataForm.orgPid = '', // ID,0
this.dataForm.orgPids = ''
}
this.$http.get('/resi/partymember/icPartyOrg/getParentOrgList', {params: {agencyId: this.dataForm.agencyId, partyOrgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
}
this.orgList = this.removeEmptyChildren(res.data)
// this.orgList.unshift({
// partyOrgName: '',
// id: '0'
// });
}).catch(() => {
})
},
@ -309,8 +312,8 @@
this.dataForm.agencyId = this.dataForm.agencyId
//
this.getInfoAgencyLisy()
//
this.getOrgList()
console.log(':::::', JSON.stringify(this.dataForm))
this.initMap()
}).catch(() => {
})

23
src/views/modules/partymember/icpartyorgtree.vue

@ -14,7 +14,8 @@
row-key="id"
border
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}">
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
:height="tableHeight">
<el-table-column prop="partyOrgName" label="党组织名称"></el-table-column>
<el-table-column label="操作" align="center" width="300">
<template slot-scope="scope">
@ -62,13 +63,16 @@
import AddOrUpdate from './icpartyorg-add-or-update'
import TableTreeColumn from '@/components/table-tree-column'
import lookMember from './lookMember'
import { mapGetters } from 'vuex'
export default {
data () {
return {
searchH: 0,
dataForm: {
id: '',
customerId: '',
orgPids: ''
orgPids: '',
agencyId: ''
},
tableLoading: false,
tableData: [],
@ -83,9 +87,24 @@
TableTreeColumn,
lookMember
},
computed: {
...mapGetters(['clientHeight', 'iframeHeight']),
tableHeight() {
const h = this.clientHeight - this.searchH - 230 + this.iframeHeigh
const _h = this.clientHeight - 230 - this.searchH
return this.$store.state.inIframe ? h : _h
}
},
mounted() {
this.$nextTick(() => {
this.searchH = this.$refs.searchCard.$el.offsetHeight
console.log('tableHeight', this.tableHeight)
})
},
async created () {
this.agencyId = localStorage.getItem('agencyId')
this.dataForm.customerId = localStorage.getItem('customerId')
this.dataForm.agencyId = localStorage.getItem('agencyId')
this.getTableData()
// this.pageLoading = true
},

51
src/views/modules/partymember/lookMember.vue

@ -34,17 +34,6 @@
<el-form-item label="地址" prop="address">
<el-input v-model="searchForm.address" placeholder="请输入" class="input-width" clearable></el-input>
</el-form-item>
</div>
<div>
<el-form-item label="流动党员" prop="isLd">
<el-select v-model="searchForm.isLd" filterable placeholder="请选择" clearable>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item label="流动党员证号" prop="ldzh">
<el-input v-model="searchForm.ldzh" placeholder="请输入" class="input-width" clearable></el-input>
</el-form-item>
<el-form-item label="职务" prop="partyZw">
<el-select v-model="searchForm.partyZw" filterable placeholder="请选择" clearable>
<el-option
@ -55,26 +44,42 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否缴费" prop="isPay">
</div>
<div>
<!-- <el-form-item label="流动党员" prop="isLd">
<el-select v-model="searchForm.isLd" filterable placeholder="请选择" clearable>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item> -->
<!-- <el-form-item label="流动党员证号" prop="ldzh">
<el-input v-model="searchForm.ldzh" placeholder="请输入" class="input-width" clearable></el-input>
</el-form-item> -->
<!-- <el-form-item label="是否缴费" prop="isPay">
<el-select v-model="searchForm.isPay" filterable placeholder="请选择" clearable>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="党员中心户" prop="isDyzxh">
<el-select v-model="searchForm.isDyzxh" filterable placeholder="请选择" clearable>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item>
<el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
<el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
</el-form-item>
</div>
<el-form-item label="免学习" prop="isMxx">
<!-- <el-form-item label="免学习" prop="isMxx">
<el-select v-model="searchForm.isMxx" filterable placeholder="请选择" clearable>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item label="最近一次缴费时间"
</el-form-item> -->
<!-- <el-form-item label="最近一次缴费时间"
label-width="130px"
prop="startTime">
<el-date-picker v-model="timeRangePay"
@ -87,8 +92,8 @@
end-placeholder="结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="入党时间"
</el-form-item> -->
<!-- <el-form-item label="入党时间"
prop="startTime">
<el-date-picker v-model="timeRange"
size="small"
@ -100,11 +105,7 @@
end-placeholder="结束时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
<el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
</el-form-item>
</el-form-item> -->
</el-form>
</div>
</el-card>
@ -388,8 +389,8 @@ export default {
computed: {
...mapGetters(['clientHeight', 'iframeHeight']),
tableHeight() {
const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
const _h = this.clientHeight - 280 - this.searchH
const h = this.clientHeight - this.searchH - 490 + this.iframeHeigh
const _h = this.clientHeight - 490 - this.searchH
return this.$store.state.inIframe ? h : _h
}
},

Loading…
Cancel
Save