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
d7a88dab
Commit
d7a88dab
authored
Apr 03, 2020
by
renjintao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
material
parent
6398c4f9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
18 deletions
+16
-18
inventory.vue
pages/resource/material/placode/inventory.vue
+5
-6
inventory.vue
pages/resource/material/powder/inventory.vue
+6
-6
inventory.vue
pages/resource/material/scraper/inventory.vue
+5
-6
No files found.
pages/resource/material/placode/inventory.vue
View file @
d7a88dab
...
@@ -29,8 +29,7 @@
...
@@ -29,8 +29,7 @@
<Row>
<Row>
<Col
span=
"12"
>
<Col
span=
"12"
>
<FormItem
:label=
"l('creator')"
>
<FormItem
:label=
"l('creator')"
>
<User
:value=
"entity.creator"
></User>
<User
:value=
"creatorUserId"
></User>
<label
slot=
"append"
v-if=
"false"
>
{{entity.creatorUserId}}
</label>
</FormItem>
</FormItem>
</Col>
</Col>
<Col
span=
"12"
>
<Col
span=
"12"
>
...
@@ -189,8 +188,8 @@ export default {
...
@@ -189,8 +188,8 @@ export default {
objList
.
storeId
=
data
.
storeId
objList
.
storeId
=
data
.
storeId
objList
.
storeTitle
=
data
.
storeTitle
objList
.
storeTitle
=
data
.
storeTitle
objList
.
materialType
=
2
objList
.
materialType
=
2
objList
.
creator
=
this
.
entity
.
creator
objList
.
creator
=
this
.
creator
objList
.
creatorUserId
=
this
.
entity
.
creatorUserId
objList
.
creatorUserId
=
this
.
creatorUserId
this
.
listUp
.
push
(
objList
)
this
.
listUp
.
push
(
objList
)
}
}
})
})
...
@@ -201,8 +200,8 @@ export default {
...
@@ -201,8 +200,8 @@ export default {
storeTitle
:
this
.
conditions
.
storeTitle
.
value
,
storeTitle
:
this
.
conditions
.
storeTitle
.
value
,
remark
:
this
.
entity
.
remark
,
remark
:
this
.
entity
.
remark
,
materialType
:
2
,
materialType
:
2
,
creator
:
this
.
entity
.
creator
,
creator
:
this
.
creator
,
creatorUserId
:
this
.
entity
.
creatorUserId
creatorUserId
:
this
.
creatorUserId
},
},
item
:
this
.
listUp
item
:
this
.
listUp
}
}
...
...
pages/resource/material/powder/inventory.vue
View file @
d7a88dab
...
@@ -29,8 +29,7 @@
...
@@ -29,8 +29,7 @@
<Row>
<Row>
<Col
span=
"12"
>
<Col
span=
"12"
>
<FormItem
:label=
"l('creator')"
>
<FormItem
:label=
"l('creator')"
>
<User
:value=
"entity.creator"
></User>
<User
:value=
"creatorUserId"
></User>
<label
slot=
"append"
v-if=
"false"
>
{{entity.creatorUserId}}
</label>
</FormItem>
</FormItem>
</Col>
</Col>
<Col
span=
"12"
>
<Col
span=
"12"
>
...
@@ -167,6 +166,7 @@ export default {
...
@@ -167,6 +166,7 @@ export default {
created
()
{
created
()
{
this
.
creator
=
this
.
$store
.
state
.
userInfo
.
name
this
.
creator
=
this
.
$store
.
state
.
userInfo
.
name
this
.
creatorUserId
=
this
.
$store
.
state
.
userInfo
.
userId
this
.
creatorUserId
=
this
.
$store
.
state
.
userInfo
.
userId
alert
(
this
.
creatorUserId
)
},
},
methods
:
{
methods
:
{
handleSubmit
()
{
handleSubmit
()
{
...
@@ -181,8 +181,8 @@ export default {
...
@@ -181,8 +181,8 @@ export default {
objList
.
storeId
=
data
.
storeId
objList
.
storeId
=
data
.
storeId
objList
.
storeTitle
=
data
.
storeTitle
objList
.
storeTitle
=
data
.
storeTitle
objList
.
materialType
=
1
objList
.
materialType
=
1
objList
.
creator
=
this
.
entity
.
creator
objList
.
creator
=
this
.
creator
objList
.
creatorUserId
=
this
.
entity
.
creatorUserId
objList
.
creatorUserId
=
this
.
creatorUserId
this
.
listUp
.
push
(
objList
)
this
.
listUp
.
push
(
objList
)
}
}
})
})
...
@@ -193,8 +193,8 @@ export default {
...
@@ -193,8 +193,8 @@ export default {
storeTitle
:
this
.
conditions
.
storeTitle
.
value
,
storeTitle
:
this
.
conditions
.
storeTitle
.
value
,
remark
:
this
.
entity
.
remark
,
remark
:
this
.
entity
.
remark
,
materialType
:
1
,
materialType
:
1
,
creator
:
this
.
entity
.
creator
,
creator
:
this
.
creator
,
creatorUserId
:
this
.
entity
.
creatorUserId
creatorUserId
:
this
.
creatorUserId
},
},
item
:
this
.
listUp
item
:
this
.
listUp
}
}
...
...
pages/resource/material/scraper/inventory.vue
View file @
d7a88dab
...
@@ -29,8 +29,7 @@
...
@@ -29,8 +29,7 @@
<Row>
<Row>
<Col
span=
"12"
>
<Col
span=
"12"
>
<FormItem
:label=
"l('creator')"
>
<FormItem
:label=
"l('creator')"
>
<User
:value=
"entity.creator"
></User>
<User
:value=
"creatorUserId"
></User>
<label
slot=
"append"
v-if=
"false"
>
{{entity.creatorUserId}}
</label>
</FormItem>
</FormItem>
</Col>
</Col>
<Col
span=
"12"
>
<Col
span=
"12"
>
...
@@ -182,8 +181,8 @@ export default {
...
@@ -182,8 +181,8 @@ export default {
objList
.
storeId
=
data
.
storeId
objList
.
storeId
=
data
.
storeId
objList
.
storeTitle
=
data
.
storeTitle
objList
.
storeTitle
=
data
.
storeTitle
objList
.
materialType
=
3
objList
.
materialType
=
3
objList
.
creator
=
this
.
entity
.
creator
objList
.
creator
=
this
.
creator
objList
.
creatorUserId
=
this
.
entity
.
creatorUserId
objList
.
creatorUserId
=
this
.
creatorUserId
this
.
listUp
.
push
(
objList
)
this
.
listUp
.
push
(
objList
)
}
}
})
})
...
@@ -194,8 +193,8 @@ export default {
...
@@ -194,8 +193,8 @@ export default {
storeTitle
:
this
.
conditions
.
storeTitle
.
value
,
storeTitle
:
this
.
conditions
.
storeTitle
.
value
,
remark
:
this
.
entity
.
remark
,
remark
:
this
.
entity
.
remark
,
materialType
:
3
,
materialType
:
3
,
creator
:
this
.
entity
.
creator
,
creator
:
this
.
creator
,
creatorUserId
:
this
.
entity
.
creatorUserId
creatorUserId
:
this
.
creatorUserId
},
},
item
:
this
.
listUp
item
:
this
.
listUp
}
}
...
...
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