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 /> + + + + + + - - - - - - 查询 @@ -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> getList() { - return Result.success(categoryService.list()); + public Result> getList(String categoryType) { + QueryWrapper query = new QueryWrapper<>(); + query.eq(StrUtil.isNotBlank(categoryType), "category_type", categoryType) + .orderByDesc("create_time"); + return Result.success(categoryService.list(query)); } }