Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
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
周远喜
mes-ui
Commits
2e4f3489
Commit
2e4f3489
authored
Sep 22, 2020
by
renjintao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
process
parent
9eddae69
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1046 additions
and
998 deletions
+1046
-998
baseColums.js
pages/import/baseColums.js
+37
-10
process.vue
pages/import/process.vue
+1009
-988
No files found.
pages/import/baseColums.js
View file @
2e4f3489
...
...
@@ -135,16 +135,40 @@ export default {
},
columns1
()
{
let
col1
=
[{
key
:
"
userN
ame"
,
title
:
this
.
l
(
"userN
ame"
),
key
:
"
n
ame"
,
title
:
this
.
l
1
(
"n
ame"
),
align
:
"left"
,
},
{
key
:
"status"
,
title
:
this
.
l
(
"status"
),
align
:
"center"
,
code
:
"User.base.status"
,
key
:
"parent_Id"
,
title
:
this
.
l1
(
"parent_Id"
),
align
:
"left"
,
hide
:
true
,
parentDepart
:
true
,
import
:
true
,
},
{
key
:
"code"
,
title
:
this
.
l1
(
"code"
),
align
:
"left"
,
},
{
key
:
"location"
,
title
:
this
.
l1
(
"location"
),
align
:
"left"
,
location
:
true
,
import
:
true
,
},
{
key
:
"property"
,
title
:
this
.
l1
(
"property"
),
align
:
"left"
,
code
:
"department.property"
,
},
{
key
:
"creationTime"
,
title
:
this
.
l1
(
"creationTime"
),
align
:
"left"
,
},
]
return
col1
...
...
@@ -629,6 +653,10 @@ export default {
key
=
"user"
+
"."
+
key
;
return
i18n
.
t
(
key
);
},
l1
(
key
)
{
key
=
"DipartLocation"
+
"."
+
key
;
return
i18n
.
t
(
key
);
},
l2
(
key
)
{
key
=
"resource"
+
"."
+
key
;
return
i18n
.
t
(
key
);
...
...
@@ -645,8 +673,7 @@ export default {
key
=
"product_info"
+
"."
+
key
;
return
i18n
.
t
(
key
);
},
test
()
{
ViewUI
.
Message
.
error
(
"terterer"
)
test
()
{
ViewUI
.
Message
.
error
(
"terterer"
)
}
}
\ No newline at end of file
pages/import/process.vue
View file @
2e4f3489
This diff is collapsed.
Click to expand it.
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