diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 07191fe99..b5c89571c 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -225,7 +225,7 @@ }, searchReset() { this.queryParam = {} - this.serialNumber = '' + this.$route.query.serialNumber = '' this.pageNo = 1 this.getList() }, @@ -245,13 +245,10 @@ queryParam[val] = queryParam[val].join(',') } }) - if(this.$route.query.serialNumber){ - this.serialNumber = this.$route.query.serialNumber - } let query = { pageNo: this.pageNo, pageSize: this.pageSize, - serialNumber: this.serialNumber, + serialNumber: this.$route.query.serialNumber?this.$route.query.serialNumber:'', ...queryParam } this.loading = true diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 1aaadb1fb..3c1a9f42c 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -298,6 +298,7 @@ }, searchReset() { this.queryParam = {} + this.$route.query.serialNumber = '' this.pageNo = 1 this.getList() }, @@ -317,13 +318,10 @@ queryParam[val] = queryParam[val].join(',') } }) - if(this.$route.query.serialNumber){ - this.serialNumber = this.$route.query.serialNumber - } let query = { pageNo: this.pageNo, pageSize: this.pageSize, - serialNumber: this.serialNumber, + serialNumber: this.$route.query.serialNumber?this.$route.query.serialNumber:'', ...queryParam } this.loading = true diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 9e9882973..157836add 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -200,6 +200,7 @@ export default { queryParam: {}, areaVisible: false, paramsTemplateName: '', + queryConditionVOList: [], drawerVisible: false, titleTag: '' } @@ -290,6 +291,8 @@ export default { }, searchReset() { this.queryParam = {} + this.territory = '' + this.queryConditionVOList = [] this.$refs.globalAdvancedQueryRef.resetLine() this.$refs.globalAdvancedQueryRef.emitCallback() }, @@ -313,14 +316,15 @@ export default { handleSuperQuery(params, matchType) { let sqp = {} if (!params || (params && params.length == 0)) { - sqp['superQueryParams'] = '' + this.queryConditionVOList = [] this.$refs.globalAdvancedQueryRef.superQueryFlag = false } else { this.$refs.globalAdvancedQueryRef.superQueryFlag = true - sqp['superQueryParams'] = encodeURI(JSON.stringify(params)) - sqp['superQueryMatchType'] = matchType + this.queryConditionVOList = params + this.queryConditionVOList.forEach(res => { + res.type = matchType + }) } - this.queryParamQuery = sqp this.getList() }, getList() { @@ -329,10 +333,11 @@ export default { this.territory = this.queryParam.technologyTerritory.join(',') } // let queryParam = JSON.parse(JSON.stringify(this.queryParam)) + let queryConditionVOList = JSON.parse(JSON.stringify(this.queryConditionVOList)) let query = { pageNo: this.pageNo, pageSize: this.pageSize, - ...this.queryParamQuery, + queryConditionVOList: JSON.stringify(queryConditionVOList), technology_territory: this.territory, serial_number:this.queryParam.serialNumber, title:this.queryParam.title, @@ -340,7 +345,7 @@ export default { } this.loading = true - getAction(this.url.list, query).then((res) => { + postAction(this.url.list, query).then((res) => { if (res) { if (res.result.current > 1 && res.result.records.length == 0) { this.pageNo = res.result.current - 1