路由配置修改

config/config.js

@@ -141,8 +141,8 @@ export default {
   proxy: {
     '/api': {
       // target: 'http://192.168.20.152:8888/',
-      target: 'http://120.55.44.4:8896/',
-      // target: 'http://47.96.12.136:8896/',
+      // target: 'http://120.55.44.4:8896/',
+      target: 'http://47.96.12.136:8896/',
       // target: 'http://oraysmart.com:8889/',
       // target: 'http://oraysmart.com:8888/api',
       // changeOrigin: true,

config/router.config.js

@@ -12,75 +12,76 @@ export default [
         component: './Mobile/DataMeter/Craft',
       },
       {
-        path: '/home',
+        path: '/bom',
         component: './PurchaseAdmin/PurchaseList/Index',
         routes: [
           {
-            path: '/home',
+            path: '/bom',
             component: './PurchaseAdmin/PurchaseList/List/NewList',
             // component: './PurchaseAdmin/PurchaseList/List/List',
           },
           {
-            path: '/home/detail/:projectId/:templateId',
+            path: '/bom/detail/:projectId/:templateId',
             component: './PurchaseAdmin/PurchaseList/Detail/Index',
           },
           {
-            path: '/home/flow/:flowId',
+            path: '/bom/flow/:flowId',
             component: './PurchaseAdmin/PurchaseList/Flow/Flow',
           },
           {
-            path: '/home/audit',
+            path: '/bom/audit',
             component: './PurchaseAdmin/PurchaseList/Flow/Audit',
           },
           {
-            path: '/home/audit-list',
+            path: '/bom/audit-list',
             component: './PurchaseAdmin/PurchaseList/Flow/AuditList',
           },
           {
-            path: '/home/flow-list',
+            path: '/bom/flow-list',
             component: './PurchaseAdmin/PurchaseList/Flow/List',
           },
         ],
       },
       {
-        path: '/workload',
+        path: '/home',
         component: './PurchaseAdmin/PurchaseList/WorkloadIndex',
         routes: [
           {
-            path: '/workload',
-            component: './PurchaseAdmin/PurchaseList/WorkingHours/index',
+            path: '/home',
+            // component: './PurchaseAdmin/PurchaseList/WorkingHours/index',
+            redirect: '/home/work-hours',
             // component: './PurchaseAdmin/PurchaseList/List/List',
           },
           {
-            path: '/workload/work-hours',
+            path: '/home/work-hours',
             component: './PurchaseAdmin/PurchaseList/WorkingHours/index',
           },
           {
-            path: '/workload/work-hours-auth',
+            path: '/home/work-hours-auth',
             component: './PurchaseAdmin/PurchaseList/WorkingHours/Auth',
           },
           {
-            path: '/workload/report/resource',
+            path: '/home/report/resource',
             component: './PurchaseAdmin/PurchaseList/Report/Resource',
           },
           {
-            path: '/workload/report/project',
+            path: '/home/report/project',
             component: './PurchaseAdmin/PurchaseList/Report/Project',
           },
           {
-            path: '/workload/report/department',
+            path: '/home/report/department',
             component: './PurchaseAdmin/PurchaseList/Report/Department',
           },
           {
-            path: '/workload/report/finance',
+            path: '/home/report/finance',
             component: './PurchaseAdmin/PurchaseList/Report/Finance',
           },
           {
-            path: '/workload/approval/list',
+            path: '/home/approval/list',
             component: './PurchaseAdmin/PurchaseList/Approval/List',
           },
           {
-            path: '/workload/approval/auth',
+            path: '/home/approval/auth',
             component: './PurchaseAdmin/PurchaseList/Approval/Auth',
           },
         ],

src/pages/PurchaseAdmin/PurchaseList/Flow/AuditList.js

@@ -59,7 +59,7 @@ function Audit(props) {
         current: item.list,
       },
     });
-    router.push('/home/audit');
+    router.push('/bom/audit');
   };
 
   useEffect(() => {

src/pages/PurchaseAdmin/PurchaseList/Flow/List.js

@@ -27,7 +27,7 @@ function List(props) {
       title: '操作',
       render: (item, index) => (
         <>
-          <a onClick={() => router.push(`/home/flow/${item.Id}`)}>查看</a>
+          <a onClick={() => router.push(`/bom/flow/${item.Id}`)}>查看</a>
         </>
       ),
     },
@@ -67,7 +67,7 @@ function List(props) {
           新增工作流
         </Button>
         {permission['func-01-point-bom-flow'] && (
-          <Link to="/home/audit-list">
+          <Link to="/bom/audit-list">
             <Button type="primary">审批流管理</Button>
           </Link>
         )}

src/pages/PurchaseAdmin/PurchaseList/Index.js

@@ -54,11 +54,11 @@ function LayoutDetail(props) {
               defaultSelectedKeys={[props.location.pathname]}
               style={{ lineHeight: '64px', width: '100%' }}
             >
-              <Menu.Item key="/home">
-                <Link to="/home">采购清单</Link>
+              <Menu.Item key="/bom">
+                <Link to="/bom">采购清单</Link>
               </Menu.Item>
-              <Menu.Item key="/home/flow-list">
-                <Link to="/home/flow-list">流程管理</Link>
+              <Menu.Item key="/bom/flow-list">
+                <Link to="/bom/flow-list">流程管理</Link>
               </Menu.Item>
             </Menu>
           </div>

src/pages/PurchaseAdmin/PurchaseList/List/List.js

@@ -50,7 +50,7 @@ function List(props) {
       title: '操作',
       render: record => (
         <>
-          <a onClick={() => router.push(`/home/detail/${record.id}/${record.project_id}`)}>查看</a>
+          <a onClick={() => router.push(`/bom/detail/${record.id}/${record.project_id}`)}>查看</a>
           {currentUser.IsSuper && (
             <>
               <Divider type="vertical" />

src/pages/PurchaseAdmin/PurchaseList/List/NewList.js

@@ -58,7 +58,7 @@ function List(props) {
                 setFlowVisible(true);
               } catch (error) {}
               setLoading2(false);
-              // router.push(`/home/detail/${record.project_id}/${record.template_id}`);
+              // router.push(`/bom/detail/${record.project_id}/${record.template_id}`);
             }}
           >
             查看
@@ -102,7 +102,7 @@ function List(props) {
     if (typeof item == 'object') {
       localStorage.excelItem = JSON.stringify(item);
     }
-    router.push(`/home/detail/${item.project_id}/${item.template_id}`);
+    router.push(`/bom/detail/${item.project_id}/${item.template_id}`);
   };
 
   const getLoading = () => {

src/pages/PurchaseAdmin/PurchaseList/Login/models/login.js

@@ -26,9 +26,9 @@ export default {
         payload: response,
       });
       if(localStorage.type == 'bom') {
-        yield put(routerRedux.replace('/home'));
+        yield put(routerRedux.replace('/bom'));
       } else {
-        yield put(routerRedux.replace('/workload'));
+        yield put(routerRedux.replace('/home'));
       }
     },
     *logout(_, { call, put }) {

src/pages/PurchaseAdmin/PurchaseList/WorkloadIndex.js

@@ -54,42 +54,42 @@ function LayoutDetail(props) {
               defaultSelectedKeys={[props.location.pathname]}
               style={{ lineHeight: '64px', width: '100%' }}
             >
-              <SubMenu key="/workload/work-hours" title="工时管理">
-                <Menu.Item key="/workload/work-hours">
-                  <Link to="/workload/work-hours">上报工时</Link>
+              <SubMenu key="/home/work-hours" title="工时管理">
+                <Menu.Item key="/home/work-hours">
+                  <Link to="/home/work-hours">上报工时</Link>
                 </Menu.Item>
-                <Menu.Item key="/workload/work-hours-auth">
-                  <Link to="/workload/work-hours-auth">审批工时</Link>
+                <Menu.Item key="/home/work-hours-auth">
+                  <Link to="/home/work-hours-auth">审批工时</Link>
                 </Menu.Item>
               </SubMenu>
 
-              <SubMenu key="/workload/approval" title="项目立项">
-                <Menu.Item key="/workload/approval/list">
-                  <Link to="/workload/approval/list">项目列表</Link>
+              <SubMenu key="/home/approval" title="项目立项">
+                <Menu.Item key="/home/approval/list">
+                  <Link to="/home/approval/list">项目列表</Link>
                 </Menu.Item>
-                <Menu.Item key="/workload/approval/auth">
-                  <Link to="/workload/approval/auth">审核列表</Link>
+                <Menu.Item key="/home/approval/auth">
+                  <Link to="/home/approval/auth">审核列表</Link>
                 </Menu.Item>
               </SubMenu>
 
               {checkReport(0) && (
-                <SubMenu key="/workload/report" title="工时报表">
+                <SubMenu key="/home/report" title="工时报表">
                   {/* <Menu.Item key="/home/report/resource">
                   <Link to="/home/report/resource">资源报表</Link>
                 </Menu.Item> */}
                   {checkReport(1) && (
-                    <Menu.Item key="/workload/report/project">
-                      <Link to="/workload/report/project">项目报表</Link>
+                    <Menu.Item key="/home/report/project">
+                      <Link to="/home/report/project">项目报表</Link>
                     </Menu.Item>
                   )}
                   {checkReport(2) && (
-                    <Menu.Item key="/workload/report/department">
-                      <Link to="/workload/report/department">部门报表</Link>
+                    <Menu.Item key="/home/report/department">
+                      <Link to="/home/report/department">部门报表</Link>
                     </Menu.Item>
                   )}
                   {checkReport(3) && (
-                    <Menu.Item key="/workload/report/finance">
-                      <Link to="/workload/report/finance">财务报表</Link>
+                    <Menu.Item key="/home/report/finance">
+                      <Link to="/home/report/finance">财务报表</Link>
                     </Menu.Item>
                   )}
                 </SubMenu>