From 35483593876096630ece21747f997291d3ca94c9 Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Sat, 28 Feb 2026 10:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B5=E9=9D=A2=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 screen-vue/src/views/desktop/index.vue        |  2 +-
 .../screen/Erp/components/detail/indexV01.vue | 36 ++++++++++---------
 .../biz/controller/ErpCategoryController.java |  9 +++--
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/screen-vue/src/views/desktop/index.vue b/screen-vue/src/views/desktop/index.vue
index 7024add..08ef3f1 100644
--- a/screen-vue/src/views/desktop/index.vue
+++ b/screen-vue/src/views/desktop/index.vue
@@ -50,7 +50,7 @@ import WorkIndex from './screen/Work/index.vue';
 
 import { getHomeModuleList } from '@/api/bizApi'
 
-const screenTitle = ref('个人业务可视化看板');
+const screenTitle = ref('个人数字化可视化看板');
 const currentYear = new Date().getFullYear().toString();
 
 const FormValues = ref({
diff --git a/screen-vue/src/views/desktop/screen/Erp/components/detail/indexV01.vue b/screen-vue/src/views/desktop/screen/Erp/components/detail/indexV01.vue
index 713e2e9..da9d091 100644
--- a/screen-vue/src/views/desktop/screen/Erp/components/detail/indexV01.vue
+++ b/screen-vue/src/views/desktop/screen/Erp/components/detail/indexV01.vue
@@ -15,6 +15,21 @@
               clearable
             />
           </el-form-item>
+		  <el-form-item label="交易类型：" class="form-item">
+		    <el-select
+		      v-model="searchForm.transactionType"
+		      placeholder="请选择交易类型"
+		      clearable
+		      class="custom-select"
+		      teleport="body"
+		      popper-class="theme-select-popper"
+		      :popper-append-to-body="true"
+			   @change="getTranTypes"
+		    >
+		      <el-option label="收入" value="2" />
+		      <el-option label="支出" value="1" />
+		    </el-select>
+		  </el-form-item>
           <el-form-item label="交易分类：" class="form-item">
             <el-select
               v-model="searchForm.categoryId"
@@ -33,20 +48,6 @@
 				/>
             </el-select>
           </el-form-item>
-          <el-form-item label="交易类型：" class="form-item">
-            <el-select
-              v-model="searchForm.transactionType"
-              placeholder="请选择交易类型"
-              clearable
-              class="custom-select"
-              teleport="body"
-              popper-class="theme-select-popper"
-              :popper-append-to-body="true"
-            >
-              <el-option label="收入" value="2" />
-              <el-option label="支出" value="1" />
-            </el-select>
-          </el-form-item>
         </div>
         <el-form-item class="form-btn-group">
           <el-button type="primary" @click="handleSearch">查询</el-button>
@@ -125,7 +126,6 @@ const emit = defineEmits(['close'])
 const handleClose = () => emit('close')
 
 const tranTypes = ref();
-
 const loading = ref(false);
 
 const searchForm = reactive({
@@ -135,7 +135,6 @@ const searchForm = reactive({
 })
 
 const tableData = ref([]);
-
 const currentPage = ref(1);
 const pageSize = ref(20);
 const total = ref(0);
@@ -165,7 +164,10 @@ const handleCurrentChange = (val) => {
 
 async function getTranTypes(){
 	try {
-		  const res = await getErpCategoryList();
+		 const params = {
+			 categoryType: searchForm.transactionType,
+		 }
+		  const res = await getErpCategoryList(params);
 		  tranTypes.value = res || [];
 	} catch (error) {
 	  console.error('获取数据失败:', error);
diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/ErpCategoryController.java b/src/main/java/com/mini/mybigscreen/biz/controller/ErpCategoryController.java
index 206c4c0..219631d 100644
--- a/src/main/java/com/mini/mybigscreen/biz/controller/ErpCategoryController.java
+++ b/src/main/java/com/mini/mybigscreen/biz/controller/ErpCategoryController.java
@@ -1,5 +1,7 @@
 package com.mini.mybigscreen.biz.controller;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mini.mybigscreen.Model.Result;
 import com.mini.mybigscreen.biz.domain.ErpCategory;
 import com.mini.mybigscreen.biz.service.ErpCategoryService;
@@ -27,7 +29,10 @@ public class ErpCategoryController {
     private ErpCategoryService categoryService;
 
     @GetMapping("list")
-    public Result<List<ErpCategory>> getList() {
-        return Result.success(categoryService.list());
+    public Result<List<ErpCategory>> getList(String categoryType) {
+        QueryWrapper<ErpCategory> query = new QueryWrapper<>();
+        query.eq(StrUtil.isNotBlank(categoryType), "category_type", categoryType)
+                .orderByDesc("create_time");
+        return Result.success(categoryService.list(query));
     }
 }