From 8e6c58eec222c4bbea613e02703d9af22da72bee Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 15 六月 2023 18:17:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/integration/applicationForm.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/applicationForm.vue b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
index db577fa..6cd1ac7 100644
--- a/Source/UBCS-WEB/src/views/integration/applicationForm.vue
+++ b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
@@ -117,9 +117,13 @@
},
async getDataList() {
this.loading = true
- console.log(this.searchParam)
const { pageSize, currentPage, total } = this.page
let param = { size: pageSize, current: currentPage }
+ console.log(this.searchParam)
+ this.searchParam = Object.keys(this.searchParam)
+ .filter((key) => this.searchParam[key] !== null && this.searchParam[key] !== undefined && this.searchParam[key] !== "")
+ .reduce((acc, key) => ({ ...acc, [key]: this.searchParam[key] }), {});
+ console.log(this.searchParam)
const response = await getList({ ...param, ...this.searchParam })
if (response.status === 200) {
this.loading = false
@@ -137,8 +141,10 @@
},
handleReset() {
this.searchParam = {}
+ this.getDataList()
},
handleSearch(form, done) {
+ console.log(form)
const { id, groupCode, operationType } = form
let dataTime = { id, groupCode, operationType }
if (form.hasOwnProperty('createTime')) {
@@ -147,7 +153,6 @@
if (form.hasOwnProperty('lastModifyTime')) {
dataTime = { lastModifyTime: dateFormat(form.lastModifyTime), ...dataTime }
}
- console.log(dataTime)
this.searchParam = dataTime
this.page.currentPage = 1
this.getDataList()
--
Gitblit v1.9.3