feats

src/pages/login/style.less

@@ -22,8 +22,9 @@
   .login-card {
     width: 900px;
     height: 600px;
-    border-radius: 4px;
+    border-radius: 8px;
     overflow: hidden;
+    backdrop-filter: blur(6px);
     box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.2);
     
     display: grid;
@@ -31,10 +32,10 @@
   }
 
   .login-card-left {
-    background: rgba(255, 255, 255, 0.9);
+    background: rgba(255, 255, 255, 0.45);
   }
   .login-card-right {
-    background: #EFF6FA;
+    // background: #EFF6FA;
   }
 
   .login-form-box {

src/pages/position/edit/index.jsx

@@ -2,30 +2,9 @@ import React, { useRef, useEffect, useState } from 'react';
 import { Button, Card, Form, Input, Select } from 'antd';
 import useBool from '@/utils/hooks/useBool';
 import { getSysPosition, postSysPosition, putSysPosition, getSysPositionById } from "@/service/sysposition";
+import { getSysOrg } from '@/service/sysorg';
 import { useSearchParams, useNavigate } from 'react-router-dom';
-
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 8 },
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 16 },
-  },
-};
-const tailFormItemLayout = {
-  wrapperCol: {
-    xs: {
-      span: 24,
-      offset: 0,
-    },
-    sm: {
-      span: 16,
-      offset: 8,
-    },
-  },
-};
+import { formItemLayout, tailFormItemLayout } from '@/utils/form';
 
 const { Option } = Select;
 export default (props) => {
@@ -37,7 +16,8 @@ export default (props) => {
   const actionRef = useRef();
   const [searchParams, setSearchParams] = useSearchParams();
   const id = searchParams.get("id");
-  const [sysPositionList, setSysPositionList] = useState([]);
+  const [positionList, setPositionList] = useState([]);
+  const [orgList, setOrgList] = useState([]);
 
   useEffect(() => {
     if (id) {
@@ -49,8 +29,10 @@ export default (props) => {
 
   useEffect(() => {
     getSysPosition({ pageSize: 999 }).then((res) => {
-      console.log('res', res.records);
-      setSysPositionList(res.records);
+      setPositionList(res.records || []);
+    })
+    getSysOrg({ pageSize: 999 }).then((res) => {
+      setOrgList(res.records || []);
     })
   }, [])
 
@@ -75,10 +57,6 @@ export default (props) => {
     }
   }
 
-
-  console.log('tiantian', sysPositionList);
-
-
   return (
     <Card loading={loading}>
       <Form onFinish={onFinish} form={form} {...formItemLayout} scrollToFirstError style={{ maxWidth: '1000px' }}>
@@ -92,16 +70,22 @@ export default (props) => {
           name="positionPId"
           label="上级岗位"
         >
-          <Input />
+          <Select allowClear>
+            {positionList.map((item) => (
+              <Option value={item.positionId} key={item.positionId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           name="orgId"
           label="所属单位"
         >
           <Select allowClear>
-            {sysPositionList.map((item) => (
-              <Option value={item.positionId} key={item.positionId}>
-                {item.orgId}
+            {orgList.map((item) => (
+              <Option value={item.orgId} key={item.orgId}>
+                {item.name}
               </Option>
             ))}
           </Select>

src/pages/position/list/index.jsx

@@ -1,11 +1,13 @@
 import React from "react";
 import { useNavigate } from "react-router-dom";
-import { queryTable } from "@/utils/request";
+import { queryTable, queryDict } from "@/utils/request";
 import { ProTable } from "@ant-design/pro-components";
 import { Button, message, Popconfirm } from "antd";
 import { getSysPosition, deleteSysPosition } from "@/service/sysposition";
+import { getSysOrg } from "@/service/sysorg";
 
 const querySysPositionList = queryTable(getSysPosition);
+const queryOrg = queryDict(getSysOrg, {labelKey: 'name', valueKey: 'orgId'})
 
 export default (props) => {
   const actionRef = React.useRef();
@@ -39,6 +41,8 @@ export default (props) => {
     {
       title: "所属单位",
       dataIndex: "orgId",
+      valueType: 'select',
+      request: queryOrg,
     },
 
     {

src/pages/user/Edit.jsx

@@ -5,31 +5,11 @@ import { getSysRole } from '@/service/sysrole';
 import { postSysUser, getSysUserById } from '@/service/sysuser';
 import { useSearchParams, useNavigate } from 'react-router-dom';
 import Page from '@/components/Page';
+import {formItemLayout, tailFormItemLayout} from '@/utils/form';
+import { getSysOrg } from '@/service/sysorg';
+import { getSysPosition } from '@/service/sysposition';
 import Account from './Account';
 
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 8 },
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 16 },
-  },
-};
-const tailFormItemLayout = {
-  wrapperCol: {
-    xs: {
-      span: 24,
-      offset: 0,
-    },
-    sm: {
-      span: 16,
-      offset: 8,
-    },
-  },
-};
-
 const { Option } = Select;
 
 export default (props) => {
@@ -37,6 +17,9 @@ export default (props) => {
   const [submiting, startSubmit, cancelSubmit] = useBool();
   const [open, setShow, setHidden] = useBool(false);
   const [roleList, setRoleList] = React.useState([]);
+  const [orgList, setOrgList] = React.useState([]);
+  const [org, setOrg] = React.useState();
+  const [posList, setPosList] = React.useState([]);
   const [searchParams] = useSearchParams();
   const [form] = Form.useForm();
   const [user, setUser] = React.useState();
@@ -61,13 +44,21 @@ export default (props) => {
   }
 
   React.useEffect(() => {
-    getSysRole({ pageSize: 500 }).then(res => setRoleList(res.records));
+    getSysRole({ pageSize: 500 }).then(res => setRoleList(res.records || []));
+    getSysOrg({ pageSize: 500 }).then(res => setOrgList(res.records || []));
   }, []);
+
+  React.useEffect(() => {
+    if (org) {
+      getSysPosition({orgId: org, pageSize: 500}).then(res => setPosList(res.records || []));
+    }
+  }, [org])
   
   React.useEffect(() => {
     if (id) {
       startLoading();
       getSysUserById(id).then(res => {
+        setOrg(res.orgId);
         setUser(res);
         form.setFieldsValue({
           ...res,
@@ -114,13 +105,25 @@ export default (props) => {
             name="orgId"
             label="单位"
           >
-            <Input />
+            <Select onChange={setOrg}>
+              {
+                orgList.map(x => (
+                  <Option key={x.orgId}>{x.name}</Option>
+                ))
+              }
+            </Select>
           </Form.Item>
           <Form.Item
             name="positionId"
             label="岗位"
           >
-            <Input />
+            <Select>
+              {
+                posList.map(x => (
+                  <Option key={x.positionId}>{x.name}</Option>
+                ))
+              }
+            </Select>
           </Form.Item>
           <Form.Item
             name="rolesList"

src/pages/user/index.jsx

@@ -1,12 +1,16 @@
 import React from "react";
 import { useNavigate } from "react-router-dom";
-import { queryTable } from "@/utils/request";
+import { queryTable, queryDict } from "@/utils/request";
 import { ProTable } from "@ant-design/pro-components";
 import Page from "@/components/Page";
 import { Button, message, Popconfirm } from "antd";
 import { getSysUser, updateUserStatus, deleteSysUser } from "@/service/sysuser";
+import { getSysOrg } from "@/service/sysorg";
+import { getSysPosition } from "@/service/sysposition";
 
 const queryUserList = queryTable(getSysUser);
+const queryOrg = queryDict(getSysOrg, {labelKey: 'name', valueKey: 'orgId'});
+const queryPosition = queryDict(getSysPosition, {labelKey: 'name', valueKey: 'positionId'})
 
 export default (props) => {
   const actionRef = React.useRef();
@@ -36,6 +40,8 @@ export default (props) => {
     {
       title: "单位",
       dataIndex: "orgId",
+      valueType: 'select',
+      request: queryOrg,
     },
     {
       title: "姓名",
@@ -48,6 +54,8 @@ export default (props) => {
     {
       title: "岗位",
       dataIndex: "positionId",
+      valueType: 'select',
+      request: queryPosition,
     },
     {
       title: "状态",

src/utils/request.js

@@ -19,8 +19,6 @@ instance.interceptors.request.use(function (config) {
     noTip = method.toLocaleLowerCase() === 'get' ? true : false;
   }
 
-  console.log('---------------')
-
   // 在发送请求之前做些什么
   return {
     ...config,
@@ -105,8 +103,8 @@ export function queryTable (apiRequest) {
   };
 }
 
-export function queryDict (apiRequest) {
-  return function (params, labelKey = 'name', valueKey = 'id') {
+export function queryDict (apiRequest, {labelKey = 'name', valueKey = 'id'}) {
+  return function (params) {
     const { current, pageSize, ...leftParams } = params || {};
     return apiRequest({
       pageSize: 9999,