From 836806a12c769b7b6eaf0b1d5817670a6b4eb06f Mon Sep 17 00:00:00 2001 From: wang_yp <357754663@qq.com> Date: Mon, 23 Sep 2024 17:35:20 +0800 Subject: [PATCH] fix(api):update store --- src/components/b_table.tsx | 24 ++-- src/components/form/interface.ts | 8 ++ src/components/form/select.tsx | 14 ++- src/components/layout/layout.tsx | 21 ++-- src/pages/login/login.tsx | 5 +- src/pages/materialMgmt/index.tsx | 21 +++- src/pages/materialMgmt/material.tsx | 127 ++++++++++++++++++++ src/pages/materialMgmt/materialCat.tsx | 127 ++++++++++++++++++++ src/pages/materialMgmt/material_column.tsx | 89 ++++++++++++++ src/pages/materialMgmt/mcat_column.tsx | 38 ++++++ src/pages/persMgmt/index.tsx | 132 +++++++++++++++++++-- src/pages/persMgmt/pers_column.tsx | 30 +++++ src/pages/storage/index.tsx | 130 ++++++++++++++++++++ src/pages/storage/storage_column.tsx | 41 +++++++ src/pages/teamMgmt/index.tsx | 132 +++++++++++++++++++-- src/pages/teamMgmt/team_column.tsx | 30 +++++ src/pages/whseMgmt/index.tsx | 20 +++- src/pages/whseMgmt/whseMgmt_route.tsx | 11 ++ src/router/routers/home_router.tsx | 20 +++- src/service/base.ts | 1 + src/store/baseStore.ts | 15 +-- src/store/index.ts | 12 +- src/store/materialCat.ts | 19 +++ src/store/materialStore.ts | 20 ++++ src/store/persMgmt.ts | 19 +++ src/store/storage.ts | 19 +++ src/store/team.ts | 19 +++ 27 files changed, 1087 insertions(+), 57 deletions(-) create mode 100644 src/pages/materialMgmt/material.tsx create mode 100644 src/pages/materialMgmt/materialCat.tsx create mode 100644 src/pages/materialMgmt/material_column.tsx create mode 100644 src/pages/materialMgmt/mcat_column.tsx create mode 100644 src/pages/persMgmt/pers_column.tsx create mode 100644 src/pages/storage/index.tsx create mode 100644 src/pages/storage/storage_column.tsx create mode 100644 src/pages/teamMgmt/team_column.tsx create mode 100644 src/pages/whseMgmt/whseMgmt_route.tsx create mode 100644 src/store/materialCat.ts create mode 100644 src/store/materialStore.ts create mode 100644 src/store/persMgmt.ts create mode 100644 src/store/storage.ts create mode 100644 src/store/team.ts diff --git a/src/components/b_table.tsx b/src/components/b_table.tsx index cc31822..d623646 100644 --- a/src/components/b_table.tsx +++ b/src/components/b_table.tsx @@ -26,24 +26,24 @@ const BTable = (props: any) => { return ( <> -
- -
+
+ +
); }; diff --git a/src/components/form/interface.ts b/src/components/form/interface.ts index f0b4199..518a7cd 100644 --- a/src/components/form/interface.ts +++ b/src/components/form/interface.ts @@ -10,12 +10,14 @@ export enum FormType { cehckbox = "checkbox", password = "password", } + export interface FormDatas { type: string, label: string, name: string, value: any, selectUrl?: string, + selectList?: Array rules: Array } @@ -36,4 +38,10 @@ export interface SimpleFormData { export interface rules { required: boolean, message: string, +} + + +export interface selectItem { + name: string, + id: number, } \ No newline at end of file diff --git a/src/components/form/select.tsx b/src/components/form/select.tsx index 7fa49de..bfbe779 100644 --- a/src/components/form/select.tsx +++ b/src/components/form/select.tsx @@ -4,21 +4,23 @@ import { useEffect, useState } from "react"; import baseHttp from "@/service/base"; const { Option } = Select; export const FormSelect = (v: FormDatas) => { - const [list, setList] = useState([]); + const [list, setList] = useState([]); useEffect(() => { - baseHttp - .get(`${v.selectUrl}/?size=100&offset=1` ?? "", "") - .then((res) => { + if (v.selectList && v.selectList.length > 0) { + setList(v.selectList); + } else { + baseHttp.get(`${v.selectUrl}/?size=50&offset=1` ?? "", "").then((res) => { setList(res.data.record ?? []); }); - }, [v.selectUrl]); + } + }, [v.selectUrl, v.selectList]); return (