From 3ecf0e4fcd7961ae3dcaef45daf55e7192d3ce4f Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 15 Mar 2022 17:23:32 +0800 Subject: [PATCH 1/5] dd --- src/views/components/resiSearch.vue | 20 +++++++++++++++---- src/views/modules/base/resi.vue | 7 ++++--- .../modules/communityParty/elegant/index.vue | 4 ++-- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 72503bad..26c928c7 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -65,7 +65,7 @@ > - + @@ -190,6 +190,7 @@ --> 查询 + 重置
@@ -372,6 +373,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 +442,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 +456,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..7054fb54 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -12,11 +12,12 @@ @click="handleAdd">新增 下载人口模板 + @click="handleExportModule('room')">下载模板 Date: Wed, 16 Mar 2022 09:51:26 +0800 Subject: [PATCH 2/5] dd --- src/views/components/resiSearch.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 26c928c7..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" @@ -71,6 +72,7 @@ placeholder="单元" size="small" clearable + style="width: 120px;" class="resi-cell-select" @click="handleClearDan" @change="handleChangeD" @@ -86,9 +88,10 @@ Date: Wed, 16 Mar 2022 14:42:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9C=AB=E7=8F=AD=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/elegant/index.vue | 12 ++++--- .../modules/communityService/sqzzz/index.vue | 33 +++++++++++++++++++ 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue index 58a9ec6f..a3a53089 100644 --- a/src/views/modules/communityParty/elegant/index.vue +++ b/src/views/modules/communityParty/elegant/index.vue @@ -48,6 +48,10 @@
新增 + 下载模板 {{importBtnTitle}} + {{ exportBtnTitle }} - +
新增 + 下载模板 { + // this.download(res.data, title + '.xls') + if (res.headers["content-disposition"]) { + let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) + console.log('filename', fileName) + let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' }) + var url = window.URL.createObjectURL(blob) + var aLink = document.createElement('a') + aLink.style.display = 'none' + aLink.href = url + aLink.setAttribute('download', fileName) + document.body.appendChild(aLink) + aLink.click() + document.body.removeChild(aLink) //下载完成移除元素 + window.URL.revokeObjectURL(url) //释放掉blob对象 + } else this.$message.error('下载失败') + }) + .catch(err => { + console.log('err', err) + return this.$message.error('网络错误') + }) + }, // 上传大图标成功 handleExcelSuccess(res, file) { if (res.code === 0 && res.msg === "success") { From 307df1e4013a59159d8532330199de3c27aaf44e Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 16 Mar 2022 14:46:21 +0800 Subject: [PATCH 4/5] dd --- src/views/modules/base/resi.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 7054fb54..63dce11e 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -63,7 +63,8 @@ align="center" :fixed="item.columnName == 'NAME' ? 'left' : false" :show-overflow-tooltip="true" - :width="item.itemType === 'radio' ? computedWidth(item.label) : 180"> + > +