Skip to content

W
wms
Commit b2227693 authored by wuhao's avatar wuhao 🎯
Browse files
Options

asder

parent 540ed2bf
Show whitespace changes
Inline Side-by-side
Showing with 183 additions and 81 deletions
config/routes.js
View file @ b2227693
......@@ -33,6 +33,21 @@ export default [
icon: "smile",
component: "./Welcome",
},
{
path: "/findstore",
name: "库存查询",
icon: "search",
routes: [
{
path: "/findstore/storesearch",
name: "库存查询",
component: "./findstore/Storesearch",
},
{
component: "./404",
},
],
},
{
path: "/system",
name: "系统基础管理",
......@@ -197,37 +212,6 @@ export default [
},
],
},
{
path: "/schedule",
name: "排班设置",
icon: "calendar",
routes: [
{
path: "/schedule",
redirect: "/schedule/shift",
},
{
path: "/schedule/shift",
name: "班次管理",
component: "./schedule/Shift",
},
{
path: "/schedule/shiftgroup",
name: "班组管理",
component: "./schedule/Shiftgroup",
},
{
path: "/schedule/calendar",
name: "工作日历",
component: "./schedule/Calendar",
},
{
component: "./404",
},
],
},
{
path: "/prodplay",
name: "排产管理",
......
src/app.jsx
View file @ b2227693
......@@ -96,7 +96,7 @@ export const layout = async (props) => {
}
},
contentStyle: {
padding: "42px 0px 0px 6px",
padding: "42px 6px 0px 6px",
margin: 0,
},
//接口获取菜单数据
......@@ -105,37 +105,40 @@ export const layout = async (props) => {
params: {
userId: initialState?.currentUser?.id,
},
request: (params, defaultMenuData) => {
let lastArr = initialState?.newMenu?.userHavePermList
? JSON.parse(
JSON.stringify(initialState?.newMenu?.userHavePermList)
)
: [],
newArr = [
{
path: "/welcome",
name: "首页",
icon: "smile",
component: "./Welcome",
haveChildren: false,
key: "000000",
parentKey: "0",
routes: [],
children: null,
title: null,
},
].concat(lastArr);
return newArr;
},
// request: (params, defaultMenuData) => {
// let lastArr = initialState?.newMenu?.userHavePermList
// ? JSON.parse(
// JSON.stringify(initialState?.newMenu?.userHavePermList)
// )
// : [],
// newArr = [
// {
// path: "/welcome",
// name: "首页",
// icon: "smile",
// component: "./Welcome",
// haveChildren: false,
// key: "000000",
// parentKey: "0",
// routes: [],
// children: null,
// title: null,
// },
// ].concat(lastArr);
// return newArr;
// },
locale: false,
},
menuRender: (props, defaultDom) => {
if (props.isMobile) {
return defaultDom;
} else {
return <SiderMenu {...props}></SiderMenu>;
}
},
// menuRender: (props, defaultDom) => {
// if (props.isMobile) {
// return defaultDom;
// } else {
// return <SiderMenu {...props}></SiderMenu>;
// }
// },
// 自定义 403 页面
// unAccessible: <div>unAccessible</div>,
// 增加一个 loading 的状态
......@@ -148,18 +151,6 @@ export const layout = async (props) => {
) : (
children
)}
{!props.location?.pathname?.includes("/login") && (
<SettingDrawer
enableDarkTheme
settings={initialState?.settings}
onSettingChange={(settings) => {
setInitialState((preInitialState) => ({
...preInitialState,
settings,
}));
}}
/>
)}
</>
);
},
......
src/components/RightContent/index.jsx
View file @ b2227693
......@@ -28,14 +28,14 @@ const GlobalHeaderRight = () => {
onClick={() => { }}
>
{collapsed ? (
<MenuFoldOutlined
<MenuUnfoldOutlined
style={{ cursor: "pointer" }}
onClick={() => {
setInitialState(s => ({ ...s, collapsed: !collapsed }));
}}
/>
) : (
<MenuUnfoldOutlined
<MenuFoldOutlined
style={{ cursor: "pointer" }}
onClick={() => {
setInitialState(s => ({ ...s, collapsed: !collapsed }));
......
src/global.less
View file @ b2227693
......@@ -19,10 +19,6 @@ body,
.colorWeak {
filter: invert(80%);
}
.ant-layout {
min-height: 100vh;
}
.ant-pro-sider.ant-layout-sider.ant-pro-sider-fixed {
left: unset;
}
......
src/pages/craft/Materiel/Index.jsx
View file @ b2227693
......@@ -468,6 +468,9 @@ const Materiel = (props) => {
) {
defaultFields[i].required = false;
}
if (i == "materieTypeId") {
defaultFields[i].value = materieTypeId;
}
}
dispatch({
type: "add",
......
src/pages/craft/Materiel/fields.js
View file @ b2227693
......@@ -27,7 +27,7 @@ export default {
type: "treeselect",
title: "物料类别",
name: ["materieTypeId"],
required: false,
required: true,
options: {
database: (params) => doFetch({ url: "/ngic-workmanship/pmMaterieType/queryTreeList", params }),
params: {}
......
src/pages/findstore/Storesearch/index.jsx 0 → 100644
View file @ b2227693
import {
MenuUnfoldOutlined,
MenuFoldOutlined,
HomeOutlined
} from '@ant-design/icons';
import { Breadcrumb, Layout, Menu, Input, Tooltip, Tree } from 'antd';
import React, { useState } from 'react';
import styles from './index.less'
const { Header, Content, Footer, Sider } = Layout,
{ Search } = Input
const Storesearch = () => {
const [collapsed, setCollapsed] = useState(false);
const [search, setsearch] = useState();
const [select, setselect] = useState({});
return (
<Layout
style={{
height: '100%',
}}
>
<Sider theme='light' collapsed={collapsed} width={260}>
<div style={{ padding: 12, justifyContent: "space-between", paddingBottom: collapsed ? 12 : 0, alignItems: "center", display: "flex", flexDirection: !collapsed ? "row" : "column" }} >
<p className={styles.title} style={{ marginBottom: !collapsed ? 0 : 12 }}>
<HomeOutlined />
{!collapsed ? <span style={{ marginLeft: 6 }}>仓库库位</span> : ""}
</p>
{collapsed ? (
<MenuUnfoldOutlined
style={{ cursor: "pointer", fontSize: 20 }}
onClick={() => {
setCollapsed(!collapsed)
}}
/>
) : (
<MenuFoldOutlined
style={{ cursor: "pointer", fontSize: 20 }}
onClick={() => {
setCollapsed(!collapsed)
}}
/>
)}
</div>
{
!collapsed && <div style={{ padding: 12, paddingBottom: collapsed ? 12 : 0 }}>
<Search value={search} onChange={e => setsearch(e.target.value)} style={{ marginRight: 10 }}></Search>
</div>
}
{
!collapsed ?
<div style={{ padding: collapsed ? 0 : 12 }}>
<Tree
treeData={[
{ title: '全部仓库', key: '0' }, // 菜单项务必填写 key
{ title: '菜单项二', key: 'item-2' },
{
title: '子菜单',
key: 'submenu',
children: [{ title: '子菜单项', key: 'submenu-item-1' }],
},
]}
onSelect={(selectedKeys, e) => {
setselect(selectedKeys[0] ? {
title: e.node.title,
selectedKeys: selectedKeys[0]
} : {
})
}}
/>
</div> :
<div onDoubleClick={() => {
setCollapsed(false)
}} style={{ writingMode: "vertical-lr", width: "100%", textAlign: "center", height: "80vh", display: "flex", justifyContent: "center", alignItems: "center", userSelect: "none" }}>
双击此处展开
</div>
}
</Sider>
<Layout className={styles.sitelayout}>
<Content
style={{
margin: '0 0 6px 6px',
display: "flex",
flexDirection: "column"
}}
>
<Breadcrumb
style={{
margin: '8px 6px',
}}
>
<Breadcrumb.Item>物料库存</Breadcrumb.Item>
<Breadcrumb.Item>{select.title}</Breadcrumb.Item>
</Breadcrumb>
<div
className={styles.sitelayoutbackground}
style={{
padding: 6,
height: "100%",
flex: 1
}}
>
Bill is a cat.
</div>
</Content>
</Layout>
</Layout>
);
};
export default Storesearch;
\ No newline at end of file
src/pages/findstore/Storesearch/index.less 0 → 100644
View file @ b2227693
.sitelayout {
min-height: calc(100vh - 98px) !important;
.sitelayoutbackground {
background: #fff;
}
}
.title{
margin: 0px;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment