diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 72503bad..1c2cd549 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -52,6 +52,7 @@ placeholder="楼号" size="small" clearable + style="width: 120px;" class="resi-cell-select" :disabled="changeVDisabled" @clear="handleClearBuild" @@ -65,12 +66,13 @@ > - + @@ -190,6 +193,7 @@ --> 查询 + 重置
@@ -372,6 +376,12 @@ export default { this.form.UNIT_ID = '' this.form.HOME_ID = '' }, + resetForm(formName) { + for(const n in this.form) { + this.form[n] = '' + } + this.handleSearch() + }, handleSearch() { // console.log('formmmmm---', this.form) const itemTypes = ['daterange', 'timerange'] @@ -435,9 +445,13 @@ export default { if (n === val) { if (this.fixedList.length > 0) { let _item = {} + let hasVal = false this.fixedList.forEach((item, index) => { - if (item.columnName === val) { + if (item.columnName == val) { + hasVal = true item.columnValue[0] = this.form[val] + if (!this.form[val]) this.fixedList.splice(index, 1) + console.log('fixedList----val', this.fixedList) } else { _item = { queryType: 'equal', @@ -445,10 +459,11 @@ export default { columnName: val, columnValue: [this.form[val]] } + console.log('fixedList----else', _item) // this.$set(this.fixedList, index, _item) } }) - if (Object.keys(_item).length > 0) this.fixedList.push(_item) + if (Object.keys(_item).length > 0 && !hasVal) this.fixedList.push(_item) } else { this.$set(this.fixedList, 0, { queryType: 'equal', diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 2d9d49cf..63dce11e 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -12,11 +12,12 @@ @click="handleAdd">新增 下载人口模板 + @click="handleExportModule('room')">下载模板 + > +