From d6f94d02fd033c1c0a68fe2d4e987eb233d2afb1 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期三, 05 三月 2025 18:05:03 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/views/docking/loge.vue | 5 ++---
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 31 +++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index 6f8e57b..39c0963 100644
--- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
+++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -125,6 +125,37 @@
SaveHandler() {
let searchDataItem = Object.values(this.SearchObject.searchData).find(item => item.value === this.formInline.type);
let name = searchDataItem ? searchDataItem.prop : null;
+ if (!searchDataItem) {
+ this.$message.error('鏈壘鍒板搴旀悳绱㈢被鍨嬭鏌ョ湅鎺у埗鍙拌緭鍑猴紒')
+ }
+ const requestApi = (api) => {
+ api(1, 20, 'createTime', 'desc', {[`conditionMap[${name}_like]`]: this.formInline.text})
+ .then(res => {
+ if (!res.data.data.records) {
+ this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�');
+ } else {
+ let Data = res.data.data;
+ this.$emit('getList', Data);
+ }
+ });
+ }
+
+ //鏃ュ織
+ if (this.status.type == 'loge') {
+ requestApi(getLogoList);
+ }
+ //鏁版嵁
+ if (this.status.type == 'data') {
+ requestApi(getDataList);
+ }
+ //浠诲姟
+ if (this.status.type == 'task') {
+ requestApi(getTaskList);
+ }
+ },
+ SaveSearchHandler() {
+ let searchDataItem = Object.values(this.SearchObject.searchData).find(item => item.value === this.formInline.type);
+ let name = searchDataItem ? searchDataItem.prop : null;
// if (!searchDataItem) {
// this.$message.error('鏈壘鍒板搴旀悳绱㈢被鍨嬭鏌ョ湅鎺у埗鍙拌緭鍑猴紒')
// }
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index c6ebd44..3788739 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -289,7 +289,6 @@
})
},
dockingGetList(val) {
- console.log(val);
this.data = val.records;
this.page.pageSize = val.size;
this.page.currentPage = val.current;
@@ -327,11 +326,11 @@
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
- this.$refs.dockingSearch.SaveHandler();
+ this.$refs.dockingSearch.SaveSearchHandler();
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
- this.$refs.dockingSearch.SaveHandler();
+ this.$refs.dockingSearch.SaveSearchHandler();
},
refreshChange() {
const page = {
--
Gitblit v1.9.3