feat(mis-web): 管理系统的租户管理和平台管理中的账户列表新增拥有者姓名或 id 搜索项 (#1052)

在管理系统的租户管理和平台管理中的账户列表新增拥有者姓名或 id 搜索项。这一块是前端搜索不需要改接口 ![image](https://github.com/PKUHPC/SCOW/assets/140392039/45661bbf-ed79-4119-b370-425b485fe5d1)
PKUHPC · Jan 5, 2024 · 5144723 · 5144723
1 parent abb7e84
commit 5144723
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/.changeset/sixty-pugs-run.md b/.changeset/sixty-pugs-run.md
@@ -0,0 +1,5 @@
+---
+"@scow/mis-web": patch
+---
+
+管理系统的租户管理和平台管理中的账户列表新增拥有者姓名或 id 搜索项
diff --git a/apps/mis-web/src/i18n/en.ts b/apps/mis-web/src/i18n/en.ts
@@ -223,6 +223,7 @@ export default {
         account: "Account",
         accountName: "Account Name",
         owner: "Owner",
+        ownerIdOrName: "Owner ID or Name",
         tenant: "Tenant",
         comment: "Comment",
         status: "Status",

diff --git a/apps/mis-web/src/i18n/zh_cn.ts b/apps/mis-web/src/i18n/zh_cn.ts
@@ -223,6 +223,7 @@ export default {
         account:"账户",
         accountName:"账户名",
         owner:"拥有者",
+        ownerIdOrName: "拥有者ID或姓名",
         tenant:"租户",
         comment:"备注",
         status:"状态",

diff --git a/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx b/apps/mis-web/src/pageComponents/accounts/AccountTable.tsx
@@ -37,6 +37,7 @@ interface Props {
 
 interface FilterForm {
   accountName: string | undefined;
+  ownerIdOrName: string | undefined;
 }
 
 const filteredStatuses = {
@@ -65,15 +66,18 @@ export const AccountTable: React.FC<Props> = ({
 
   const [query, setQuery] = useState<FilterForm>({
     accountName: undefined,
+    ownerIdOrName: undefined,
   });
 
   const filteredData = useMemo(() => data ? data.results.filter((x) => (
     (!query.accountName || x.accountName.includes(query.accountName))
+      && (!query.ownerIdOrName || x.ownerId.includes(query.ownerIdOrName) || x.ownerName.includes(query.ownerIdOrName))
       && (rangeSearchStatus === "ALL" || (rangeSearchStatus === "BLOCKED" ? x.blocked : !x.balance.positive))
   )) : undefined, [data, query, rangeSearchStatus]);
 
   const searchData = useMemo(() => data ? data.results.filter((x) => (
-    !query.accountName || x.accountName.includes(query.accountName)
+    (!query.accountName || x.accountName.includes(query.accountName))
+      && (!query.ownerIdOrName || x.ownerId.includes(query.ownerIdOrName) || x.ownerName.includes(query.ownerIdOrName))
   )) : undefined, [data, query]);
 
   const usersStatusCount = useMemo(() => {
@@ -154,6 +158,9 @@ export const AccountTable: React.FC<Props> = ({
           <Form.Item label={t(p("account"))} name="accountName">
             <Input />
           </Form.Item>
+          <Form.Item label={t(p("ownerIdOrName"))} name="ownerIdOrName">
+            <Input />
+          </Form.Item>
           <Form.Item>
             <Button type="primary" htmlType="submit">{t(pCommon("search"))}</Button>
           </Form.Item>