From a9f73bdaecae75f8058c7d8a05c40cbf590c6465 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 26 二月 2026 17:48:18 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java | 1 +
admin/src/views/business/information.vue | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/admin/src/views/business/information.vue b/admin/src/views/business/information.vue
index 637ef7f..ff61e15 100644
--- a/admin/src/views/business/information.vue
+++ b/admin/src/views/business/information.vue
@@ -40,7 +40,12 @@
></el-option>
</el-select>
</el-form-item>
-
+ <el-form-item label="鐘舵��" prop="status" >
+ <el-select v-model="searchForm.status" style="width: 150px" placeholder="鐘舵��" clearable @change="search">
+ <el-option :key="0" :value="0" label="鍚敤"></el-option>
+ <el-option :key="1" :value="1" label="绂佺敤"></el-option>
+ </el-select>
+ </el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -150,6 +155,7 @@
name: '',
realName: '',
brandId: null,
+ status: null,
labelId: null,
contentType: '',
type: 3 // 绫诲瀷0鍟嗗娲诲姩 1骞冲彴娲诲姩 2鎺㈠簵 3璧勮
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
index 8e45930..bda96d7 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
@@ -429,6 +429,7 @@
}*/
queryWrapper.eq(Activity::getIsdeleted, Constants.ZERO);
+ queryWrapper.eq(pageWrap.getModel().getStatus() !=null, Activity::getStatus, pageWrap.getModel().getStatus());
queryWrapper.eq(pageWrap.getModel().getLabelId() !=null, Activity::getLabelId, pageWrap.getModel().getLabelId());
queryWrapper.eq(pageWrap.getModel().getBrandId() !=null, Activity::getBrandId, pageWrap.getModel().getBrandId());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), Activity::getName, pageWrap.getModel().getName());
--
Gitblit v1.9.3