From 6d98491ec1d783584514b0f3cc265f27607f4a92 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Tue, 19 Sep 2023 09:30:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/dialog/index.vue | 63 ++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue index 68c3041..5f91838 100644 --- a/src/views/components/dialog/index.vue +++ b/src/views/components/dialog/index.vue @@ -125,6 +125,21 @@
搜索
重置
导入
+ @@ -331,7 +346,10 @@ export default { this.getTable(obj); }, reset(){ - Object.keys(this.form).forEach(key=>this.form[key]='') + Object.keys(this.form).forEach(key=>this.form[key]=''); + this.pages.pageNum = 1; + this.pages.pageSize = 10; + this.getTable(this.pages); }, async open(item) { this.dialogVisible = true; @@ -474,6 +492,32 @@ export default { } return ""; }, + // handleSuccess() {}, + // // 导入 + // exportFile(e) { + // let downloadLoadingInstance = Loading.service({ + // text: "正在导入数据，请稍候", + // spinner: "el-icon-loading", + // background: "rgba(0, 0, 0, 0.7)", + // }); + // let a = new FormData(); + // a.append("file", e.file); + // exportEnterprise(a) + // .then((res) => { + // downloadLoadingInstance.close(); + // this.queryParms.year = ""; + // this.searchBefore = { + // pageSize: 10, + // pageNum: 1, + // }; + // this.getList(); + // this.$refs.uploadOver.clearFiles(); + // }) + // .catch(() => { + // downloadLoadingInstance.close(); + // this.$model.msgError("导入失败"); + // }); + // }, commentData(item){ if(item instanceof Array) { item.map((item)=>{ @@ -678,6 +722,7 @@ export default { } .btns { display: flex; + align-items: center; } .select-btn { margin: 20px 0 0 0; @@ -702,6 +747,22 @@ export default { background: #28b384; margin-left: 20px; } + .export { + display: flex; + align-items: center; + justify-content: center; + width: 80px; + height: 33px; + // padding: 6px 19px; + border-radius: 2px; + background-color: #28b384; + margin:20px 0 0 20px; + cursor: pointer; + color: #ffffff; + font-size: 14px; + font-family: "Alibaba PuHuiTi"; + font-weight: 400; + } } .tables { background-color: #eaf2fd; From 855022f78057667a8ca6e4ee3aae92c13842028a Mon Sep 17 00:00:00 2001 From: TiaStars Date: Tue, 19 Sep 2023 10:07:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?10=EF=BC=9A07?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/dialog/index.vue | 76 +++++---------------------- 1 file changed, 14 insertions(+), 62 deletions(-) diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue index 5f91838..8fd68c1 100644 --- a/src/views/components/dialog/index.vue +++ b/src/views/components/dialog/index.vue @@ -124,22 +124,7 @@
搜索
重置
-
导入
- +
@@ -157,6 +142,7 @@ @@ -338,6 +324,7 @@ export default { }; }, methods: { + // 搜索 filtrate(){ if(this.form.subdistrict) { this.form.subdistrict = this.form.subdistrict[1] @@ -345,12 +332,18 @@ export default { let obj = {...this.pages,...this.form} this.getTable(obj); }, + // 重置 reset(){ Object.keys(this.form).forEach(key=>this.form[key]=''); this.pages.pageNum = 1; this.pages.pageSize = 10; this.getTable(this.pages); }, + // 当前行的checkBox是否可以勾选 + checkSelectable(row){ + console.log(row) + }, + // 打开 async open(item) { this.dialogVisible = true; if(item == 'newlyIncreased') { @@ -362,6 +355,7 @@ export default { this.getTable(this.pages); } }, + // 关闭 Close(item) { this.dialogVisible = false; this.isamend = false; @@ -492,32 +486,6 @@ export default { } return ""; }, - // handleSuccess() {}, - // // 导入 - // exportFile(e) { - // let downloadLoadingInstance = Loading.service({ - // text: "正在导入数据，请稍候", - // spinner: "el-icon-loading", - // background: "rgba(0, 0, 0, 0.7)", - // }); - // let a = new FormData(); - // a.append("file", e.file); - // exportEnterprise(a) - // .then((res) => { - // downloadLoadingInstance.close(); - // this.queryParms.year = ""; - // this.searchBefore = { - // pageSize: 10, - // pageNum: 1, - // }; - // this.getList(); - // this.$refs.uploadOver.clearFiles(); - // }) - // .catch(() => { - // downloadLoadingInstance.close(); - // this.$model.msgError("导入失败"); - // }); - // }, commentData(item){ if(item instanceof Array) { item.map((item)=>{ @@ -743,26 +711,10 @@ export default { background: #FDAB5B; margin-left: 20px; } - .select-btn1 { - background: #28b384; - margin-left: 20px; - } - .export { - display: flex; - align-items: center; - justify-content: center; - width: 80px; - height: 33px; - // padding: 6px 19px; - border-radius: 2px; - background-color: #28b384; - margin:20px 0 0 20px; - cursor: pointer; - color: #ffffff; - font-size: 14px; - font-family: "Alibaba PuHuiTi"; - font-weight: 400; - } + // .select-btn1 { + // background: #28b384; + // margin-left: 20px; + // } } .tables { background-color: #eaf2fd; From 91fbc3871e9df345424cf67ed4624e10aefd6483 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Tue, 19 Sep 2023 10:23:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=8F=AF=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/dialog/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue index 8fd68c1..41558f8 100644 --- a/src/views/components/dialog/index.vue +++ b/src/views/components/dialog/index.vue @@ -342,6 +342,7 @@ export default { // 当前行的checkBox是否可以勾选 checkSelectable(row){ console.log(row) + return row }, // 打开 async open(item) {