f

src/components/Page/List.jsx

@@ -22,10 +22,11 @@ export default React.forwardRef((props, ref) => {
       valueType: 'option',
       key: 'option',
       ellipsis: true,
+      fixed: 'right',
       render: (_, record) => [
         (
-          onEdit && 
-          <Button style={{ padding: 0 }} type="link" key={1} onClick={() => onEdit(record) }>
+          onEdit &&
+          <Button style={{ padding: 0 }} type="link" key={1} onClick={() => onEdit(record)}>
             编辑
           </Button>
         ),
@@ -71,7 +72,7 @@ export default React.forwardRef((props, ref) => {
         actionRef={actionRef}
         toolBarRender={() => [
           (
-            onAdd && 
+            onAdd &&
             <Button
               key="1"
               type="primary"

src/layouts/AuthLayout/components/Header/Exit.jsx

@@ -9,7 +9,7 @@ const { confirm } = Modal;
 
 export default (props) => {
   const navigate = useNavigate();
-  const { setUser } = useModel("user");
+  // const { setUser } = useModel("user");
 
   const onExit = () => {
     confirm({
@@ -17,7 +17,7 @@ export default (props) => {
       onOk: () => {
         logout(); // 调用接口
         localStorage.removeItem("token");
-        setUser();
+        // setUser();
         navigate("/login?back=true");
       },
     });

src/pages/custom/index.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import { useNavigate } from "react-router-dom";
 import { Button, Popconfirm, message } from "antd";
 import { ProTable } from "@ant-design/pro-components";
-import { queryTable, queryDict } from "@/utils/request";
+import { queryTable } from "@/utils/request";
 import { getTaCustom, deleteTaCustom } from "@/services/taCustom";
 import Page from "@/components/Page";
 

src/pages/login/index.jsx

@@ -27,6 +27,7 @@ export default (props) => {
 
     // console.log('ticket', ticket);
     if (searchParams.get("redirect")) {
+      // console.log('爱', searchParams.get("redirect"));
       const redirect = decodeURIComponent(searchParams.get("redirect"));
       let href = "";
       if (redirect.indexOf("#") === -1) {
@@ -38,10 +39,11 @@ export default (props) => {
       }
       window.location.href = href;
     } else if (searchParams.get("back")) {
-      // console.log(navigate(-1), "---");
+      // console.log('else if', searchParams.get("back"));
       navigate(-1);
       // navigate("/");
     } else {
+      console.log('else');
       navigate("/");
     }
   };

src/pages/project/Edit.jsx

@@ -5,6 +5,7 @@ import { useSearchParams, useNavigate } from "react-router-dom";
 import Page from "@/components/Page";
 import { formItemLayout, tailFormItemLayout } from "@/utils/form";
 import { postTaProject, putTaProject, getTaProjectById } from "@/services/project";
+import { getTaCustom } from "@/services/taCustom";
 import moment from 'moment'
 const { Option } = Select;
 
@@ -12,12 +13,14 @@ export default (props) => {
 
   const [loading, startLoading, cancelLoading] = useBool();
   const [submiting, startSubmit, cancelSubmit] = useBool();
+  const [list, setList] = React.useState([]);
 
   const [searchParams] = useSearchParams();
   const [form] = Form.useForm();
   const navigate = useNavigate();
 
   const id = searchParams.get("id");
+  // const Format = format("YYYY-MM-DD HH:mm:ss") : undefined;
 
   React.useEffect(() => {
     if (id) {
@@ -26,19 +29,32 @@ export default (props) => {
         // const endTime = res.endTime ? { endTime: moment(res.endTime) } : undefined;
         // form.setFieldsValue({ ...res, startTime, endTime });
         // console.log('-------res', { ...res, startTime, endTime })
-        form.setFieldsValue({ ...res, startTime: res.startTime ? moment(res.startTime) : undefined, endTime: res.endTime ? moment(res.endTime) : undefined });
+        form.setFieldsValue({
+          ...res, startTime: res.startTime ? moment(res.startTime) : undefined, endTime: res.endTime ? moment(res.endTime) : undefined,
+          crm: res.crm ? moment(res.crm) : undefined
+        });
       })
     }
+    getTaCustom().then((res) => {
+      setList(res.records);
+    })
   }, [id])
 
+  const changeDate = (val) => {
+    return val.format("YYYY-MM-DD HH:mm:ss")
+  }
+
   const onFinish = (values) => {
-    const startTime = values.startTime ? moment(values.startTime).format("YYYY-MM-DD HH:mm:ss") : undefined;
-    const endTime = values.endTime ? moment(values.endTime).format("YYYY-MM-DD HH:mm:ss") : undefined;
+    const startTime = values.startTime ? changeDate(values.startTime) : undefined;
+    const endTime = values.endTime ? changeDate(values.endTime) : undefined;
+    const crm = values.crm ? changeDate(values.crm) : undefined;
+
+    // console.log('crm', crm)
     startSubmit();
     if (id) {
       // console.log('startTime,...values', { ...values, startTime, endTime })
       //更新
-      putTaProject(id, { ...values, startTime, endTime }).then((res) => {
+      putTaProject(id, { ...values, startTime, endTime, crm }).then((res) => {
         cancelSubmit();
         navigate(-1)
       }).catch(() => {
@@ -46,7 +62,8 @@ export default (props) => {
       })
     } else {
       //新增
-      postTaProject(values).then((res) => {
+      // console.log('新增', { ...values, startTime, endTime, crm })
+      postTaProject({ ...values, startTime, endTime, crm }).then((res) => {
         cancelSubmit();
         navigate(-1)
       }).catch(() => {
@@ -55,6 +72,8 @@ export default (props) => {
     }
   }
 
+  // console.log('first', list);
+
   return (
     <Page>
       <Card loading={loading}>
@@ -86,7 +105,21 @@ export default (props) => {
           <Form.Item name="endTime" label="结束日期">
             <DatePicker placeholder="请选择" style={{ width: '100%' }} locale />
           </Form.Item>
+          <Form.Item name="crm" label="运维服务期">
+            <DatePicker placeholder="请选择" style={{ width: '100%' }} locale />
+          </Form.Item>
 
+          <Form.Item name="customId" label="所属客户">
+            <Select placeholder="请选择">
+              {
+                list.map((res, index) => {
+                  return (
+                    <Option key={index} value={res.customId}>{res.customName}</Option>
+                  )
+                })
+              }
+            </Select>
+          </Form.Item>
           <Form.Item name="quotation" label="合同报价">
             <Input placeholder="请输入" />
           </Form.Item>
@@ -132,9 +165,6 @@ export default (props) => {
             <Input placeholder="请输入" />
           </Form.Item>
 
-          <Form.Item name="customId" label="客户ID">
-            <Input placeholder="请输入" />
-          </Form.Item>
 
           <Form.Item {...tailFormItemLayout}>
             <Button loading={submiting} type="primary" htmlType="submit">

src/pages/project/index.jsx

@@ -2,9 +2,11 @@ import React from "react";
 import { useNavigate } from "react-router-dom";
 import { Button, Popconfirm } from "antd";
 import List from "@/components/Page/List";
+import { queryDict } from "@/utils/request";
+import { getTaCustom } from "@/services/taCustom";
 import { getTaProject, deleteTaProject } from "@/services/project";
 
-
+const TaCustom = queryDict(getTaCustom, { labelKey: 'customName', valueKey: 'customId' })
 
 export default (props) => {
   const actionRef = React.useRef();
@@ -30,6 +32,18 @@ export default (props) => {
       dataIndex: "endTime",
       search: false,
     },
+    {
+      title: "运维服务期",
+      dataIndex: "crm",
+      search: false,
+    },
+    {
+      title: "所属客户",
+      dataIndex: "customId",
+      valueType: "select",
+      search: false,
+      request: TaCustom
+    },
     {
       title: "合同报价",
       dataIndex: "quotation",
@@ -128,6 +142,12 @@ export default (props) => {
       onDelete={onDelete}
       onEdit={onEdit}
       request={getTaProject}
+      columnOptionRender={(_, res) => [
+        // console.log('res', res.webUrl),
+        <Button key={1} style={{ padding: 0 }} type="link" href={res.webUrl}>
+          跳转
+        </Button>
+      ]}
     />
   );
 };

src/pages/user/Edit.jsx

@@ -4,6 +4,7 @@ import useBool from "@/utils/hooks/useBool";
 import { useSearchParams, useNavigate } from "react-router-dom";
 import Page from "@/components/Page";
 import { formItemLayout, tailFormItemLayout } from "@/utils/form";
+import { postSysUser, putSysUser, getSysUserById } from "@/services/sysuser";
 const { Option } = Select;
 
 export default (props) => {
@@ -17,8 +18,36 @@ export default (props) => {
 
   const id = searchParams.get("id");
 
-  const onFinish = () => {
+  React.useEffect(() => {
+    if (id) {
+      console.log('---id--->', id)
+      getSysUserById(id).then((res) => {
+        console.log('res', res)
+        form.setFieldsValue(res);
+      })
+    }
+  }, [id])
 
+  const onFinish = (values) => {
+    startSubmit();
+    if (id) {
+      // console.log('---id--->', id)
+      //修改
+      putSysUser(id, values).then((res) => {
+        cancelSubmit();
+        navigate(-1);
+      }).catch(() => {
+        cancelSubmit();
+      })
+    } else {
+      //新增
+      postSysUser(values).then((res) => {
+        cancelSubmit();
+        navigate(-1)
+      }).catch(() => {
+        cancelSubmit();
+      })
+    }
   }
 
   return (

src/pages/user/index.jsx

@@ -2,17 +2,20 @@ import React from "react";
 import { useNavigate } from "react-router-dom";
 import { Button, Popconfirm, message } from "antd";
 import { ProTable } from "@ant-design/pro-components";
-import { queryTable, queryDict } from "@/utils/request";
+import { queryTable } from "@/utils/request";
+import { getSysUser, deleteSysUser } from "@/services/sysuser";
 import Page from "@/components/Page";
 
-
+const sysUserList = queryTable(getSysUser)
 
 export default (props) => {
   const actionRef = React.useRef();
   const navigate = useNavigate();
 
-  const handleDelete = () => {
-
+  const handleDelete = (id) => {
+    deleteSysUser(id).then((res) => {
+      actionRef.current.reload();
+    })
   }
 
   const columns = [
@@ -34,9 +37,8 @@ export default (props) => {
           key={3}
           style={{ padding: 0 }}
           type="link"
-          disabled
           onClick={() => {
-            navigate(`/user/edit?id=${record}`);
+            navigate(`/user/edit?id=${record.userId}`);
           }}
         >
           编辑
@@ -44,7 +46,7 @@ export default (props) => {
         <Popconfirm
           key={4}
           title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record)}
+          onConfirm={() => handleDelete(record.userId)}
           okText="确定"
           cancelText="取消"
         >
@@ -60,7 +62,7 @@ export default (props) => {
     <Page>
       <ProTable
         actionRef={actionRef}
-        rowKey=""
+        rowKey="userId"
         toolBarRender={() => [
           <Button
             key="1"
@@ -72,7 +74,7 @@ export default (props) => {
             新增
           </Button>,
         ]}
-        // request={{}}
+        request={sysUserList}
         columns={columns}
       />
     </Page>

src/routes/routes.jsx

@@ -99,7 +99,8 @@ export const defaultRoutes = [
   {
     path: "*",
     element: <Page404 />,
-  }
+  },
+
 ];
 
 export function mergeAuthRoutes (r1, r2) {

src/services/sysUser.js

@@ -0,0 +1,26 @@
+import request from "@/utils/request";
+
+/*
+ * 分页查询
+ */
+export const getSysUser = (params) => request(`/api/sysUser/paginQuery`, { params });
+
+/*
+ * 新增数据
+ */
+export const postSysUser = (data) => request('/api/sysUser/addList', { data, method: 'post' });
+
+/*
+ * 更新数据
+ */
+export const putSysUser = (id, data) => request(`/api/sysUser/edit/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteSysUser = (id) => request(`/api/sysUser/deleteById/${id}`, { method: 'delete' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getSysUserById = (id) => request(`/api/sysUser/queryById/${id}`);

src/store/models/user.js

@@ -5,34 +5,36 @@ import { getMenuItems } from "@/routes/menus";
 import { isLogin } from "@/services/login";
 
 export default function useUser () {
-  const [user, setUser] = useState();
+  // const [user, setUser] = useState();
   const menusRef = useRef();
   const routesRef = useRef();
 
-  const getCurrentUser = (params) =>
+  const getCurrentUser = () =>
     new Promise((resolve, reject) => {
-      isLogin(params)
-        .then((res) => {
-          const { user } = res;
-          // const permissions = res;
+      // isLogin()
+      //   .then((res) => {
+      // const { user } = res;
+      // const permissions = res;
 
-          // authRoutes 是所有待验证授权的路由
-          // authedRoutes 是已经被授权的路由
-          // const authedRoutes = authRoutes;
+      // authRoutes 是所有待验证授权的路由
+      // authedRoutes 是已经被授权的路由
+      // const authedRoutes = authRoutes;
 
-          menusRef.current = getMenuItems(defaultRoutes);
-          routesRef.current = mergeAuthRoutes(defaultRoutes);
-          // console.log('menusRef.current', menusRef.current)
+      menusRef.current = getMenuItems(authRoutes);
+      routesRef.current = mergeAuthRoutes(defaultRoutes);
+      // console.log('menusRef.current', menusRef.current)
 
-          setUser(user);
-          resolve(user);
-        })
-        .catch(reject);
+      // setUser(user);
+      resolve();
+      // })
+
+    }).catch((e) => {
+      console.log(e)
     });
 
   return {
-    user,
-    setUser,
+    // user,
+    // setUser,
     getCurrentUser,
     menus: menusRef.current || [],
     routes: routesRef.current || [],

src/utils/request.js

@@ -21,6 +21,8 @@ instance.interceptors.request.use(
       params = {},
     } = config;
     let token = localStorage.getItem("token") || "";
+    const tokenB = (`Bearer ${token}`);
+    console.log('----tokenB---->', tokenB);
 
     let noTip = silent;
     if (noTip === undefined) {
@@ -43,7 +45,7 @@ instance.interceptors.request.use(
       silent: noTip,
       headers: {
         ...headers,
-        Authorization: token,
+        Authorization: tokenB,
       },
       responseType: download ? "blob" : responseType,
     };