From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/originalAdd.vue | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/originalAdd.vue b/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
index c6b6974..e400868 100644
--- a/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
@@ -300,18 +300,20 @@
},
methods: {
onSubmit() {
- const conditionMap = {};
- if (this.form.name) {
- conditionMap[`conditionMap['name_like']`] = this.form.name;
+ if (this.form.name || this.form.label) {
+ const params = {};
+ if (this.form.name) {
+ params.name = this.form.name;
+ }
+ if (this.form.label) {
+ params.label = this.form.label;
+ }
+ getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize, params)
+ .then((res) => {
+ this.enumRefer.enumPage.total = res.data.data.total;
+ this.enumRefer.data = res.data.data.records;
+ });
}
- if (this.form.label) {
- conditionMap[`conditionMap['label_like']`] = this.form.label;
- }
- getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize, conditionMap)
- .then((res) => {
- this.enumRefer.enumPage.total = res.data.data.total;
- this.enumRefer.data = res.data.data.records;
- });
},
enumOnLoad(){
getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize).then(res => {
--
Gitblit v1.9.3