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
ea7cee4927
commit
3fb4c763c3
3 changed files with 85 additions and 62 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. 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
View File

@ -140,6 +140,7 @@
agencyListVisible:false, agencyListVisible:false,
orgList: [], orgList: [],
agencyId: '', agencyId: '',
level: '',
partyOrgTypeList: [], partyOrgTypeList: [],
agencyOrgList:[] agencyOrgList:[]
} }
@ -162,14 +163,27 @@
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.dataForm.latitude = '' this.dataForm.latitude = ''
if (this.dataForm.id) { if (this.dataForm.id) {
this.setPartyOrgType()
this.getInfo() this.getInfo()
} else { } else {
this.setPartyOrgType()
this.initMap() this.initMap()
if(this.dataForm.orgId) { if(this.dataForm.orgId) {
this.dataForm.mySelectOrg = this.dataForm.orgId this.dataForm.mySelectOrg = this.dataForm.orgId
this.dataForm.orgPid = 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.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId
this.dataForm.partyOrgType = this.dataForm._partyOrgType 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支部 if (this.dataForm.partyOrgType === '0') { // 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部
this.dataForm.partyOrgType = '1' this.dataForm.partyOrgType = '1'
} else if (this.dataForm.partyOrgType === '1') { } else if (this.dataForm.partyOrgType === '1') {
@ -181,22 +195,12 @@
} else if (this.dataForm.partyOrgType === '4') { } else if (this.dataForm.partyOrgType === '4') {
this.dataForm.partyOrgType = '5' this.dataForm.partyOrgType = '5'
} }
console.log(this.dataForm.orgPid)
console.log(this.dataForm.orgPids)
// this.getOrgList()
} else {
this.dataForm.mySelectOrg = ''
}
}
this.setPartyOrgType()
})
}, },
//设置组织类型 //设置组织类型
setPartyOrgType() { setPartyOrgType() {
// 社区级：community，街道级:street,区县级: district,市级: city 省级:province // 社区级：community，街道级:street,区县级: district,市级: city 省级:province
// 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部 // 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部
this.level = localStorage.getItem('level') this.level = localStorage.getItem('level') ? localStorage.getItem('level') : ''
if (this.level == 'province') { if (this.level == 'province') {
this.partyOrgTypeList = [ this.partyOrgTypeList = [
{value: '0', name: '省委'}, {value: '0', name: '省委'},
@ -236,35 +240,34 @@
}, },
// 选中行政组织 // 选中行政组织
changeAgencyOrg () { changeAgencyOrg () {
console.log(this.dataForm.agencyId) if(!this.dataForm.orgId){ // 有orgId 证明是从新增下级过来的，新增下级操作 上级党组织不需要查询
this.getOrgList() this.getOrgList()
}
}, },
// 选中组织类型 组织类型为支部时不需要选择行政组织 // 选中组织类型 组织类型为支部时不需要选择行政组织
changePartyOrgType(value){ changePartyOrgType(value){
if(value != '5'){ // 支部 if(value == '5'){ // 支部 不选择行政组织
this.dataForm.agencyId = '' this.dataForm.agencyId = localStorage.getItem('agencyId')
this.dataForm.agencyPids = '' this.dataForm.agencyPids = ''
} this.getOrgList()
} else {
//根据组织类型获取行政组织 //根据组织类型获取行政组织
this.getInfoAgencyLisy() 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() { 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}) => { this.$http.get('/resi/partymember/icPartyOrg/getParentOrgList', {params: {agencyId: this.dataForm.agencyId, partyOrgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? 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({
// partyOrgName: '一级组织',
// id: '0'
// });
}).catch(() => { }).catch(() => {
}) })
}, },
@ -309,8 +312,8 @@
this.dataForm.agencyId = this.dataForm.agencyId this.dataForm.agencyId = this.dataForm.agencyId
//根据组织类型获取行政组织 //根据组织类型获取行政组织
this.getInfoAgencyLisy() this.getInfoAgencyLisy()
// 获取上级党组织
this.getOrgList() this.getOrgList()
console.log(':::::', JSON.stringify(this.dataForm))
this.initMap() this.initMap()
}).catch(() => { }).catch(() => {
}) })

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

@ -14,7 +14,8 @@
row-key="id" row-key="id"
border border
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :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 prop="partyOrgName" label="党组织名称"></el-table-column>
<el-table-column label="操作" align="center" width="300"> <el-table-column label="操作" align="center" width="300">
<template slot-scope="scope"> <template slot-scope="scope">
@ -62,13 +63,16 @@
import AddOrUpdate from './icpartyorg-add-or-update' import AddOrUpdate from './icpartyorg-add-or-update'
import TableTreeColumn from '@/components/table-tree-column' import TableTreeColumn from '@/components/table-tree-column'
import lookMember from './lookMember' import lookMember from './lookMember'
import { mapGetters } from 'vuex'
export default { export default {
data () { data () {
return { return {
searchH: 0,
dataForm: { dataForm: {
id: '', id: '',
customerId: '', customerId: '',
orgPids: '' orgPids: '',
agencyId: ''
}, },
tableLoading: false, tableLoading: false,
tableData: [], tableData: [],
@ -83,9 +87,24 @@
TableTreeColumn, TableTreeColumn,
lookMember 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 () { async created () {
this.agencyId = localStorage.getItem('agencyId') this.agencyId = localStorage.getItem('agencyId')
this.dataForm.customerId = localStorage.getItem('customerId') this.dataForm.customerId = localStorage.getItem('customerId')
this.dataForm.agencyId = localStorage.getItem('agencyId')
this.getTableData() this.getTableData()
// this.pageLoading = true // this.pageLoading = true
}, },

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

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

Write Preview
Loading…
Cancel
Save