src/components/UserDropdown/index.tsx

@@ -14,7 +14,7 @@ const items: MenuProps['items'] = [
   },
   {
     key: '2',
-    label: <a href="/logout">退出登录</a>,
+    label: <a href="/login">退出登录</a>,
     icon: <LogoutOutlined />,
   },
 ];

src/models/userInfo.ts

@@ -3,7 +3,7 @@ import { useRequest } from '@umijs/max';
 import { queryCurrentV2, queryUserRole } from '@/services/user';
 
 const useUser = () => {
-  const { data: user, loading } = useRequest(queryCurrentV2, {
+  const { data: user, loading, run } = useRequest(queryCurrentV2, {
     cacheKey: 'queryCurrent',
   });
   // const { data: roleData, loading } = useRequest(() => queryUserRole(user.ID), {
@@ -28,6 +28,7 @@ const useUser = () => {
       // roleList: roleList,
     },
     loading,
+    run
   };
 };
 

src/pages/Login/index.js

@@ -1,6 +1,7 @@
-import React, { useRef, useState } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import { connect, useNavigate } from 'umi';
 import { Form, Select, Input, Button, message } from 'antd';
+import { useModel } from '@umijs/max';
 import { queryDepList } from '@/services/user';
 import styles from './index.less';
 import { UserOutlined, LockOutlined } from '@ant-design/icons';
@@ -13,6 +14,7 @@ function Login(props) {
     params,
     dispatch,
   } = props;
+  const { run } = useModel('userInfo');
   const [depList, setDepList] = useState([]);
   const [hasName, setHasName] = useState(false);
   const formRef = useRef();
@@ -47,10 +49,14 @@ function Login(props) {
       },
       callback: (token) => {
         storeToken(token);
+        run();
         navigate("/home");
       },
     });
   };
+  useEffect(() => {
+    storeToken('');
+  }, []);
   return (
     <div className={styles.main}>
       <div className={styles.content}>

src/pages/ManufacturerMng/ManufacturerList.js

@@ -22,12 +22,14 @@ function ManufacturerList(props) {
   const [visible, setVisible] = useState(false);
   const [curItem, setCurItem] = useState(null);
   const [formDisabled, setFormDisabled] = useState(false);
-  const [formData, setFormData] = useState({ start_time: "", end_time: "", project_id: projectId * 1, is_super: user?.IsSuper || false, page: 1, page_Size: pageSize });
+  const [total, setTotal] = useState(0);
+  const [formData, setFormData] = useState({ start_time: "", end_time: "", project_id: projectId * 1, is_super: user?.IsSuper || false, page: 1, page_size: pageSize });
   const queryMfrListRequest = useRequest(queryMfrList, {
     manual: true,
     onSuccess: data => {
       console.log(data);
-      setFormData({ ...formData, pageSize: pageSize, total: data.count || 0 })
+      setFormData({ ...formData, page_size: pageSize })
+      setTotal(data.count);
     }
   });
   const queryCreaterListRequest = useRequest(queryCreaterList, {});
@@ -36,6 +38,7 @@ function ManufacturerList(props) {
     onSuccess: () => {
       message.success('新增成功');
       queryList({ ...formData, page: 1 })
+      queryCreaterListRequest.run({})
     }
   });
   const editMfrRequest = useRequest(editMfr, {
@@ -43,6 +46,7 @@ function ManufacturerList(props) {
     onSuccess: () => {
       message.success('编辑成功');
       queryList({ ...formData, page: 1 })
+      queryCreaterListRequest.run({})
     }
   });
   const deleteMfrRequest = useRequest(deleteMfr, {
@@ -50,6 +54,7 @@ function ManufacturerList(props) {
     onSuccess: () => {
       message.success('删除成功');
       queryList({ ...formData, page: 1 })
+      queryCreaterListRequest.run({})
     }
   });
   const loading = useMemo(() => {
@@ -163,19 +168,22 @@ function ManufacturerList(props) {
       page_size: pageSize,
       page: 1,
       is_super: user?.IsSuper || false,
-      created_by: formData.created_by || ''
+      created_by: formData.created_by || '',
+      name: formData.name || ''
     }
     queryList(value);
   }
   const queryList = fieldsValue => {
     console.log(fieldsValue);
     setFormData(fieldsValue);
-    queryMfrListRequest.run({ ...fieldsValue })
+    var isSuper = user?.IsSuper || false;
+    var created_by = isSuper ? fieldsValue.created_by || '' : user?.CName || undefined
+    queryMfrListRequest.run({ ...fieldsValue, created_by })
   }
   const onDateChange = data => {
     let start_time = '';
     let end_time = '';
-    if (data.length > 0) {
+    if (data?.length > 0) {
       start_time = dayjs(data[0]).format('YYYY-MM-DD');
       end_time = dayjs(data[1]).format('YYYY-MM-DD');
     }
@@ -184,7 +192,6 @@ function ManufacturerList(props) {
   const onOk = fieldsValue => {
     console.log(fieldsValue);
     setVisible(false);
-    debugger
     if (curItem != null)
       editMfrRequest.run({ ...fieldsValue, project_id: 1, updated_by: user?.CName, id: curItem.id })
     else
@@ -193,6 +200,11 @@ function ManufacturerList(props) {
   const onChange = name => {
     setFormData({ ...formData, created_by: name })
   }
+  const onPaginationChange = pagination => {
+    var tempFormData = { ...formData, page: pagination.current }
+    setFormData(tempFormData)
+    queryList(tempFormData);
+  }
   const onInputChange = e => {
     setFormData({ ...formData, name: e.target.value })
   }
@@ -208,16 +220,18 @@ function ManufacturerList(props) {
               <RangePicker onChange={onDateChange} />
             </Form.Item>
           </div>
-          <div style={{ margin: '0 24px' }}>
-            <Form.Item label="创建人:">
-              <Select
-                onChange={onChange}
-                options={queryCreaterListRequest?.data?.list || []}
-                style={{ width: 180 }}
-                allowClear
-              />
-            </Form.Item>
-          </div>
+          {
+            user?.IsSuper && <div style={{ margin: '0 24px' }}>
+              <Form.Item label="创建人:">
+                <Select
+                  onChange={onChange}
+                  options={queryCreaterListRequest?.data?.list || []}
+                  style={{ width: 180 }}
+                  allowClear
+                />
+              </Form.Item>
+            </div>
+          }
           <div style={{ margin: '0 24px' }}>
             <Form.Item style={{ margin: '0px 24 0 24px' }} label="供应商名称:">
               <Input placeholder="请输入供应商名称" onChange={e => { onInputChange(e) }} />
@@ -246,8 +260,8 @@ function ManufacturerList(props) {
         loading={loading}
         columns={columns}
         dataSource={queryMfrListRequest?.data?.list}
-        pagination={{ current: formData.page, total: formData.total, pageSize: formData.pageSize }}
-        onChange={onChange}
+        pagination={{ current: formData.page, total: total, page_size: pageSize }}
+        onChange={onPaginationChange}
       />
       <FirmModal
         projectId={projectId}

src/pages/ManufacturerMng/ManufacturerModal.js

@@ -19,6 +19,7 @@ function FirmModal(props) {
       .validateFields()
       .then((values) => {
         console.log(values);
+        formRef.resetFields();
         onOk?.({ ...values });
       })
       .catch((info) => {