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
1857523c
Commit
1857523c
authored
Jun 28, 2022
by
wuhao
🎯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asder
parent
f5342041
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
17 additions
and
17 deletions
+17
-17
Welcome.jsx
src/pages/Welcome.jsx
+1
-1
fields.js
src/pages/platform/Sendset/fields.js
+1
-1
index.jsx
src/pages/platform/Sendset/index.jsx
+1
-1
Index.jsx
src/pages/schedule/Shiftgroup/Index.jsx
+2
-2
index.jsx
src/pages/system/Charactor/index.jsx
+1
-1
Index.jsx
src/pages/system/Jiagou/Index.jsx
+2
-2
fields.jsx
src/pages/system/Staff/fields.jsx
+1
-1
index.jsx
src/pages/user/Login/index.jsx
+4
-4
system.js
src/services/system.js
+1
-1
detailTotalCard.js
src/utils/detailTotalCard.js
+3
-3
No files found.
src/pages/Welcome.jsx
View file @
1857523c
...
...
@@ -53,7 +53,7 @@ function Table({ route }) {
"search": false
},
{
"title": "
部门
名称",
"title": "
组织
名称",
"dataIndex": "departmentName",
"key": "departmentName"
},
...
...
src/pages/platform/Sendset/fields.js
View file @
1857523c
...
...
@@ -52,7 +52,7 @@ const addFields = {
"value"
:
2
},
{
"label"
:
"
部门
"
,
"label"
:
"
组织
"
,
"value"
:
3
},
{
...
...
src/pages/platform/Sendset/index.jsx
View file @
1857523c
...
...
@@ -237,7 +237,7 @@ const Pushdeploy = (props) => {
"value"
:
2
},
{
"label"
:
"
部门
"
,
"label"
:
"
组织
"
,
"value"
:
3
},
{
...
...
src/pages/schedule/Shiftgroup/Index.jsx
View file @
1857523c
...
...
@@ -185,7 +185,7 @@ const Shiftgroup = (props) => {
key
:
"userName"
,
},
{
title
:
"
部门
"
,
title
:
"
组织
"
,
dataIndex
:
"departmentName"
,
key
:
"departmentName"
,
search
:
false
,
...
...
@@ -217,7 +217,7 @@ const Shiftgroup = (props) => {
search
:
false
,
},
{
title
:
"
部门
"
,
title
:
"
组织
"
,
dataIndex
:
"departmentName"
,
key
:
"departmentName"
,
search
:
false
,
...
...
src/pages/system/Charactor/index.jsx
View file @
1857523c
...
...
@@ -150,7 +150,7 @@ const Charactor = (props) => {
key
:
"factoryName"
,
},
{
title
:
"
部门
"
,
title
:
"
组织
"
,
dataIndex
:
"departmentName"
,
key
:
"departmentName"
,
},
...
...
src/pages/system/Jiagou/Index.jsx
View file @
1857523c
...
...
@@ -34,7 +34,7 @@ function reducer(state, action) {
...
state
,
vs
:
true
,
iftype
:
{
title
:
`新增
${
action
.
curitem
.
title
}
下的
部门
`
,
title
:
`新增
${
action
.
curitem
.
title
}
下的
组织
`
,
val
:
type
,
},
fields
:
{
...
action
.
fields
},
...
...
@@ -96,7 +96,7 @@ const Jiagou = (props) => {
dataIndex
:
"departmentType"
,
key
:
"departmentType"
,
render
:
(
text
,
record
)
=>
(
<
span
>
{
record
.
departmentType
==
0
?
"集团类型"
:
"
部门
类型"
}
</
span
>
<
span
>
{
record
.
departmentType
==
0
?
"集团类型"
:
"
组织
类型"
}
</
span
>
),
search
:
false
,
},
...
...
src/pages/system/Staff/fields.jsx
View file @
1857523c
...
...
@@ -32,7 +32,7 @@ export default {
departmentId
:
{
value
:
null
,
type
:
"treeselect"
,
title
:
"
部门
"
,
title
:
"
组织
"
,
name
:
[
"departmentId"
],
required
:
true
,
options
:
{
...
...
src/pages/user/Login/index.jsx
View file @
1857523c
...
...
@@ -216,7 +216,7 @@ const Login = () => {
"key"
:
"auditResultName"
},
{
"title"
:
"
这是
审批意见"
,
"title"
:
"审批意见"
,
"dataIndex"
:
"auditOpinion"
,
"key"
:
"auditOpinion"
},
...
...
@@ -410,8 +410,8 @@ const Login = () => {
<
Col
span=
{
8
}
>
<
ProFormTreeSelect
name=
"departmentId"
label=
{
<
b
>
部门
</
b
>
}
placeholder=
"请选择
部门
"
label=
{
<
b
>
组织
</
b
>
}
placeholder=
"请选择
组织
"
fieldProps=
{
{
fieldNames
:
{
label
:
"title"
,
...
...
@@ -426,7 +426,7 @@ const Login = () => {
rules=
{
[
{
required
:
true
,
message
:
"请选择
部门
!"
,
message
:
"请选择
组织
!"
,
}
]
}
/>
...
...
src/services/system.js
View file @
1857523c
...
...
@@ -43,7 +43,7 @@ export async function storeselectionBox(params) {
data
:
params
,
});
}
//全部
部门
下拉
//全部
组织
下拉
export
async
function
allDepartment
(
params
)
{
return
request
(
`/wms/ngic-auth/sysDepartment/query/selectbox/depart`
,
{
method
:
'POST'
,
...
...
src/utils/detailTotalCard.js
View file @
1857523c
...
...
@@ -232,7 +232,7 @@ const userDetails = [
key
:
"factoryName"
,
},
{
title
:
"
部门
"
,
title
:
"
组织
"
,
key
:
"departmentName"
,
},
{
...
...
@@ -365,7 +365,7 @@ const userCheckDetails = [
key
:
"factoryName"
,
},
{
title
:
"
部门
"
,
title
:
"
组织
"
,
key
:
"departmentName"
,
},
{
...
...
@@ -712,7 +712,7 @@ const shiftgroupDetail = [
search
:
false
,
},
{
title
:
"
部门
"
,
title
:
"
组织
"
,
dataIndex
:
"departmentName"
,
key
:
"departmentName"
,
search
:
false
,
...
...
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