Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
wms
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wuhao
wms
Commits
212345b2
Commit
212345b2
authored
May 25, 2022
by
wuhao
🎯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zxc
parent
c80ff9f4
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
121 additions
and
208 deletions
+121
-208
defaultSettings.js
config/defaultSettings.js
+1
-1
proxy.js
config/proxy.js
+3
-3
package.json
package.json
+1
-1
app.jsx
src/app.jsx
+13
-5
mtable.jsx
src/components/AutoTable/mtable.jsx
+1
-1
index.jsx
src/components/InitForm/index.jsx
+1
-1
AvatarDropdown.jsx
src/components/RightContent/AvatarDropdown.jsx
+9
-6
index.jsx
src/components/RightContent/index.jsx
+23
-2
index.less
src/components/RightContent/index.less
+2
-1
SiderMenu.js
src/components/SiderMenu/SiderMenu.js
+0
-20
index.less
src/components/SiderMenu/index.less
+7
-26
mtable.jsx
src/components/Tableform/mtable.jsx
+1
-1
global.less
src/global.less
+7
-0
fields.jsx
src/pages/system/Staff/fields.jsx
+6
-84
index.jsx
src/pages/system/Staff/index.jsx
+3
-13
craft.js
src/services/craft.js
+8
-8
login.js
src/services/login.js
+7
-7
platform.js
src/services/platform.js
+6
-6
system.js
src/services/system.js
+21
-21
doFetch.js
src/utils/doFetch.js
+1
-1
No files found.
config/defaultSettings.js
View file @
212345b2
...
@@ -9,7 +9,7 @@ const Settings = {
...
@@ -9,7 +9,7 @@ const Settings = {
logo
:
"https://img1.baidu.com/it/u=4245241897,3920774166&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500"
,
logo
:
"https://img1.baidu.com/it/u=4245241897,3920774166&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500"
,
headerHeight
:
48
,
headerHeight
:
48
,
splitMenus
:
false
,
splitMenus
:
false
,
name
:
"
ME
S"
,
name
:
"
WM
S"
,
};
};
export
default
Settings
;
export
default
Settings
;
config/proxy.js
View file @
212345b2
...
@@ -9,12 +9,12 @@
...
@@ -9,12 +9,12 @@
export
default
{
export
default
{
dev
:
{
dev
:
{
// localhost:8000/api/** -> https://preview.pro.ant.design/api/**
// localhost:8000/api/** -> https://preview.pro.ant.design/api/**
"/
me
s/"
:
{
"/
wm
s/"
:
{
// 要代理的地址
// 要代理的地址
target
:
"http://192.168.40.
39:18040/"
,
//39:18040 23/me
s/ //60 翔
target
:
"http://192.168.40.
15:18040/"
,
//39:18040 23/wm
s/ //60 翔
changeOrigin
:
true
,
changeOrigin
:
true
,
pathRewrite
:
{
pathRewrite
:
{
"^/
me
s"
:
""
,
"^/
wm
s"
:
""
,
},
},
},
},
"/staticfile/"
:
{
"/staticfile/"
:
{
...
...
package.json
View file @
212345b2
{
{
"name"
:
"
ME
S"
,
"name"
:
"
WM
S"
,
"version"
:
"5.2.0"
,
"version"
:
"5.2.0"
,
"private"
:
true
,
"private"
:
true
,
"description"
:
"An out-of-box UI solution for enterprise applications"
,
"description"
:
"An out-of-box UI solution for enterprise applications"
,
...
...
src/app.jsx
View file @
212345b2
...
@@ -51,23 +51,31 @@ export async function getInitialState() {
...
@@ -51,23 +51,31 @@ export async function getInitialState() {
settings
:
defaultSettings
,
settings
:
defaultSettings
,
newMenu
:
menuData
,
newMenu
:
menuData
,
getmenuData
,
getmenuData
,
collapsed
:
false
};
};
}
}
return
{
return
{
fetchUserInfo
,
fetchUserInfo
,
settings
:
defaultSettings
,
settings
:
defaultSettings
,
getmenuData
,
getmenuData
,
collapsed
:
false
};
};
}
// ProLayout 支持的api https://procomponents.ant.design/components/layout
}
// ProLayout 支持的api https://procomponents.ant.design/components/layout
export
const
layout
=
async
(
props
)
=>
{
export
const
layout
=
async
(
props
)
=>
{
let
{
initialState
,
setInitialState
}
=
props
;
let
{
initialState
,
setInitialState
}
=
props
;
let
token
=
localStorage
.
getItem
(
"TOKEN_MES"
);
let
token
=
localStorage
.
getItem
(
"TOKEN_MES"
);
return
{
return
{
rightContentRender
:
()
=>
<
RightContent
/>,
headerContentRender
:
()
=>
<
RightContent
/>,
rightContentRender
:()
=>
null
,
disableContentMargin
:
false
,
disableContentMargin
:
false
,
waterMarkProps
:
{
waterMarkProps
:
{
content
:
initialState
?.
currentUser
?.
name
,
content
:
initialState
?.
currentUser
?.
name
,
},
},
collapsed
:
initialState
.
collapsed
,
onCollapse
:
(
cols
)
=>
{
setInitialState
(
s
=>
({
...
s
,
collapsed
:
cols
}))
},
onPageChange
:
()
=>
{
onPageChange
:
()
=>
{
const
{
location
}
=
history
;
// 如果没有登录,重定向到 login
const
{
location
}
=
history
;
// 如果没有登录,重定向到 login
if
(
location
.
pathname
!=
"/user/logon"
)
{
if
(
location
.
pathname
!=
"/user/logon"
)
{
...
...
src/components/AutoTable/mtable.jsx
View file @
212345b2
...
@@ -273,7 +273,7 @@ class Mtable extends PureComponent {
...
@@ -273,7 +273,7 @@ class Mtable extends PureComponent {
delete
newparams
.
pageSize
;
delete
newparams
.
pageSize
;
}
}
let
res
=
await
request
(
"/
me
s"
+
path
,
{
let
res
=
await
request
(
"/
wm
s"
+
path
,
{
body
:
JSON
.
stringify
(
newparams
?
newparams
:
{}),
body
:
JSON
.
stringify
(
newparams
?
newparams
:
{}),
headers
,
headers
,
method
:
"POST"
,
method
:
"POST"
,
...
...
src/components/InitForm/index.jsx
View file @
212345b2
...
@@ -1050,7 +1050,7 @@ let InitForm = ({
...
@@ -1050,7 +1050,7 @@ let InitForm = ({
const
props
=
{
const
props
=
{
name
:
"file"
,
name
:
"file"
,
action
:
"/
me
s/ngic-base-business/sysAttachment/uploadFile"
,
action
:
"/
wm
s/ngic-base-business/sysAttachment/uploadFile"
,
listType
:
item
.
listType
==
"img"
?
"picture-card"
:
"text"
,
listType
:
item
.
listType
==
"img"
?
"picture-card"
:
"text"
,
accept
:
item
.
listType
==
"img"
?
".jpg,.png,.jpeg,"
:
"*"
,
accept
:
item
.
listType
==
"img"
?
".jpg,.png,.jpeg,"
:
"*"
,
multiple
:
item
.
multiple
?
item
.
multiple
:
false
,
multiple
:
item
.
multiple
?
item
.
multiple
:
false
,
...
...
src/components/RightContent/AvatarDropdown.jsx
View file @
212345b2
import
React
,
{
useCallback
,
useState
,
useMemo
}
from
"react"
;
import
React
,
{
useCallback
,
useState
,
useMemo
}
from
"react"
;
import
{
LogoutOutlined
,
LockOutlined
}
from
"@ant-design/icons"
;
import
{
LogoutOutlined
,
LockOutlined
}
from
"@ant-design/icons"
;
import
{
Menu
,
Spin
,
Form
,
Modal
,
message
}
from
"antd"
;
import
{
Menu
,
Spin
,
Form
,
Modal
,
message
,
Avatar
}
from
"antd"
;
import
{
history
,
useModel
,
useRequest
}
from
"umi"
;
import
{
history
,
useModel
,
useRequest
}
from
"umi"
;
import
{
stringify
}
from
"querystring"
;
import
{
stringify
}
from
"querystring"
;
import
HeaderDropdown
from
"../HeaderDropdown"
;
import
HeaderDropdown
from
"../HeaderDropdown"
;
...
@@ -175,15 +175,18 @@ const AvatarDropdown = ({ menu }) => {
...
@@ -175,15 +175,18 @@ const AvatarDropdown = ({ menu }) => {
formRef=
{
formRef
}
formRef=
{
formRef
}
fields=
{
fields
}
fields=
{
fields
}
col=
{
{
span
:
24
}
}
col=
{
{
span
:
24
}
}
onChange=
{
(
changedValues
,
allValues
)
=>
{}
}
onChange=
{
(
changedValues
,
allValues
)
=>
{
}
}
submitData=
{
(
values
,
fn
)
=>
{
submitData=
{
(
values
,
fn
)
=>
{
saveData
(
values
,
fn
);
saveData
(
values
,
fn
);
}
}
}
}
submitting=
{
loading
||
!
visible
}
submitting=
{
loading
||
!
visible
}
></
InitForm
>
>
</
InitForm
>
</
Modal
>
</
Modal
>
<
HeaderDropdown
overlay=
{
menuHeaderDropdown
}
>
<
HeaderDropdown
overlay=
{
menuHeaderDropdown
}
>
<
span
className=
{
`${styles.action} ${styles.account}`
}
>
<
span
className=
{
`${styles.action} ${styles.account}`
}
>
<
Avatar
style=
{
{
marginRight
:
12
,
backgroundColor
:
"#1890ff"
}
}
>
{
currentUser
.
userName
.
substr
(
0
,
1
)
}
</
Avatar
>
<
span
className=
{
`${styles.name} anticon`
}
>
<
span
className=
{
`${styles.name} anticon`
}
>
{
currentUser
.
userName
}
{
currentUser
.
userName
}
</
span
>
</
span
>
...
...
src/components/RightContent/index.jsx
View file @
212345b2
...
@@ -5,10 +5,11 @@ import { useModel, SelectLang } from "umi";
...
@@ -5,10 +5,11 @@ import { useModel, SelectLang } from "umi";
import
Avatar
from
"./AvatarDropdown"
;
import
Avatar
from
"./AvatarDropdown"
;
import
HeaderSearch
from
"../HeaderSearch"
;
import
HeaderSearch
from
"../HeaderSearch"
;
import
styles
from
"./index.less"
;
import
styles
from
"./index.less"
;
import
{
MenuUnfoldOutlined
,
MenuFoldOutlined
}
from
'@ant-design/icons'
const
GlobalHeaderRight
=
()
=>
{
const
GlobalHeaderRight
=
()
=>
{
const
{
initialState
}
=
useModel
(
"@@initialState"
);
const
{
initialState
,
setInitialState
}
=
useModel
(
"@@initialState"
);
const
{
collapsed
}
=
initialState
;
if
(
!
initialState
||
!
initialState
.
settings
)
{
if
(
!
initialState
||
!
initialState
.
settings
)
{
return
null
;
return
null
;
}
}
...
@@ -22,6 +23,26 @@ const GlobalHeaderRight = () => {
...
@@ -22,6 +23,26 @@ const GlobalHeaderRight = () => {
return
(
return
(
<
Space
className=
{
className
}
>
<
Space
className=
{
className
}
>
<
div
style=
{
{
color
:
"#000"
,
fontSize
:
20
,
paddingLeft
:
12
}
}
onClick=
{
()
=>
{
}
}
>
{
collapsed
?
(
<
MenuFoldOutlined
style=
{
{
cursor
:
"pointer"
}
}
onClick=
{
()
=>
{
setInitialState
(
s
=>
({
...
s
,
collapsed
:
!
collapsed
}));
}
}
/>
)
:
(
<
MenuUnfoldOutlined
style=
{
{
cursor
:
"pointer"
}
}
onClick=
{
()
=>
{
setInitialState
(
s
=>
({
...
s
,
collapsed
:
!
collapsed
}));
}
}
/>
)
}
</
div
>
<
Avatar
/>
<
Avatar
/>
</
Space
>
</
Space
>
);
);
...
...
src/components/RightContent/index.less
View file @
212345b2
...
@@ -13,7 +13,8 @@
...
@@ -13,7 +13,8 @@
.right {
.right {
display: flex;
display: flex;
float: right;
justify-content: space-between;
align-items: center;
height: 48px;
height: 48px;
margin-left: auto;
margin-left: auto;
overflow: hidden;
overflow: hidden;
...
...
src/components/SiderMenu/SiderMenu.js
View file @
212345b2
...
@@ -159,26 +159,6 @@ function Diymenu({
...
@@ -159,26 +159,6 @@ function Diymenu({
<
h1
style
=
{{
fontSize
:
12
}}
>
{
name
}
<
/h1
>
<
h1
style
=
{{
fontSize
:
12
}}
>
{
name
}
<
/h1
>
<
/Link
>
<
/Link
>
<
/div
>
<
/div
>
<
div
style
=
{{
color
:
"#fff"
,
fontSize
:
20
,
paddingLeft
:
12
}}
onClick
=
{()
=>
{}}
>
{
collapsed
?
(
<
MenuFoldOutlined
style
=
{{
cursor
:
"pointer"
}}
onClick
=
{()
=>
{
onCollapse
(
!
collapsed
);
}}
/
>
)
:
(
<
MenuUnfoldOutlined
style
=
{{
cursor
:
"pointer"
}}
onClick
=
{()
=>
{
onCollapse
(
!
collapsed
);
}}
/
>
)}
<
/div
>
<
Suspense
<
Suspense
fallback
=
{
<
div
style
=
{{
width
:
"100vw"
,
height
:
"100vh"
}}
/>
}
fallback
=
{
<
div
style
=
{{
width
:
"100vw"
,
height
:
"100vh"
}}
/>
}
>
>
...
...
src/components/SiderMenu/index.less
View file @
212345b2
...
@@ -139,12 +139,12 @@
...
@@ -139,12 +139,12 @@
padding: 6px;
padding: 6px;
background-color: transparent;
background-color: transparent;
cursor: pointer;
cursor: pointer;
transition: all 0.
4
s;
transition: all 0.
02
s;
break-inside: avoid !important;
break-inside: avoid !important;
.diylink {
.diylink {
color: #666 !important;
color: #666 !important;
transition: all 0.
4
s;
transition: all 0.
02
s;
}
}
> .tocollect {
> .tocollect {
...
@@ -176,7 +176,7 @@
...
@@ -176,7 +176,7 @@
padding-left: 12px;
padding-left: 12px;
border-left: transparent solid 1px;
border-left: transparent solid 1px;
cursor: pointer;
cursor: pointer;
transition: all 0.
4
s;
transition: all 0.
02
s;
&:hover {
&:hover {
color: @primary-color;
color: @primary-color;
...
@@ -203,6 +203,8 @@
...
@@ -203,6 +203,8 @@
overflow: hidden;
overflow: hidden;
background-color: #f0f0f0;
background-color: #f0f0f0;
transform-origin: left top;
transform-origin: left top;
transform: scale(1);
}
}
.containboxs {
.containboxs {
...
@@ -210,11 +212,10 @@
...
@@ -210,11 +212,10 @@
top: 0;
top: 0;
left: 100%;
left: 100%;
z-index: 1002;
z-index: 1002;
width: 0px;
height: 100%;
padding: 0px;
padding: 0px;
overflow: hidden;
overflow: hidden;
background-color: #f0f0f0;
background-color: #f0f0f0;
transform: scale(0);
transform-origin: left top;
transform-origin: left top;
}
}
}
}
...
@@ -229,7 +230,7 @@
...
@@ -229,7 +230,7 @@
line-height: @nav-header-height;
line-height: @nav-header-height;
line-height: 48px !important;
line-height: 48px !important;
background: #002140;
background: #002140;
transition: all 0.
3s
;
transition: all 0.
1s !important
;
img {
img {
display: inline-block;
display: inline-block;
height: 32px;
height: 32px;
...
@@ -280,26 +281,6 @@
...
@@ -280,26 +281,6 @@
}
}
}
}
}
}
&.light {
background-color: white;
box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
.logo {
height: 48px !important;
line-height: 48px !important;
background: white;
box-shadow: 1px 1px 0 0 @border-color-split;
h1 {
color: @primary-color;
}
}
:global(.ant-menu-light) {
border-right-color: transparent;
}
}
}
}
.icon {
.icon {
...
...
src/components/Tableform/mtable.jsx
View file @
212345b2
...
@@ -118,7 +118,7 @@ class Mtable extends PureComponent {
...
@@ -118,7 +118,7 @@ class Mtable extends PureComponent {
delete
newparams
.
pageSize
;
delete
newparams
.
pageSize
;
}
}
let
res
=
await
request
(
"/
me
s"
+
path
,
{
let
res
=
await
request
(
"/
wm
s"
+
path
,
{
body
:
JSON
.
stringify
(
newparams
?
newparams
:
{}),
body
:
JSON
.
stringify
(
newparams
?
newparams
:
{}),
headers
,
headers
,
method
:
"POST"
,
method
:
"POST"
,
...
...
src/global.less
View file @
212345b2
...
@@ -289,3 +289,10 @@ pre {
...
@@ -289,3 +289,10 @@ pre {
font-weight: normal !important;
font-weight: normal !important;
}
}
}
}
.ant-layout-header {
transition: all 200ms !important;
transition-timing-function: ease-out !important;
}
.ant-pro-global-header {
padding-left: 6px !important;
}
src/pages/system/Staff/fields.jsx
View file @
212345b2
...
@@ -22,23 +22,6 @@ export default {
...
@@ -22,23 +22,6 @@ export default {
name
:
[
"userName"
],
name
:
[
"userName"
],
required
:
true
,
required
:
true
,
},
},
gender
:
{
value
:
null
,
type
:
"select"
,
title
:
"性别"
,
name
:
[
"gender"
],
required
:
false
,
options
:
[
{
label
:
"男"
,
value
:
1
,
},
{
label
:
"女"
,
value
:
2
,
},
],
},
telephone
:
{
telephone
:
{
value
:
null
,
value
:
null
,
type
:
"input"
,
type
:
"input"
,
...
@@ -69,11 +52,11 @@ export default {
...
@@ -69,11 +52,11 @@ export default {
params
:
{},
params
:
{},
},
},
},
},
s
hop
IdList
:
{
s
tore
IdList
:
{
value
:
null
,
value
:
null
,
type
:
"select"
,
type
:
"select"
,
title
:
"负责车间"
,
title
:
"负责车间"
,
name
:
[
"s
hop
IdList"
],
name
:
[
"s
tore
IdList"
],
required
:
false
,
required
:
false
,
belinked
:
{
belinked
:
{
options
:
{
options
:
{
...
@@ -84,34 +67,6 @@ export default {
...
@@ -84,34 +67,6 @@ export default {
linked
:
true
,
linked
:
true
,
multiple
:
true
,
multiple
:
true
,
},
},
sectionIdList
:
{
value
:
null
,
type
:
"select"
,
title
:
"负责工段"
,
name
:
[
"sectionIdList"
],
required
:
false
,
belinked
:
{
options
:
{
database
:
sectionSelectByShops
,
params
:
{
shopIdList
:
"linked"
,
factoryId
:
"linked"
},
},
},
multiple
:
true
,
},
productionLineIdList
:
{
value
:
null
,
type
:
"select"
,
title
:
"负责产线"
,
name
:
[
"productionLineIdList"
],
required
:
false
,
belinked
:
{
options
:
{
database
:
productionLineSelectByShops
,
params
:
{
shopIdList
:
"linked"
,
factoryId
:
"linked"
},
},
},
multiple
:
true
,
},
roleIdList
:
{
roleIdList
:
{
value
:
null
,
value
:
null
,
type
:
"select"
,
type
:
"select"
,
...
@@ -149,47 +104,14 @@ export default {
...
@@ -149,47 +104,14 @@ export default {
span
:
12
,
span
:
12
,
},
},
},
},
academicCareer
:
{
remark
:
{
value
:
null
,
type
:
"input"
,
title
:
"学历"
,
name
:
[
"academicCareer"
],
required
:
false
,
col
:
{
span
:
12
,
},
},
university
:
{
value
:
null
,
type
:
"input"
,
title
:
"毕业院校"
,
name
:
[
"university"
],
required
:
false
,
col
:
{
span
:
12
,
},
},
major
:
{
value
:
null
,
type
:
"input"
,
title
:
"专业"
,
name
:
[
"major"
],
required
:
false
,
col
:
{
span
:
12
,
},
},
userImgList
:
{
value
:
null
,
value
:
null
,
type
:
"
upload
"
,
type
:
"
textarea
"
,
title
:
"
个人图片
"
,
title
:
"
备注
"
,
name
:
[
"
userImgList
"
],
name
:
[
"
remark
"
],
required
:
false
,
required
:
false
,
col
:
{
col
:
{
span
:
24
,
span
:
24
,
},
},
listType
:
"img"
,
multiple
:
false
,
limit
:
1
,
},
},
};
};
src/pages/system/Staff/index.jsx
View file @
212345b2
...
@@ -178,19 +178,9 @@ const Staff = (props) => {
...
@@ -178,19 +178,9 @@ const Staff = (props) => {
key
:
"departmentName"
,
key
:
"departmentName"
,
},
},
{
{
title
:
"负责车间"
,
title
:
"负责仓库"
,
dataIndex
:
"shopNames"
,
dataIndex
:
"chargeStoreName"
,
key
:
"shopNames"
,
key
:
"chargeStoreName"
,
},
{
title
:
"负责工段"
,
dataIndex
:
"sectionNames"
,
key
:
"sectionNames"
,
},
{
title
:
"负责产线"
,
dataIndex
:
"productionLines"
,
key
:
"productionLines"
,
},
},
{
{
...
...
src/services/craft.js
View file @
212345b2
...
@@ -2,7 +2,7 @@ import request from "@/utils/request";
...
@@ -2,7 +2,7 @@ import request from "@/utils/request";
//单位下拉框
//单位下拉框
export
async
function
unitSelect
(
params
)
{
export
async
function
unitSelect
(
params
)
{
return
request
(
`/
me
s/ngic-base-business/sysDic/querySelectListByParentKey`
,
{
return
request
(
`/
wm
s/ngic-base-business/sysDic/querySelectListByParentKey`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -10,7 +10,7 @@ export async function unitSelect(params) {
...
@@ -10,7 +10,7 @@ export async function unitSelect(params) {
//序列号规则
//序列号规则
export
async
function
serialNumberRuleSelect
(
params
)
{
export
async
function
serialNumberRuleSelect
(
params
)
{
return
request
(
return
request
(
`/
me
s/ngic-base-business/bmMainNumberRule/querySunSelectByNoTypeCode`
,
`/
wm
s/ngic-base-business/bmMainNumberRule/querySunSelectByNoTypeCode`
,
{
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
...
@@ -19,7 +19,7 @@ export async function serialNumberRuleSelect(params) {
...
@@ -19,7 +19,7 @@ export async function serialNumberRuleSelect(params) {
}
}
//工艺路线
//工艺路线
export
async
function
processLineSelect
(
params
)
{
export
async
function
processLineSelect
(
params
)
{
return
request
(
`/
me
s/ngic-workmanship/pmProcessLine/selectionBox`
,
{
return
request
(
`/
wm
s/ngic-workmanship/pmProcessLine/selectionBox`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -27,7 +27,7 @@ export async function processLineSelect(params) {
...
@@ -27,7 +27,7 @@ export async function processLineSelect(params) {
//工艺路线下的工序 下拉
//工艺路线下的工序 下拉
export
async
function
processByProcessLine
(
params
)
{
export
async
function
processByProcessLine
(
params
)
{
return
request
(
return
request
(
`/
me
s/ngic-workmanship/workingProcedure/query/selectbox/processLine`
,
`/
wm
s/ngic-workmanship/workingProcedure/query/selectbox/processLine`
,
{
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
...
@@ -37,7 +37,7 @@ export async function processByProcessLine(params) {
...
@@ -37,7 +37,7 @@ export async function processByProcessLine(params) {
//车间下的工序 下拉
//车间下的工序 下拉
export
async
function
workingProcedureByShop
(
params
)
{
export
async
function
workingProcedureByShop
(
params
)
{
return
request
(
return
request
(
`/
me
s/ngic-workmanship/workingProcedure/query/selectbox/shop`
,
`/
wm
s/ngic-workmanship/workingProcedure/query/selectbox/shop`
,
{
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
...
@@ -46,7 +46,7 @@ export async function workingProcedureByShop(params) {
...
@@ -46,7 +46,7 @@ export async function workingProcedureByShop(params) {
}
}
//物料工艺路线所属车间的工序 下拉
//物料工艺路线所属车间的工序 下拉
export
async
function
processByShop
(
params
)
{
export
async
function
processByShop
(
params
)
{
return
request
(
`/
me
s/ngic-workmanship/workingProcedure/query/selectbox`
,
{
return
request
(
`/
wm
s/ngic-workmanship/workingProcedure/query/selectbox`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -54,14 +54,14 @@ export async function processByShop(params) {
...
@@ -54,14 +54,14 @@ export async function processByShop(params) {
//产出物料编号-名称-单位 下拉
//产出物料编号-名称-单位 下拉
export
async
function
selectboxMaterie
(
params
)
{
export
async
function
selectboxMaterie
(
params
)
{
return
request
(
`/
me
s/ngic-workmanship/pmMaterie/query/selectboxMaterie`
,
{
return
request
(
`/
wm
s/ngic-workmanship/pmMaterie/query/selectboxMaterie`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//标签模板下拉
//标签模板下拉
export
async
function
bmTableSelect
(
params
)
{
export
async
function
bmTableSelect
(
params
)
{
return
request
(
`/
me
s/ngic-base-business/bmTable/querySelectByType`
,
{
return
request
(
`/
wm
s/ngic-base-business/bmTable/querySelectByType`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
...
src/services/login.js
View file @
212345b2
...
@@ -2,7 +2,7 @@ import request from "@/utils/request";
...
@@ -2,7 +2,7 @@ import request from "@/utils/request";
//登录
//登录
export
async
function
fakeAccountLogin
(
params
)
{
export
async
function
fakeAccountLogin
(
params
)
{
return
request
(
"/
me
s/ngic-auth/sysAccount/login"
,
{
return
request
(
"/
wm
s/ngic-auth/sysAccount/login"
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -10,7 +10,7 @@ export async function fakeAccountLogin(params) {
...
@@ -10,7 +10,7 @@ export async function fakeAccountLogin(params) {
//登出
//登出
export
async
function
fakeAccountLoginOut
(
params
)
{
export
async
function
fakeAccountLoginOut
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysAccount/logout`
,
{
return
request
(
`/
wm
s/ngic-auth/sysAccount/logout`
,
{
method
:
"POST"
,
method
:
"POST"
,
body
:
params
,
body
:
params
,
});
});
...
@@ -18,7 +18,7 @@ export async function fakeAccountLoginOut(params) {
...
@@ -18,7 +18,7 @@ export async function fakeAccountLoginOut(params) {
//个人信息
//个人信息
export
async
function
queryCurrentUser
(
params
)
{
export
async
function
queryCurrentUser
(
params
)
{
return
request
(
"/
me
s/ngic-auth/sysUser/query"
,
{
return
request
(
"/
wm
s/ngic-auth/sysUser/query"
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -26,7 +26,7 @@ export async function queryCurrentUser(params) {
...
@@ -26,7 +26,7 @@ export async function queryCurrentUser(params) {
//获取菜单/权限/菜单/公司类型
//获取菜单/权限/菜单/公司类型
export
async
function
getMenu
(
params
)
{
export
async
function
getMenu
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysPermission/queryMenu`
,
{
return
request
(
`/
wm
s/ngic-auth/sysPermission/queryMenu`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -34,7 +34,7 @@ export async function getMenu(params) {
...
@@ -34,7 +34,7 @@ export async function getMenu(params) {
/*---------------菜单收藏-------------------*/
/*---------------菜单收藏-------------------*/
export
async
function
collectPerms
(
params
)
{
export
async
function
collectPerms
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysUserPermission/collectPerm`
,
{
return
request
(
`/
wm
s/ngic-auth/sysUserPermission/collectPerm`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -42,14 +42,14 @@ export async function collectPerms(params) {
...
@@ -42,14 +42,14 @@ export async function collectPerms(params) {
/*---------------取消菜单收藏-------------------*/
/*---------------取消菜单收藏-------------------*/
export
async
function
cancelCollectPerms
(
params
)
{
export
async
function
cancelCollectPerms
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysUserPermission/cancelCollectPerm`
,
{
return
request
(
`/
wm
s/ngic-auth/sysUserPermission/cancelCollectPerm`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
/*---------------菜单历史记录-------------------*/
/*---------------菜单历史记录-------------------*/
export
async
function
mtosave
(
params
)
{
export
async
function
mtosave
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysUserVisitPermission/save`
,
{
return
request
(
`/
wm
s/ngic-auth/sysUserVisitPermission/save`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
...
src/services/platform.js
View file @
212345b2
...
@@ -2,20 +2,20 @@ import request from "@/utils/request";
...
@@ -2,20 +2,20 @@ import request from "@/utils/request";
//查询编号类型下拉框(去除已存在的没有子类的类型)
//查询编号类型下拉框(去除已存在的没有子类的类型)
export
async
function
bmNoType
(
params
)
{
export
async
function
bmNoType
(
params
)
{
return
request
(
`/
me
s/ngic-base-business/bmNoType/querySelect`
,
{
return
request
(
`/
wm
s/ngic-base-business/bmNoType/querySelect`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//查询编号类型下拉框全部
//查询编号类型下拉框全部
export
async
function
bmNoTypeAll
(
params
)
{
export
async
function
bmNoTypeAll
(
params
)
{
return
request
(
`/
me
s/ngic-base-business/bmNoType/querySelectAll`
,
{
return
request
(
`/
wm
s/ngic-base-business/bmNoType/querySelectAll`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
export
async
function
bmNoRule
(
params
)
{
export
async
function
bmNoRule
(
params
)
{
return
request
(
`/
me
s/ngic-base-business/bmNoRule/querySelect`
,
{
return
request
(
`/
wm
s/ngic-base-business/bmNoRule/querySelect`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -23,7 +23,7 @@ export async function bmNoRule(params) {
...
@@ -23,7 +23,7 @@ export async function bmNoRule(params) {
//根据表单id查询条件下拉框
//根据表单id查询条件下拉框
export
async
function
paFormConditionSelect
(
params
)
{
export
async
function
paFormConditionSelect
(
params
)
{
return
request
(
return
request
(
`/
me
s/ngic-base-business/paFormCondition/querySelectByFormId`
,
`/
wm
s/ngic-base-business/paFormCondition/querySelectByFormId`
,
{
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
...
@@ -33,7 +33,7 @@ export async function paFormConditionSelect(params) {
...
@@ -33,7 +33,7 @@ export async function paFormConditionSelect(params) {
//根据条件id查询条件值的下拉框
//根据条件id查询条件值的下拉框
export
async
function
queryConValueSelect
(
params
)
{
export
async
function
queryConValueSelect
(
params
)
{
return
request
(
return
request
(
`/
me
s/ngic-base-business/paFormCondition/queryConValueSelectByconId`
,
`/
wm
s/ngic-base-business/paFormCondition/queryConValueSelectByconId`
,
{
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
...
@@ -42,7 +42,7 @@ export async function queryConValueSelect(params) {
...
@@ -42,7 +42,7 @@ export async function queryConValueSelect(params) {
}
}
//标签模板
//标签模板
export
async
function
bmTableFileSelect
(
params
)
{
export
async
function
bmTableFileSelect
(
params
)
{
return
request
(
`/
me
s/ngic-base-business/bmTableFile/querySelect`
,
{
return
request
(
`/
wm
s/ngic-base-business/bmTableFile/querySelect`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
...
src/services/system.js
View file @
212345b2
...
@@ -2,21 +2,21 @@ import request from "@/utils/request";
...
@@ -2,21 +2,21 @@ import request from "@/utils/request";
//工厂下拉框
//工厂下拉框
export
async
function
factorySelect
(
params
)
{
export
async
function
factorySelect
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysFactory/selectionBox`
,
{
return
request
(
`/
wm
s/ngic-auth/sysFactory/selectionBox`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//查询个人所属工厂下拉框
//查询个人所属工厂下拉框
export
async
function
factorySelectByuser
(
params
)
{
export
async
function
factorySelectByuser
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysFactory/selectionBoxU`
,
{
return
request
(
`/
wm
s/ngic-auth/sysFactory/selectionBoxU`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//查询工厂下拉框---注册
//查询工厂下拉框---注册
export
async
function
factorySelectRegister
(
params
)
{
export
async
function
factorySelectRegister
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysFactory/selectionBoxAll`
,
{
return
request
(
`/
wm
s/ngic-auth/sysFactory/selectionBoxAll`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -24,7 +24,7 @@ export async function factorySelectRegister(params) {
...
@@ -24,7 +24,7 @@ export async function factorySelectRegister(params) {
//全部车间下拉框
//全部车间下拉框
export
async
function
shopSelect
(
params
)
{
export
async
function
shopSelect
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysShop/selectionBox`
,
{
return
request
(
`/
wm
s/ngic-auth/sysShop/selectionBox`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -32,77 +32,77 @@ export async function shopSelect(params) {
...
@@ -32,77 +32,77 @@ export async function shopSelect(params) {
//根据工厂id查询车间下拉
//根据工厂id查询车间下拉
export
async
function
shopSelectByFactory
(
params
)
{
export
async
function
shopSelectByFactory
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysShop/query/selectbox/factory`
,
{
return
request
(
`/
wm
s/ngic-auth/sysShop/query/selectbox/factory`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//根据车间id查询产线下拉
//根据车间id查询产线下拉
export
async
function
productionLineSelectByShop
(
params
)
{
export
async
function
productionLineSelectByShop
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysProductionLine/query/selectbox/shopId`
,
{
return
request
(
`/
wm
s/ngic-auth/sysProductionLine/query/selectbox/shopId`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//根据车间id集合查询产线下拉
//根据车间id集合查询产线下拉
export
async
function
productionLineSelectByShops
(
params
)
{
export
async
function
productionLineSelectByShops
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysProductionLine/query/selectbox/shopIds`
,
{
return
request
(
`/
wm
s/ngic-auth/sysProductionLine/query/selectbox/shopIds`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//根据车间id查询工段下拉
//根据车间id查询工段下拉
export
async
function
sectionSelectByShop
(
params
)
{
export
async
function
sectionSelectByShop
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysSection/query/selectbox/shopId`
,
{
return
request
(
`/
wm
s/ngic-auth/sysSection/query/selectbox/shopId`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//根据车间id集合查询工段下拉
//根据车间id集合查询工段下拉
export
async
function
sectionSelectByShops
(
params
)
{
export
async
function
sectionSelectByShops
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysSection/query/selectbox/shopIds`
,
{
return
request
(
`/
wm
s/ngic-auth/sysSection/query/selectbox/shopIds`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//授权前查询权限树
//授权前查询权限树
export
async
function
roleTree
(
params
)
{
export
async
function
roleTree
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysRolePermission/queryAll`
,
{
return
request
(
`/
wm
s/ngic-auth/sysRolePermission/queryAll`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//角色下权限数据
//角色下权限数据
export
async
function
adminDataqueryAll
(
params
)
{
export
async
function
adminDataqueryAll
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysRoleDataPermission/queryAll`
,
{
return
request
(
`/
wm
s/ngic-auth/sysRoleDataPermission/queryAll`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//不包含自己在内的全部用户下拉框
//不包含自己在内的全部用户下拉框
export
async
function
userSelect
(
params
)
{
export
async
function
userSelect
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysUser/queryParentSelectionByUserId`
,
{
return
request
(
`/
wm
s/ngic-auth/sysUser/queryParentSelectionByUserId`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//全部用户下拉框
//全部用户下拉框
export
async
function
allUserSelect
(
params
)
{
export
async
function
allUserSelect
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysUser/query/selectbox/company`
,
{
return
request
(
`/
wm
s/ngic-auth/sysUser/query/selectbox/company`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//根据工厂id查询树结构
//根据工厂id查询树结构
export
async
function
departmentTree
(
params
)
{
export
async
function
departmentTree
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysDepartment/query/tree`
,
{
return
request
(
`/
wm
s/ngic-auth/sysDepartment/query/tree`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//查询角色下拉框
//查询角色下拉框
export
async
function
roleSelect
(
params
)
{
export
async
function
roleSelect
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysRole/queryAllSelectList`
,
{
return
request
(
`/
wm
s/ngic-auth/sysRole/queryAllSelectList`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -110,14 +110,14 @@ export async function roleSelect(params) {
...
@@ -110,14 +110,14 @@ export async function roleSelect(params) {
//查询角色下拉框---注册
//查询角色下拉框---注册
export
async
function
roleSelectRegister
(
params
)
{
export
async
function
roleSelectRegister
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysRole/queryAllSelectByComId`
,
{
return
request
(
`/
wm
s/ngic-auth/sysRole/queryAllSelectByComId`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
}
}
//查询全部编号类型下拉框(登录人公司)
//查询全部编号类型下拉框(登录人公司)
export
async
function
bmNoRule
(
params
)
{
export
async
function
bmNoRule
(
params
)
{
return
request
(
`/
me
s/ngic-base-business/bmNoRule/querySelect`
,
{
return
request
(
`/
wm
s/ngic-base-business/bmNoRule/querySelect`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -125,7 +125,7 @@ export async function bmNoRule(params) {
...
@@ -125,7 +125,7 @@ export async function bmNoRule(params) {
//根据物料查询产线下拉框
//根据物料查询产线下拉框
export
async
function
productionLineSelectByMaterieId
(
params
)
{
export
async
function
productionLineSelectByMaterieId
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysProductionLine/query/selectbox/materieId`
,
{
return
request
(
`/
wm
s/ngic-auth/sysProductionLine/query/selectbox/materieId`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -133,7 +133,7 @@ export async function productionLineSelectByMaterieId(params) {
...
@@ -133,7 +133,7 @@ export async function productionLineSelectByMaterieId(params) {
//根据物料查询班组下拉框
//根据物料查询班组下拉框
export
async
function
groupSelectByMaterieId
(
params
)
{
export
async
function
groupSelectByMaterieId
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysGroup/query/selectbox/materieId`
,
{
return
request
(
`/
wm
s/ngic-auth/sysGroup/query/selectbox/materieId`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -141,7 +141,7 @@ export async function groupSelectByMaterieId(params) {
...
@@ -141,7 +141,7 @@ export async function groupSelectByMaterieId(params) {
//根据物料查询班次下拉框
//根据物料查询班次下拉框
export
async
function
shiftSelectByMaterieId
(
params
)
{
export
async
function
shiftSelectByMaterieId
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysShift/query/selectbox/materieId`
,
{
return
request
(
`/
wm
s/ngic-auth/sysShift/query/selectbox/materieId`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
@@ -149,7 +149,7 @@ export async function shiftSelectByMaterieId(params) {
...
@@ -149,7 +149,7 @@ export async function shiftSelectByMaterieId(params) {
//根据车间id查询班次下拉框
//根据车间id查询班次下拉框
export
async
function
shiftSelectByShopId
(
params
)
{
export
async
function
shiftSelectByShopId
(
params
)
{
return
request
(
`/
me
s/ngic-auth/sysShift/query/selectbox/shopId`
,
{
return
request
(
`/
wm
s/ngic-auth/sysShift/query/selectbox/shopId`
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
...
src/utils/doFetch.js
View file @
212345b2
...
@@ -8,7 +8,7 @@ export async function postFetch({ url, params }) {
...
@@ -8,7 +8,7 @@ export async function postFetch({ url, params }) {
});
});
}
}
export
async
function
doFetch
({
url
,
params
})
{
export
async
function
doFetch
({
url
,
params
})
{
return
request
(
"/
me
s"
+
url
,
{
return
request
(
"/
wm
s"
+
url
,
{
method
:
"POST"
,
method
:
"POST"
,
data
:
params
,
data
:
params
,
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment