diff --git a/epmet-oper-web/src/js/columns/dataReport/operStatic.js b/epmet-oper-web/src/js/columns/dataReport/operStatic.js index 06a037f..e63b828 100644 --- a/epmet-oper-web/src/js/columns/dataReport/operStatic.js +++ b/epmet-oper-web/src/js/columns/dataReport/operStatic.js @@ -13,13 +13,13 @@ export default [ width: width }, { - key: 'resiCount', + key: 'residentCount', title: '居民数', display: ['formA', 'formU', 'table', 'model'], width: width }, { - key: 'partyCount', + key: 'partyMemberCount', title: '党员数', display: ['formA', 'formU', 'table', 'model'], width: width diff --git a/epmet-oper-web/src/views/modules/dataExport/operStatic.vue b/epmet-oper-web/src/views/modules/dataExport/operStatic.vue index 5a3a09b..cbffbc4 100644 --- a/epmet-oper-web/src/views/modules/dataExport/operStatic.vue +++ b/epmet-oper-web/src/views/modules/dataExport/operStatic.vue @@ -232,9 +232,14 @@ export default { }, handleEndTimeChange (item) { - const endTimeArray = util.dateFormatter(item, 'date').split('-') - this.tableParams.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2] - this.endTime = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日' + if (item) { + const endTimeArray = util.dateFormatter(item, 'date').split('-') + this.tableParams.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2] + this.endTime = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日' + } else { + this.tableParams.endTime = '' + this.endTimeShow = '' + } }, handleTimeChange (time) { @@ -289,6 +294,11 @@ export default { return false } + if (this.tableParams.type === 'end' && !this.tableParams.endTime) { + this.$message.info("请选择结束日期") + return false + } + this.tableParams.agencyId = this.agencyIdArray[this.agencyIdArray.length - 1] return true diff --git a/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue b/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue index ab1c187..8295b1c 100644 --- a/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue +++ b/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue @@ -10,8 +10,9 @@
- @@ -103,6 +104,8 @@ export default { }, options: [], + agencyIdArray: [], + iscascaderShow: 0, categoryList: [], @@ -210,8 +213,10 @@ export default { } }, loadData () { - if (this.tableParams.agencyId.length > 0) { - this.tableParams.agencyId = this.tableParams.agencyId[this.tableParams.agencyId.length - 1] + if (this.agencyIdArray.length > 0) { + this.tableParams.agencyId = this.agencyIdArray[this.agencyIdArray.length - 1] + } else { + this.tableParams.agencyId = '' } this.$refs.table.loadData() @@ -273,7 +278,10 @@ export default { const params = {} const { data, code, msg } = await requestPost(url, params) if (code === 0) { + ++this.iscascaderShow this.options = [] + this.agencyIdArray.length = [] + this.options.push(data) } else {