diff --git a/src/views/modules/communityParty/communityFrameWork/index.vue b/src/views/modules/communityParty/communityFrameWork/index.vue index 5b43bfae..9b8ccc61 100644 --- a/src/views/modules/communityParty/communityFrameWork/index.vue +++ b/src/views/modules/communityParty/communityFrameWork/index.vue @@ -128,8 +128,6 @@ export default { tableData: [], searchH: 0, unloadPencent: 0, - addLevel: '1', - addType: 'add', value: '', optionsG: [], optionsEditC: [], @@ -142,7 +140,6 @@ export default { value: 2 } ], - demandOptions: [], tableHeader: [ { label: '组织名称', diff --git a/src/views/modules/communityParty/gridFrameWork/index.vue b/src/views/modules/communityParty/gridFrameWork/index.vue index 784d0cc0..7e7a5434 100644 --- a/src/views/modules/communityParty/gridFrameWork/index.vue +++ b/src/views/modules/communityParty/gridFrameWork/index.vue @@ -133,8 +133,6 @@ export default { tableData: [], searchH: 0, unloadPencent: 0, - addLevel: '1', - addType: 'add', value: '', optionsEditG: [], optionsC: [], @@ -148,7 +146,6 @@ export default { value: 2 } ], - demandOptions: [], tableHeader: [ { label: '组织名称', @@ -199,7 +196,6 @@ export default { children: 'subAgencyList', checkStrictly: true }, - formType: '' } }, computed: { @@ -459,7 +455,6 @@ export default { async handleEdit(row, addType) { // this.form = { ...row } await this.getDetail(row.id) - this.formType = addType // this.dialogVisible = true }, async addNew() { diff --git a/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue new file mode 100644 index 00000000..2e90592d --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue @@ -0,0 +1,412 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue new file mode 100644 index 00000000..eb8ca299 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue @@ -0,0 +1,360 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncharecord/icenterprisechangerecord-add-or-update.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncharecord/icenterprisechangerecord-add-or-update.vue new file mode 100644 index 00000000..52028003 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/xuncharecord/icenterprisechangerecord-add-or-update.vue @@ -0,0 +1,142 @@ + + + diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncharecord/icenterprisechangerecord.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncharecord/icenterprisechangerecord.vue new file mode 100644 index 00000000..4db3b7b6 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/xuncharecord/icenterprisechangerecord.vue @@ -0,0 +1,358 @@ + + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue index 58767a37..93101183 100644 --- a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue +++ b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue @@ -1,24 +1,45 @@ @@ -319,14 +297,11 @@ import diyInfo from "@/views/modules/base/diyInfo.vue"; export default { props: { - elseParams: { - type: Array, - default: () => [], - }, + }, components: { peopleMore, diyInfo }, - data() { + data () { return { openSearch: false, @@ -345,14 +320,15 @@ export default { optionsD: [], optionsG: [], orgOptions: [], - orgOptionProps:{ + jmlbOptions: [], + orgOptionProps: { multiple: false, value: 'agencyId', label: 'agencyName', children: 'subAgencyList', checkStrictly: true - }, - agencyIdArray:[], + }, + agencyIdArray: [], optionsWelfare: [ { @@ -366,7 +342,7 @@ export default { ], fmData: { - agencyId:"", + agencyId: "", gridId: "", villageId: "", buildId: "", @@ -375,6 +351,7 @@ export default { name: "", mobile: "", idCard: "", + category: "", }, rangeTime: [], @@ -389,11 +366,13 @@ export default { diyDialog: false, exportList: [], + + elseParams: [], }; }, computed: { ...mapGetters(["clientHeight", "iframeHeight"]), - maxTableHeight() { + maxTableHeight () { console.log("computed-searchH---", this.searchH); const h = this.clientHeight - this.searchH + this.iframeHeight; const _h = this.clientHeight - this.searchH; @@ -401,13 +380,13 @@ export default { return this.$store.state.inIframe ? h : _h; }, - changeVDisabled() { + changeVDisabled () { return !this.fmData.villageId; }, - changeBDisabled() { + changeBDisabled () { return !this.fmData.buildId; }, - changeDDisabled() { + changeDDisabled () { return !this.fmData.unitId; }, }, @@ -422,7 +401,7 @@ export default { this.fmData.endTime = ""; } }, - searchH() { + searchH () { const h = this.clientHeight - this.searchH + this.iframeHeight; const _h = this.clientHeight - this.searchH; console.log("computed-searchH---_h", _h); @@ -432,7 +411,8 @@ export default { }); }, }, - mounted() { + async mounted () { + await this.getJmlb(); this.getOrgTreeList(); this.getGridList(); this.getValiheList(); @@ -441,7 +421,7 @@ export default { console.log("searchH----", this.$refs.searchCard.$el.offsetHeight); }, methods: { - async handleWatch(rowIndex) { + async handleWatch (rowIndex) { let item = this.tableData[rowIndex]; this.currentPepeleId = item.icResiUserId; this.currentPepeleGridName = item.GRID_ID; @@ -449,20 +429,20 @@ export default { this.showedPeopleMoreInfo = true; }, - handleClearVillage() { + handleClearVillage () { this.fmData.buildId = ""; this.fmData.homeId = ""; }, - handleClearBuild() { + handleClearBuild () { this.fmData.buildId = ""; this.fmData.unitId = ""; this.fmData.homeId = ""; }, - handleClearDan() { + handleClearDan () { this.fmData.unitId = ""; this.fmData.homeId = ""; }, - handleChangeGrid(val) { + handleChangeGrid (val) { console.log("val", val); this.fmData.villageId = ""; this.fmData.buildId = ""; @@ -470,44 +450,94 @@ export default { this.fmData.homeId = ""; this.getValiheList(); }, - handleChangeV(val) { + handleChangeV (val) { console.log("val", val); this.fmData.buildId = ""; this.fmData.unitId = ""; this.fmData.homeId = ""; this.getBuildList(); }, - handleChangeB(val) { + handleChangeB (val) { console.log("val", val); this.fmData.unitId = ""; this.fmData.homeId = ""; this.getUniList(); }, - handleChangeD(val) { + handleChangeD (val) { console.log("val", val); this.fmData.homeId = ""; this.getHouseList(); }, + handleChangeJmlb (index) { + // debugger + let selItem = this.jmlbOptions[index] + this.elseParams = [] + let temp = { + queryType: selItem.queryType, + tableName: selItem.tableName, + columnName: selItem.columnName, + columnValue: [selItem.columnValue], + } + + this.elseParams.push(temp) + }, + + async getJmlb () { + const url = '/data/aggregator/coverage/zhzl-category-option' + let params = {} + const { data, code, msg } = await requestPost(url, params); + + + if (code === 0) { + this.jmlbOptions = [] + this.jmlbOptions = data + if (this.jmlbOptions.length > 0) { + this.fmData.category = 'anzhibangjiao' + // let temp = { + // queryType: this.jmlbOptions[0].queryType, + // tableName: this.jmlbOptions[0].tableName, + // columnName: this.jmlbOptions[0].columnName, + // columnValue: [this.jmlbOptions[0].columnValue], + // } + let temp = { + queryType: 'list_equal', + tableName: 'ic_special', + columnName: 'SPECIAL_RQLB', + columnValue: ["anzhibangjiao"], + } + + this.elseParams.push(temp) + } + + } else { + this.$message.error(msg) + } + + + }, + getOrgTreeList () { - getOrgTreeList() { const { user } = this.$store.state this.$http - .post('/gov/org/customeragency/agencygridtree', {}) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg) - } else { - console.log('获取组织树成功', res.data) - this.orgOptions=[] - this.orgOptions .push( res.data) - } - }) - .catch(() => { - return this.$message.error('网络错误') - }) + .post('/gov/org/customeragency/agencygridtree', {}) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取组织树成功', res.data) + this.orgOptions = [] + this.orgOptions.push(res.data) + + + + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) }, - getGridList() { + getGridList () { const { user } = this.$store.state; this.$http .post("/gov/org/customergrid/gridoption", { @@ -526,7 +556,7 @@ export default { return this.$message.error("网络错误"); }); }, - getValiheList() { + getValiheList () { const { user } = this.$store.state; this.$http .post("/gov/org/icneighborhood/neighborhoodoption", { @@ -546,7 +576,7 @@ export default { return this.$message.error("网络错误"); }); }, - getBuildList() { + getBuildList () { this.$http .post("/gov/org/icbuilding/buildingoption", { neighborHoodId: this.fmData.villageId, @@ -563,7 +593,7 @@ export default { return this.$message.error("网络错误"); }); }, - getUniList() { + getUniList () { this.$http .post("/gov/org/icbuildingunit/unitoption", { buildingId: this.fmData.buildId, @@ -580,7 +610,7 @@ export default { return this.$message.error("网络错误"); }); }, - getHouseList() { + getHouseList () { this.$http .post("/gov/org/ichouse/houseoption", { unitId: this.fmData.unitId }) .then(({ data: res }) => { @@ -596,48 +626,73 @@ export default { }); }, - handleSizeChange(val) { + handleSizeChange (val) { console.log(`每页 ${val} 条`); this.pageSize = val; window.localStorage.setItem("pageSize", val); this.getTableData(); }, - handleCurrentChange(val) { + handleCurrentChange (val) { console.log(`当前页: ${val}`); this.pageNo = val; this.getTableData(); }, - handleClose() { + handleClose () { this.formShow = false; }, - handleSearch(val) { + handleSearch (val) { console.log(this.fmData); this.pageNo = 1; this.getTableData(); }, - resetForm(formName) { - this.$refs[formName].resetFields(); + resetForm (formName) { + // this.$refs[formName].resetFields(); + this.agencyIdArray = [] + this.fmData = { + agencyId: "", + gridId: "", + villageId: "", + buildId: "", + unitId: "", + homeId: "", + name: "", + mobile: "", + idCard: "", + + } + this.elseParams = [] + if (this.jmlbOptions.length > 0) { + this.fmData.category = this.jmlbOptions[0].value + let temp = { + queryType: this.jmlbOptions[0].queryType, + tableName: this.jmlbOptions[0].tableName, + columnName: this.jmlbOptions[0].columnName, + columnValue: [this.jmlbOptions[0].columnValue], + } + + this.elseParams.push(temp) + } this.handleSearch(); }, - handleChangeAgency(val) { + handleChangeAgency (val) { let obj = this.$refs["myCascader"].getCheckedNodes()[0].data - + if (obj) { - if(obj.level === 'grid'){ - this.fmData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; - this.fmData.agencyId='' - }else{ + if (obj.level === 'grid') { + this.fmData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; + this.fmData.agencyId = '' + } else { this.fmData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; this.fmData.gridId = '' } - }else{ - this.fmData.agencyId='' - this.fmData.gridId = '' + } else { + this.fmData.agencyId = '' + this.fmData.gridId = '' } - + this.fmData.villageId = '' this.fmData.buildId = '' @@ -646,19 +701,19 @@ export default { this.getValiheList() }, - computeQueryParams() { + computeQueryParams () { const { pageSize, pageNo, elseParams, fmData } = this; - let conditions=[] - if(fmData.agencyId){ + let conditions = [] + if (fmData.agencyId) { conditions.push({ - queryType: "like", - tableName: "ic_resi_user", - columnName: "AGENCY_ID", - columnValue: [fmData.agencyId], - },) + queryType: "like", + tableName: "ic_resi_user", + columnName: "AGENCY_ID", + columnValue: [fmData.agencyId], + }) } - if(fmData.gridId){ + if (fmData.gridId) { conditions.push( { queryType: "equal", @@ -669,7 +724,7 @@ export default { ) } - if(fmData.villageId){ + if (fmData.villageId) { conditions.push( { queryType: "equal", @@ -680,76 +735,76 @@ export default { ) } - if(fmData.buildId){ + if (fmData.buildId) { conditions.push({ - queryType: "equal", - tableName: "ic_resi_user", - columnName: "BUILD_ID", - columnValue: [fmData.buildId], - }) + queryType: "equal", + tableName: "ic_resi_user", + columnName: "BUILD_ID", + columnValue: [fmData.buildId], + }) } - if(fmData.unitId){ + if (fmData.unitId) { conditions.push({ - queryType: "equal", - tableName: "ic_resi_user", - columnName: "UNIT_ID", - columnValue: [fmData.unitId], - }) + queryType: "equal", + tableName: "ic_resi_user", + columnName: "UNIT_ID", + columnValue: [fmData.unitId], + }) } - if(fmData.homeId){ + if (fmData.homeId) { conditions.push({ - queryType: "equal", - tableName: "ic_resi_user", - columnName: "HOME_ID", - columnValue: [fmData.homeId], - }) + queryType: "equal", + tableName: "ic_resi_user", + columnName: "HOME_ID", + columnValue: [fmData.homeId], + }) } - if(fmData.name){ + if (fmData.name) { conditions.push({ - queryType: "like", - tableName: "ic_resi_user", - columnName: "NAME", - columnValue: [fmData.name], - }) + queryType: "like", + tableName: "ic_resi_user", + columnName: "NAME", + columnValue: [fmData.name], + }) } - if(fmData.mobile){ + if (fmData.mobile) { conditions.push({ - queryType: "like", - tableName: "ic_resi_user", - columnName: "MOBILE", - columnValue: [fmData.mobile], - }) + queryType: "like", + tableName: "ic_resi_user", + columnName: "MOBILE", + columnValue: [fmData.mobile], + }) } - if(fmData.idCard){ + if (fmData.idCard) { conditions.push({ - queryType: "like", - tableName: "ic_resi_user", - columnName: "ID_CARD", - columnValue: [fmData.idCard], - }) + queryType: "like", + tableName: "ic_resi_user", + columnName: "ID_CARD", + columnValue: [fmData.idCard], + }) } return { formCode: "resi_base_info", pageSize, pageNo, - conditions: [ - + conditions: [ + ...conditions, - + ...elseParams, ], }; }, - async handleChu() { + async handleChu () { this.getExportList(); }, - async getExportList() { + async getExportList () { const url = "/oper/customize//icformitemgroup/list"; let params = { formCode: "resi_base_info", @@ -774,8 +829,8 @@ export default { } }, - async getTableData() { - const url = "/epmetuser/icresiuser/listresi"; + async getTableData () { + const url = "/epmetuser/icresiuser/listresi-zhzl"; const { data, code, msg } = await requestPost(url, { ...this.computeQueryParams(), }); @@ -784,8 +839,8 @@ export default { this.total = data.total || 0; this.tableData = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; } else { }