Merge branch 'master' of http://git.ycjcjy.com/civilized_city/pc-admin

src/pages/check/components/QuForm.jsx

@@ -0,0 +1,198 @@
+import React from 'react';
+import {
+  DrawerForm,
+  ProFormText,
+  ProFormSelect,
+  ProFormDigit,
+  ProFormList
+} from '@ant-design/pro-components';
+import { Form, Row, Col } from 'antd';
+import WangEditor from '@/components/Wangeditor';
+import { postTaCheckItemQu } from '@/service/tdlocquestion';
+
+export default (props) => {
+  const {open, onOpenChange, quInfo, itemId, onChange} = props;
+  const [form] = Form.useForm();
+  
+  const onFinish = async (values) => {
+    const data = {
+      ...(quInfo || {}),
+      ...values,
+      itemId,
+    }
+
+    const res = await postTaCheckItemQu(data).then(x => x);
+
+    onChange(res);
+    return true;
+  }
+
+  React.useEffect(() => {
+    if (quInfo) {
+      form.setFieldsValue(quInfo);
+    } else {
+      form.resetFields();
+    }
+  }, [quInfo]);
+
+  return (
+    <DrawerForm
+      title="问题维护"
+      open={open}
+      width={800}
+      form={form}
+      destroyOnClose
+      onFinish={onFinish}
+      onOpenChange={onOpenChange}
+    >
+      <Row gutter={24}>
+        <Col span={6}>
+          <ProFormText
+            name="sortNo"
+            label="序号"
+            placeholder="请填写"
+            rules={[
+              {
+                required: true,
+                message: '请填写序号',
+              },
+            ]}
+          />
+        </Col>
+        <Col span={18}>
+          <ProFormText
+            name="title"
+            label="题干描述"
+            placeholder="请填写"
+            rules={[
+              {
+                required: true,
+                message: '请填写题干',
+              },
+            ]}
+          />
+        </Col>
+      </Row>
+      <Row gutter={24}>
+        <Col span={12}>
+          <ProFormSelect
+            name="quType"
+            label="问题类型"
+            fieldProps={{
+              style: { width: '100%' }
+            }}
+            valueEnum={{
+              radio: '单选',
+              fill: '填空'
+            }}
+            rules={[
+              {
+                required: true,
+                message: '请选择问题类型',
+              },
+            ]}
+          />
+        </Col>
+        <Col span={12}>
+          <ProFormSelect
+            name="computeType"
+            label="计分方式"
+            fieldProps={{
+              style: { width: '100%' }
+            }}
+            valueEnum={{
+              '+': '得分',
+              '-': '扣分'
+            }}
+            rules={[
+              {
+                required: true,
+                message: '请选择计分方式',
+              },
+            ]}
+          />
+        </Col>
+      </Row>
+      <Row gutter={24}>
+        <Col span={12}>
+          <ProFormDigit
+            name="maxScore"
+            label="最 高 分"
+            min={0}
+            fieldProps={{ precision: 2 }}
+            rules={[
+              {
+                required: true,
+                message: '请设置最高分',
+              },
+            ]}
+          />
+        </Col>
+        <Col span={12}>
+          <ProFormDigit
+            name="anScore"
+            label="单项计分"
+            min={0}
+            fieldProps={{ precision: 2 }}
+            rules={[
+              {
+                required: true,
+                message: '请设置单项计分',
+              },
+            ]}
+          />
+        </Col>
+      </Row>
+      <Form.Item name="stand" label="评分标准">
+        <WangEditor
+          height="200px"
+          toolbarConfig={{
+            toolbarKeys: [
+              'headerSelect',
+              'blockquote',
+              '|',
+              'bold',
+              'underline',
+              'italic',
+              'color',
+              'fontSize',
+              '|',
+              'bulletedList',
+              'numberedList',
+            ]
+          }}
+        />
+      </Form.Item>
+      <ProFormList
+        name="answerList"
+        label="选项列表"
+        copyIconProps={false}
+      >
+        <Row gutter={24} style={{width: '730px'}}>
+          <Col span={6}>
+            <ProFormText
+              name="answerCode"
+              label="选项"
+              help="类似 A, B, C, D"
+            />
+          </Col>
+          <Col span={6}>
+            <ProFormDigit
+              name="score"
+              label="计分"
+              min={0}
+              fieldProps={{ precision: 2 }}
+            />
+          </Col>
+          <Col span={12}>
+            <ProFormText
+              name="answer"
+              label="答案"
+              placeholder="具体选项内容"
+            />
+          </Col>
+        </Row>
+      </ProFormList>
+    </DrawerForm>
+  )
+}

