diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 03946ccf1..3a53679f4 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -7,7 +7,7 @@ {{item.db_field_txt}} {{item.db_field_txt}}
{{item.db_field_txt}} + v-model="queryParamOne[item.db_field_name]" :min="1" :max="99999999"/>
{{item.db_field_txt}} -
{{item.db_field_txt}} - + v-model="queryParamOne[item.db_field_name]"/>
{{item.db_field_txt}} -
@@ -306,7 +306,9 @@ downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', queryParamSeach: '', mapOne: {}, - mapTwo: {} + mapTwo: {}, + queryParamOne: {}, + searchQueryOne: {} } }, watch: { @@ -336,10 +338,11 @@ }, selectListModel(val) { + this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne } this.isTrue = val == 'list' ? true : false - if (this.isTrue){ + if (this.isTrue) { this.getInfoList(1) - }else{ + } else { this.getParagraphInfoList(1) } }, @@ -356,19 +359,21 @@ } }, pageOnChange(page, pageSize) { + this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne } this.pageNo = page - if (this.isTrue){ + if (this.isTrue) { this.getInfoList(1) - }else{ + } else { this.getParagraphInfoList(1) } }, SizeChange(page, pageSize) { + this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne } this.pageNo = 1 this.pageSize = pageSize - if (this.isTrue){ + if (this.isTrue) { this.getInfoList(1) - }else{ + } else { this.getParagraphInfoList(1) } }, @@ -425,14 +430,14 @@ }) }, dateChange(item) { - this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD') - this.queryParam[item + '_name'] = moment(this.queryParam[item]).format('YYYY-MM-DD') + this.queryParamOne[item] = moment(this.queryParamOne[item]).format('YYYY-MM-DD') + this.queryParamOne[item + '_name'] = moment(this.queryParamOne[item]).format('YYYY-MM-DD') }, onChange(item) { - let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD') - let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD') - this.queryParam[item] = [dateOne, dateTwo] - this.queryParam[item + '_name'] = [dateOne, dateTwo] + let dateOne = moment(this.queryParamOne[item][0]).format('YYYY-MM-DD') + let dateTwo = moment(this.queryParamOne[item][1]).format('YYYY-MM-DD') + this.queryParamOne[item] = [dateOne, dateTwo] + this.queryParamOne[item + '_name'] = [dateOne, dateTwo] }, getCondition() { let query = { @@ -449,31 +454,33 @@ }, searchReset() { this.pageNo = 1 - this.queryParam = {} + this.queryParamOne = {} + this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne } this.queryParamSeach = '' - if (this.isTrue){ + if (this.isTrue) { this.getInfoList(1) - }else{ + } else { this.getParagraphInfoList(1) } }, searchQuery() { this.ParamSeach() + this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne } this.pageNo = 1 - if (this.isTrue){ + if (this.isTrue) { this.getInfoList(1) - }else{ + } else { this.getParagraphInfoList(1) } }, treeChange(value, text) { - this.queryParam[this.db_field_name + '_name'] = text + this.queryParamOne[this.db_field_name + '_name'] = text }, treeClick(db_field_name) { this.db_field_name = db_field_name }, ParamSeach() { - let queryParam = JSON.parse(JSON.stringify(this.queryParam)) + let queryParam = JSON.parse(JSON.stringify(this.queryParamOne)) this.queryParamSeach = '' Object.keys(queryParam).forEach(val => { if (queryParam[val] instanceof Array) { @@ -486,29 +493,33 @@ this.queryParamSeach = this.queryParamSeach.substr(0, this.queryParamSeach.length - 1) }, searchData(data, selectModel) { - this.queryParam = { ...this.queryParam, ...data } + this.queryParam = {} + this.searchQueryOne = data || {} + this.queryParam = { ...this.queryParamOne, ...data } this.selectModel = selectModel this.ParamSeach() this.pageNo = 1 - if (this.isTrue){ + if (this.isTrue) { this.getInfoList(1) - }else{ + } else { this.getParagraphInfoList(1) } }, searchDataTwo(data, selectModel) { - this.queryParam = { ...this.queryParam, ...data } + this.queryParam = {} + this.searchQueryOne = data || {} + this.queryParam = { ...this.queryParamOne, ...data } this.selectModel = selectModel this.ParamSeach() this.pageNo = 1 - if (this.isTrue){ + if (this.isTrue) { this.getInfoList(2) - }else{ + } else { this.getParagraphInfoList(2) } }, changeQuery(val, name) { - this.queryParam[name + '_name'] = val + this.queryParamOne[name + '_name'] = val }, getInfoList(num) { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) @@ -520,6 +531,7 @@ delete queryParam[val] } }) + this.mapTwo = {} if (num == 1) { this.mapOne = queryParam } else if (num == 2) { @@ -549,7 +561,7 @@ } }) }, - getParagraphInfoList(num){ + getParagraphInfoList(num) { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { if (queryParam[val] instanceof Array) { @@ -559,12 +571,13 @@ delete queryParam[val] } }) + this.mapTwo = {} if (num == 1) { this.mapOne = queryParam } else if (num == 2) { this.mapTwo = queryParam - let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) - this.mapTwo.ids = selectedRowKeys.join(',') + let checkboxText = JSON.parse(JSON.stringify(this.checkboxText)) + this.mapTwo.ids = checkboxText.join(',') } let query = { pageNo: this.pageNo, diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 4826a7635..69d0b84c9 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -5,7 +5,7 @@
- + {{item.db_field_txt}} @@ -98,7 +98,7 @@ this.$refs.wholeRef.searchDataTwo(event) } else if (this.$refs.DocumentLibraryRef) { this.queryParam[this.selectModel] = event - this.$refs.DocumentLibraryRef.searchDataTwo(this.queryParam,this.selectModel) + this.$refs.DocumentLibraryRef.searchDataTwo(this.queryParam, this.selectModel) } }, getCondition() { @@ -116,6 +116,9 @@ this.searchOption = [] } }) + }, + selectModelChange(event) { + this.queryParam = {} } } }