From 6f322f80ebc3d28f1979d727d6f794ec911501df Mon Sep 17 00:00:00 2001
From: "925116093-qq.com" <925116093@qq.com>
Date: Fri, 23 May 2025 17:44:21 +0800
Subject: [PATCH] 2025021

---
 .../controller/ServiceGoodsController.java    | 11 ++++
 ruoyi-ui/src/api/system/ServiceGoods.js       |  7 +++
 .../src/views/system/ServiceGoods/index.vue   | 59 ++++++++++++++++++-
 3 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ServiceGoodsController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ServiceGoodsController.java
index 77a2566..820a5e0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ServiceGoodsController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ServiceGoodsController.java
@@ -71,6 +71,17 @@ private IServiceCateService  serviceCateService;
         util.exportExcel(response, list, "服务内容数据");
     }
 
+    /**
+     * 获取服务内容详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:ServiceGoods:query')")
+    @GetMapping(value = "/selectServiceCateList")
+    public AjaxResult selectServiceCateList()
+    {
+        return success(serviceCateService.selectServiceCateList(new ServiceCate()));
+    }
+
+
     /**
      * 获取服务内容详细信息
      */
diff --git a/ruoyi-ui/src/api/system/ServiceGoods.js b/ruoyi-ui/src/api/system/ServiceGoods.js
index 748f54f..a19039f 100644
--- a/ruoyi-ui/src/api/system/ServiceGoods.js
+++ b/ruoyi-ui/src/api/system/ServiceGoods.js
@@ -16,6 +16,13 @@ export function getServiceGoods(id) {
     method: 'get'
   })
 }
+// 查询服务内容详细
+export function selectServiceCateList(id) {
+  return request({
+    url: '/system/ServiceGoods/selectServiceCateList',
+    method: 'get'
+  })
+}
 
 // 新增服务内容
 export function addServiceGoods(data) {
diff --git a/ruoyi-ui/src/views/system/ServiceGoods/index.vue b/ruoyi-ui/src/views/system/ServiceGoods/index.vue
index 78512da..5c7b675 100644
--- a/ruoyi-ui/src/views/system/ServiceGoods/index.vue
+++ b/ruoyi-ui/src/views/system/ServiceGoods/index.vue
@@ -27,6 +27,35 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="价格">
+        <el-input v-model="queryParams.minPrice" class="number-input" type="number" placeholder="最小值" clearable style="width: 120px;" />
+        -
+        <el-input v-model="queryParams.maxPrice" class="number-input" type="number" placeholder="最大值" clearable style="width: 120px;" />
+      </el-form-item>
+
+      <el-form-item label="分类" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择分类" clearable>
+          <el-option
+            v-for="cate in serviceCateList"
+            :key="cate.id"
+            :label="cate.title"
+            :value="cate.id"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreatedAt"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -300,7 +329,7 @@
 </template>
 
 <script>
-import { listServiceGoods, getServiceGoods, delServiceGoods, addServiceGoods, updateServiceGoods ,changefenleiStatus} from "@/api/system/ServiceGoods"
+import { listServiceGoods, getServiceGoods, delServiceGoods, addServiceGoods, updateServiceGoods ,changefenleiStatus,selectServiceCateList} from "@/api/system/ServiceGoods"
 
 export default {
   name: "ServiceGoods",
@@ -318,6 +347,9 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 总条数
+
+      serviceCateList: [],
+
       total: 0,
       // 服务内容表格数据
       ServiceGoodsList: [],
@@ -329,11 +361,18 @@ export default {
       queryParams: {
         pageNum: 1,
         type: '1',
+        minPrice: null,
+        maxPrice: null,
+        createdStart: null,
+        createdEnd: null,
+
         pageSize: 10,
         title: null,
         subTitle: null,
         status: null,
         project: null,
+        createdStart: null,
+        createdEnd: null,
       },
       // 表单参数
       form: {},
@@ -362,10 +401,12 @@ export default {
       editField: '',
       editFieldLabel: '',
       editRow: null,
+      daterangeCreatedAt: [],
     }
   },
   created() {
     this.getList()
+    this.getserviceCateList();
   },
   methods: {
     /** 查询服务内容列表 */
@@ -418,14 +459,25 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      // 处理创建时间
+      if (this.daterangeCreatedAt && this.daterangeCreatedAt.length === 2) {
+        this.queryParams.createdStart = this.daterangeCreatedAt[0];
+        this.queryParams.createdEnd = this.daterangeCreatedAt[1];
+      } else {
+        this.queryParams.createdStart = null;
+        this.queryParams.createdEnd = null;
+      }
       this.queryParams.pageNum = 1
       this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.daterangeCreatedAt = [];
       this.resetForm("queryForm")
       this.handleQuery()
     },
+
+ 
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
@@ -490,6 +542,11 @@ export default {
         this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
+    getserviceCateList(){
+     selectServiceCateList().then(response => {
+      this.serviceCateList = response.data
+     }) 
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/ServiceGoods/export', {