src/pages/check/components/QuManage.jsx

@@ -1,24 +1,31 @@
 import React from 'react';
-import { Button, Form, Row, Col, Card, Input, Modal, List } from 'antd';
-import {
-  DrawerForm,
-  ProFormGroup,
-  ProFormText,
-  ProFormSelect,
-  ProFormDigit,
-  ProFormList
-} from '@ant-design/pro-components';
-import WangEditor from '@/components/Wangeditor';
+import { Button, Form, Row, Col, Card, List, Popconfirm } from 'antd';
+import QuForm from './QuForm';
 import { postTaCheckItemQu, getTaCheckItemQu } from '@/service/tdlocquestion';
-import { getTaCheckItemAn } from '@/service/tacheckiteman';
+import { deleteTaCheckItemQu } from '@/service/tacheckitemqu';
+import { message } from 'antd';
 
 const QuItem = (props) => {
-   const { qu, onEdit } = props;
+  const { qu, onEdit, onDelete } = props;
 
-   const quTitle = `${qu?.sortNo}. [${qu?.quType == 'fill' ? '填空' : '选择'}] ${qu?.title} (分值: ${qu?.computeType} ${qu?.anScore}/${qu?.maxScore})`
+  const quTitle = `${qu?.sortNo}. [${qu?.quType == 'fill' ? '填空' : '选择'}] ${qu?.title} (分值: ${qu?.computeType} ${qu?.anScore}/${qu?.maxScore})`
 
   return (
-    <Card title={quTitle} extra={<Button type='link' onClick={onEdit}>修改</Button>} style={{marginTop: '24px'}}>
+    <Card
+      title={quTitle} 
+      style={{marginTop: '24px'}}
+      extra={(
+        <>
+          <Button type='link' onClick={onEdit}>修改</Button>
+          <Popconfirm
+            title="确认进行删除操作?"
+            onConfirm={onDelete}
+          >
+            <Button type='link' danger >删除</Button>
+          </Popconfirm>
+        </>
+      )} 
+    >
       <Card.Meta
         title={
           qu?.quType != 'fill' ?
@@ -56,13 +63,8 @@ export default React.forwardRef((props, ref) => {
   const [open, setOpen] = React.useState(false);
   const [quInfo, setQuInfo] = React.useState(false);
   const [list, setList] = React.useState([]);
-  // const [anList, setAnList] = React.useState([]);
-  const [form] = Form.useForm();
-
-  const onFinish = async (values) => {
-    const data = { ...(quInfo || {}), ...values, itemId }
-    const res = await postTaCheckItemQu(data);
 
+  const onFinish = (res) => {
     let found = false;
     const newList = list.map(item => {
       if (item.quId === res.quId) {
@@ -78,9 +80,6 @@ export default React.forwardRef((props, ref) => {
     }
 
     setList(list);
-    onChange(res);
-
-    return true;
   }
 
   const onEditQu = (qu) => {
@@ -88,11 +87,15 @@ export default React.forwardRef((props, ref) => {
     setOpen(true);
   }
 
-  React.useEffect(() => {
-    if (quInfo) {
-      form.setFieldsValue(quInfo);
+  const onDeleteQu = (qu) => {
+    if (qu?.quId) {
+      deleteTaCheckItemQu(qu.quId).then(() => {
+        setList(list.filter(x => x.quId !== qu.quId));
+      })
+    } else {
+      setList(list.filter(x => x.quId !== qu.quId));
     }
-  }, [quInfo]);
+  }
 
   React.useEffect(() => {
     if (itemId) {
@@ -103,149 +106,26 @@ export default React.forwardRef((props, ref) => {
   }, [itemId]);
 
   React.useImperativeHandle(ref, () => ({
-    add: () => setOpen(true),
+    add: () => {
+      setQuInfo();
+      setOpen(true);
+    },
   }), []);
 
   return (
-    <div>
-      <DrawerForm title="问题维护" open={open} width={800} form={form} onFinish={onFinish} onOpenChange={setOpen}>
-        <ProFormText
-          name="title"
-          label="题干描述"
-          placeholder="请填写"
-          rules={[
-            {
-              required: true,
-              message: '请填写题干',
-            },
-          ]}
-        />
-        <Row gutter={24}>
-          <Col span={12}>
-            <ProFormSelect
-              name="quType"
-              label="问题类型"
-              fieldProps={{
-                style: { width: '100%' }
-              }}
-              valueEnum={{
-                radio: '单选',
-                fill: '填空'
-              }}
-              rules={[
-                {
-                  required: true,
-                  message: '请选择问题类型',
-                },
-              ]}
-            />
-          </Col>
-          <Col span={12}>
-            <ProFormSelect
-              name="computeType"
-              label="计分方式"
-              fieldProps={{
-                style: { width: '100%' }
-              }}
-              valueEnum={{
-                '+': '得分',
-                '-': '扣分'
-              }}
-              rules={[
-                {
-                  required: true,
-                  message: '请选择计分方式',
-                },
-              ]}
-            />
-          </Col>
-        </Row>
-        <Row gutter={24}>
-          <Col span={12}>
-            <ProFormDigit
-              name="maxScore"
-              label="最 高 分"
-              min={0}
-              fieldProps={{ precision: 2 }}
-              rules={[
-                {
-                  required: true,
-                  message: '请设置最高分',
-                },
-              ]}
-            />
-          </Col>
-          <Col span={12}>
-            <ProFormDigit
-              name="anScore"
-              label="单项计分"
-              min={0}
-              fieldProps={{ precision: 2 }}
-              rules={[
-                {
-                  required: true,
-                  message: '请设置单项计分',
-                },
-              ]}
-            />
-          </Col>
-        </Row>
-        <Form.Item name="stand" label="评分标准">
-          <WangEditor
-            height="200px"
-            toolbarConfig={{
-              toolbarKeys: [
-                'headerSelect',
-                'blockquote',
-                '|',
-                'bold',
-                'underline',
-                'italic',
-                'color',
-                'fontSize',
-                '|',
-                'bulletedList',
-                'numberedList',
-              ]
-            }}
-          />
-        </Form.Item>
-        <ProFormList
-          name="answerList"
-          label="选项列表"
-          copyIconProps={false}
-        >
-          <Row gutter={24} style={{width: '730px'}}>
-            <Col span={6}>
-              <ProFormText
-                name="answerCode"
-                label="选项"
-                help="类似 A, B, C, D"
-              />
-            </Col>
-            <Col span={6}>
-              <ProFormDigit
-                name="score"
-                label="计分"
-                min={0}
-                fieldProps={{ precision: 2 }}
-              />
-            </Col>
-            <Col span={12}>
-              <ProFormText
-                name="answer"
-                label="答案"
-                placeholder="具体选项内容"
-              />
-            </Col>
-          </Row>
-        </ProFormList>
-      </DrawerForm>
+    <>
+      <QuForm itemId={itemId} quInfo={quInfo} open={open} onOpenChange={setOpen} onChange={onFinish} />
       <List
         itemLayout="horizontal"
         dataSource={list}
-        renderItem={(item) => <QuItem qu={item} onEdit={() => onEditQu(item)}/>}
+        renderItem={(item) => (
+          <QuItem
+            qu={item}
+            onEdit={() => onEditQu(item)}
+            onDelete={() => onDeleteQu(item)}
+          />
+        )}
       />
-    </div>
+    </>
   )
 });

src/pages/locType/edit/index.jsx

@@ -46,8 +46,6 @@ export default (props) => {
     }
   }, [id]);
 
-  console.log('id', id);
-
   const onFinish = (values) => {
     startSubmit();
     console.log('locType修改id', id);

src/pages/locType/list/index.jsx

@@ -32,10 +32,6 @@ export default (props) => {
   };
 
   const columns = [
-    {
-      title: "分类ID",
-      dataIndex: "typeId",
-    },
     {
       title: "分类名称",
       dataIndex: "name",
@@ -44,10 +40,6 @@ export default (props) => {
       title: "分类描述",
       dataIndex: "desc",
     },
-    {
-      title: "排序",
-      dataIndex: "sortNo",
-    },
     {
       title: "状态",
       dataIndex: "status",
@@ -67,16 +59,6 @@ export default (props) => {
       valueType: "option",
       width: 200,
       render: (_, record) => [
-        // <Button
-        //   key={1}
-        //   style={{ padding: 0 }}
-        //   type="link"
-        //   onClick={() => {
-        //     updateStatus(record);
-        //   }}
-        // >
-        //   {record.status === 1 ? "禁用" : "启用"}
-        // </Button>,
         <Button
           key={2}
           style={{ padding: 0 }}

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/org/components/Form.jsx

@@ -0,0 +1,98 @@
+import React from 'react';
+import { Button, Card, Form, Input, Select } from 'antd';
+import useBool from '@/utils/hooks/useBool';
+import { postSysOrg, putSysOrg, getSysOrgById } from "@/service/sysorg";
+import { formItemLayout, tailFormItemLayout } from '@/utils/form';
+
+export default (props) => {
+  const { org, list, parentId, onChange } = props;
+
+  const [submiting, startSubmit, cancelSubmit] = useBool();
+  const [form] = Form.useForm();
+  
+  const onFinish = (values) => {
+    startSubmit();
+    if (org?.orgId) {
+      // 修改
+      putSysOrg(org.orgId, values).then((res) => {
+        cancelSubmit();
+        onChange(res);
+      }).catch(() => {
+        cancelSubmit();
+      });
+    } else {
+      // 新增
+      postSysOrg(values).then((res) => {
+        cancelSubmit();
+        onChange(res);
+      }).catch(() => {
+        cancelSubmit();
+      });
+    }
+  }
+
+  React.useEffect(() => {
+    if (org) {
+      form.setFieldsValue(org);
+    } else {
+      form.resetFields();
+      form.setFieldValue('orgPId', parentId);
+    }
+
+    console.log(org, parentId);
+  }, [org, parentId]);
+
+  return (
+    <Form onFinish={onFinish} form={form} {...formItemLayout} style={{width: '800px'}}>
+      <Form.Item
+        name="name"
+        label="机构名称"
+        rules={[
+          {required: true, message: '请填写机构名称'}
+        ]}
+      >
+        <Input />
+      </Form.Item>
+      <Form.Item
+        name="orgPId"
+        label="上级单位"
+      >
+        <Select>
+          {
+            (list || []).map(x => (
+              <Select.Option key={x.orgId}>
+                {x.name}
+              </Select.Option>
+            ))
+          }
+        </Select>
+      </Form.Item>
+
+      <Form.Item
+        name="sortNo"
+        label="排序"
+      >
+        <Input />
+      </Form.Item>
+
+
+      <Form.Item
+        name="status"
+        label="状态"
+      >
+        <Select
+          style={{ width: '100%' }}
+          placeholder="请选择状态"
+        >
+          <Option value={0}>不正常</Option>
+          <Option value={1}>正常</Option>
+        </Select>
+      </Form.Item>
+      <Form.Item {...tailFormItemLayout}>
+        <Button loading={submiting} type="primary" htmlType="submit">
+          保存
+        </Button>
+      </Form.Item>
+    </Form>
+  )
+}

src/pages/org/edit/index.jsx

@@ -1,131 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Button, Card, Form, Input, Select } from 'antd';
-import useBool from '@/utils/hooks/useBool';
-import { postSysOrg, putSysOrg, getSysOrgById } 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,
-    },
-  },
-};
-
-const { Option } = Select;
-
-export default (props) => {
-
-  const [loading, startLoading, cancelLoading] = useBool();
-  const [submiting, startSubmit, cancelSubmit] = useBool();
-  const [form] = Form.useForm();
-  const navigate = useNavigate();
-  const [searchParams, setSearchParams] = useSearchParams();
-  const id = searchParams.get("id");
-
-  useEffect(() => {
-    if (id) {
-      getSysOrgById(id).then((res) => {
-        form.setFieldsValue(res);
-        // setDate(res);
-      });
-    }
-  }, [id]);
-
-  const onFinish = (values) => {
-    startSubmit();
-    if (id) {
-      // 修改
-      putSysOrg(id, values).then((res) => {
-        navigate(-1);
-      }).catch(() => {
-        cancelSubmit();
-      });
-    } else {
-      // 新增
-      postSysOrg(values).then((res) => {
-        navigate(-1);
-      }).catch(() => {
-        cancelSubmit();
-      });
-    }
-  }
-
-
-  return (
-    <Card loading={loading}>
-      <Form onFinish={onFinish} form={form} {...formItemLayout} scrollToFirstError style={{ maxWidth: '1000px' }}>
-        <Form.Item
-          name="orgCode"
-          label="机构编码"
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          name="name"
-          label="机构名称"
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          name="orgPId"
-          label="上级单位"
-        >
-          <Input />
-        </Form.Item>
-
-        <Form.Item
-          name="sortNo"
-          label="排序"
-        >
-          <Input />
-        </Form.Item>
-
-
-        <Form.Item
-          name="status"
-          label="状态"
-        >
-          <Select
-            style={{ width: '100%' }}
-            placeholder="请选择状态"
-          >
-            <Option key={0}>不正常</Option>
-            <Option key={1}>正常</Option>
-          </Select>
-        </Form.Item>
-        <Form.Item
-          name="createUser"
-          label="创建人"
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item {...tailFormItemLayout}>
-          <Button loading={submiting} type="primary" htmlType="submit">
-            保存
-          </Button>
-          <Button style={{ marginLeft: '2em' }} onClick={() => navigate(-1)}>
-            返回
-          </Button>
-        </Form.Item>
-      </Form>
-    </Card>
-  )
-}
-
-

src/pages/org/index.jsx

@@ -0,0 +1,116 @@
+import React from 'react';
+import {
+  PlusOutlined,
+  DeleteOutlined,
+} from '@ant-design/icons';
+import { Button, Card, Row, Col, Tree, Tooltip, Popconfirm } from "antd";
+import Page from '@/components/Page';
+import { getSysOrg, deleteSysOrg } from "@/service/sysorg";
+import { arr2Tree } from '@/utils/array';
+import useBool from '@/utils/hooks/useBool';
+import Form from './components/Form';
+
+export default (props) => {
+
+  const [loading, startLoading, stopLoading] = useBool();
+  const [list, setList] = React.useState([]);
+  const [current, setCurrernt] = React.useState();
+  const [parentId, setParentId] = React.useState('-1');
+
+  const [parentList, treeData] = React.useMemo(() => {
+    const plist = [{orgId: '-1', name: '根节点'}].concat(list);
+    const [tree] = arr2Tree((list || []).map(x => ({
+      title: x.name,
+      key: x.orgId,
+      parentId: x.orgPId,
+      raw: x,
+    })));
+
+    return [plist, tree];
+  }, [list])
+
+  const changeCurrent = (org) => {
+    setCurrernt(org);
+    setParentId(org?.orgPId || '-1');
+  }
+
+  const onSelect = (selectedKeys, e) => {
+    changeCurrent(e.node.raw)
+  }
+
+  const onClick = (org) => {
+    changeCurrent(org);
+  }
+
+  const onAdd = (parent = '-1') => {
+    setParentId(parent);
+    setCurrernt();
+  }
+
+  const onDelete = (org) => {
+    deleteSysOrg(org.orgId).then(() => {
+      setList(list.filter(x => x.orgId !== org.orgId))
+    });
+  }
+
+  const queryList = React.useCallback(() => {
+    getSysOrg({pageSize: 500}).then(res => {
+      setList(res.records || []);
+      changeCurrent();
+    });
+  }, []);
+
+  const onFormChange = () => {
+    // 重新查一次数据
+    queryList();
+  }
+
+  React.useEffect(() => {
+    queryList();
+  }, []);
+
+  return (
+    <Page>
+      <Row gutter={24}>
+        <Col span={8}>
+          <Card
+            title="单位"
+            onSelect={onSelect}
+            extra={<Button type='link' onClick={() => onAdd()}>新增</Button>}
+          >
+            <Tree
+              blockNode
+              treeData={treeData}
+              // onSelect={onSelect}
+              titleRender={(node) => (
+                <div style={{display: 'flex'}} onClick={e => e.stopPropagation()}>
+                  <div style={{lineHeight: '32px', flex: 1}} onClick={() => onClick(node.raw)}>
+                    {node.title}
+                  </div>
+                  <div style={{width: '80px', flex: 'none'}}>
+                    <Tooltip title="新增子节点">
+                      <Button type='link' icon={<PlusOutlined />} onClick={() => onAdd(node.raw.orgId)}></Button>
+                    </Tooltip>
+                    <Tooltip title="删除节点">
+                      <Popconfirm
+                        title="确认进行删除操作?"
+                        onConfirm={() => onDelete(node.raw)}
+                      >
+                        <Button type='link' danger icon={<DeleteOutlined />}></Button>
+                      </Popconfirm>
+                    </Tooltip>
+                  </div>
+                </div>
+              )}
+            />
+          </Card>
+        </Col>
+        <Col span={16}>
+          <Card>
+            <Form org={current} parentId={parentId} list={parentList} onChange={onFormChange} />
+          </Card>
+        </Col>
+      </Row>
+    </Page>
+  )
+}

src/pages/org/list/index.jsx

@@ -1,137 +0,0 @@
-import React from "react";
-import { useNavigate } from "react-router-dom";
-import { queryTable } from "@/utils/request";
-import { ProTable } from "@ant-design/pro-components";
-import { Button, message, Popconfirm } from "antd";
-import { getSysOrg, deleteSysOrg } from "@/service/sysorg";
-
-const querySysOrgList = queryTable(getSysOrg);
-
-export default (props) => {
-  const actionRef = React.useRef();
-  const navigate = useNavigate();
-
-  // const updateStatus = (user) => {
-  //   const status = user.status === 1 ? 0 : 1;
-  //   const hide = message.loading("请稍候...", 0);
-  //   updateUserStatus(user.id, status)
-  //     .then((res) => {
-  //       hide();
-  //       actionRef.current.reload();
-  //     })
-  //     .catch(() => {
-  //       hide();
-  //     });
-  // };
-  const handleDelete = (id) => {
-    if (id) {
-      deleteSysOrg(id).then((res) => {
-        actionRef.current.reload();
-      });
-    }
-  };
-
-  const columns = [
-    {
-      title: "机构ID",
-      dataIndex: "orgId",
-    },
-    {
-      title: "机构编码",
-      dataIndex: "orgCode",
-    },
-    {
-      title: "机构名称",
-      dataIndex: "name",
-    },
-    {
-      title: "上级单位",
-      dataIndex: "orgPId",
-    },
-
-    {
-      title: "排序",
-      dataIndex: "sortNo",
-    },
-
-    {
-      title: "状态",
-      dataIndex: "status",
-      valueEnum: {
-        1: {
-          text: "正常",
-          status: "Processing",
-        },
-        0: {
-          text: "禁用",
-          status: "Error",
-        },
-      },
-    },
-    {
-      title: "创建人",
-      dataIndex: "createUser",
-    },
-    {
-      title: "操作",
-      valueType: "option",
-      width: 200,
-      render: (_, record) => [
-        // <Button
-        //   key={1}
-        //   style={{ padding: 0 }}
-        //   type="link"
-        //   onClick={() => {
-        //     updateStatus(record);
-        //   }}
-        // >
-        //   {record.status === 1 ? "禁用" : "启用"}
-        // </Button>,
-        <Button
-          key={2}
-          style={{ padding: 0 }}
-          type="link"
-          onClick={() => {
-            console.log(record, "]]");
-            navigate(`/system/org/edit?id=${record.orgId}`);
-          }}
-        >
-          编辑
-        </Button>,
-        <Popconfirm
-          key={3}
-          title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record.orgId)}
-          okText="确定"
-          cancelText="取消"
-        >
-          {/* manualPush */}
-          <Button style={{ padding: 0 }} type="link">
-            删除
-          </Button>
-        </Popconfirm>,
-      ],
-    },
-  ];
-
-  return (
-    <ProTable
-      actionRef={actionRef}
-      rowKey="orgId"
-      search={false}
-      toolBarRender={() => [
-        <Button
-          key="1"
-          type="primary"
-          onClick={() => {
-            navigate("/system/org/edit");
-          }}
-        >
-          新增
-        </Button>,
-      ]}
-      request={querySysOrgList}
-      columns={columns}
-    />
-  );
-};

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>
@@ -120,16 +104,10 @@ export default (props) => {
             style={{ width: '100%' }}
             placeholder="请选择状态"
           >
-            <Option key={0}>不正常</Option>
-            <Option key={1}>正常</Option>
+            <Option value={0}>不正常</Option>
+            <Option value={1}>正常</Option>
           </Select>
         </Form.Item>
-        <Form.Item
-          name="createUser"
-          label="创建人"
-        >
-          <Input />
-        </Form.Item>
         <Form.Item {...tailFormItemLayout}>
           <Button loading={submiting} type="primary" htmlType="submit">
             保存

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();
@@ -32,21 +34,15 @@ export default (props) => {
   };
 
   const columns = [
-    {
-      title: "岗位ID",
-      dataIndex: "positionId",
-    },
     {
       title: "岗位名称",
       dataIndex: "name",
     },
-    {
-      title: "上级岗位",
-      dataIndex: "positionPId",
-    },
     {
       title: "所属单位",
       dataIndex: "orgId",
+      valueType: 'select',
+      request: queryOrg,
     },
 
     {
@@ -67,10 +63,6 @@ export default (props) => {
         },
       },
     },
-    {
-      title: "创建人",
-      dataIndex: "createUser",
-    },
     {
       title: "操作",
       valueType: "option",

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/routes/routes.jsx

@@ -17,13 +17,13 @@ import User from '@/pages/user/index';
 import UserEdit from '@/pages/user/Edit';
 import CheckList from '@/pages/check';
 import CheckEdit from '@/pages/check/Edit';
+import OrgList from "@/pages/org/index";
 
 import Index from '@/pages/index';
 import Home from "@/pages/sample/home";
 import BasicForm from '@/pages/sample/form';
 import BasicTable from '@/pages/sample/table';
-import OrgList from "@/pages/org/list";
-import OrgEdit from "@/pages/org/edit";
+
 import PositionList from "@/pages/position/list";
 import PositionEdit from "@/pages/position/edit";
 import LocTypeList from "@/pages/locType/list";
@@ -88,7 +88,7 @@ export const authRoutes = [
         },
       },
       {
-        path: "org/list",
+        path: "org",
         element: <OrgList />,
         meta: {
           title: '机构管理',
@@ -96,16 +96,6 @@ export const authRoutes = [
           // permission: 'form',
         },
       },
-      {
-        path: "org/edit",
-        element: <OrgEdit />,
-        meta: {
-          hideInMenu: true,
-          title: '机构管理编辑',
-          // icon: <AppstoreOutlined />,
-          // permission: 'form',
-        },
-      },
       {
         path: "position/list",
         element: <PositionList />,

src/utils/hooks/useBool.js

@@ -1,6 +1,6 @@
 import React from "react";
 
-export default function useLoading(initial = false) {
+export default function useBool(initial = false) {
   const [loading, setLoading] = React.useState(initial);
   const loadingRef = React.useRef();
   loadingRef.current = loading;

src/utils/request.js

@@ -103,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,

vite.config.js

@@ -8,7 +8,7 @@ export default defineConfig({
     port: 3000,
     proxy: {
       '/api': {
-        target: 'http://192.168.89.147:9087',
+        target: 'http://localhost:9087',
         changeOrigin: true,
       },
     }