From efdfc33415d43d2f97cdfa66a48e3713f6c2fd1a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 24 八月 2023 20:33:39 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/views/integration/applicationForm.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/applicationForm.vue b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
index db577fa..a6c4e23 100644
--- a/Source/UBCS-WEB/src/views/integration/applicationForm.vue
+++ b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
@@ -29,6 +29,7 @@
stateParam: {},
option: {
height: "auto",
+ tip:false,
index: true,
border: true,
addBtn: false,
@@ -117,9 +118,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 +142,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 +154,6 @@
if (form.hasOwnProperty('lastModifyTime')) {
dataTime = { lastModifyTime: dateFormat(form.lastModifyTime), ...dataTime }
}
- console.log(dataTime)
this.searchParam = dataTime
this.page.currentPage = 1
this.getDataList()
@@ -167,4 +173,4 @@
},
}
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3