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
006fbe8a
Commit
006fbe8a
authored
Sep 17, 2020
by
仇晓婷
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'product' of
http://git.mes123.com/zhouyx/mes-ui
into product
parents
b40a73e5
3ef40bd6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
668 additions
and
747 deletions
+668
-747
baseColums.js
pages/import/baseColums.js
+652
-0
process.vue
pages/import/process.vue
+14
-740
index.vue
pages/technology/productMix/product/index.vue
+2
-7
No files found.
pages/import/baseColums.js
0 → 100644
View file @
006fbe8a
This diff is collapsed.
Click to expand it.
pages/import/process.vue
View file @
006fbe8a
This diff is collapsed.
Click to expand it.
pages/technology/productMix/product/index.vue
View file @
006fbe8a
...
...
@@ -119,13 +119,11 @@ export default {
{
title
:
this
.
l
(
"name"
),
key
:
"name"
,
align
:
"left"
,
},
{
key
:
"mmcode"
,
title
:
this
.
l
(
"mmcode"
),
align
:
"center"
,
high
:
true
,
},
{
...
...
@@ -170,20 +168,18 @@ export default {
{
key
:
"drawingNo"
,
title
:
this
.
l
(
"drawingNo"
),
align
:
"right"
,
high
:
true
,
},
{
key
:
"madeCompanyTitle"
,
title
:
this
.
l
(
"madeCompanyTitle"
),
align
:
"center"
,
width
:
260
,
high
:
true
,
},
{
key
:
"madeCompany"
,
title
:
this
.
l
(
"madeCompany"
),
align
:
"
center
"
,
align
:
"
right
"
,
width
:
260
,
high
:
true
,
hide
:
true
,
...
...
@@ -192,7 +188,6 @@ export default {
{
key
:
"version"
,
title
:
this
.
l
(
"version"
),
align
:
"center"
,
width
:
260
,
high
:
true
,
hide
:
true
,
...
...
@@ -201,7 +196,7 @@ export default {
{
key
:
"materialId"
,
title
:
this
.
l
(
"materialId"
),
align
:
"
center
"
,
align
:
"
right
"
,
width
:
260
,
high
:
true
,
hide
:
true
,
...
...
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