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
0f55ac5a
Commit
0f55ac5a
authored
Jul 17, 2020
by
周远喜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ok
parent
f2068c4b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
7 deletions
+13
-7
dataGrid.vue
components/page/dataGrid.vue
+1
-1
options.vue
pages/aps/aps/options.vue
+1
-1
index.vue
pages/aps/plan/index.vue
+11
-5
No files found.
components/page/dataGrid.vue
View file @
0f55ac5a
...
...
@@ -272,7 +272,7 @@ export default {
if
(
this
.
lazy
==
true
)
{
return
;
}
if
(
this
.
userId
>
0
)
{
if
(
this
.
userId
>
0
&&
this
.
set
)
{
this
.
loadUserConfig
();
}
else
{
this
.
easySearch
();
...
...
pages/aps/aps/options.vue
View file @
0f55ac5a
...
...
@@ -353,7 +353,7 @@ export default {
partTaskPk
:
this
.
row
.
part_task_pk
,
opTaskPk
:
this
.
row
.
op_task_pk
,
taskSeq
:
this
.
row
.
task_seq
,
flog
:
5
,
//参数应用范围
flog
:
0
,
//参数应用范围
calId
:
-
1
,
planState
:
this
.
row
.
plan_method
==
"平行"
,
planMethod
:
this
.
row
.
plan_method
,
// 平行 重叠
...
...
pages/aps/plan/index.vue
View file @
0f55ac5a
...
...
@@ -38,7 +38,7 @@
type=
"info"
v-if=
"showAi"
>
<a
href=
"javascript:;"
>
智能排产
</a>
<a>
智能排产
</a>
</Badge>
<Badge
:count=
"this.$store.state.countAll"
...
...
@@ -47,16 +47,17 @@
type=
"info"
v-if=
"showAll"
>
<a
href=
"javascript:;"
@
click=
"goCemplate"
>
整机排产
</a>
<a
@
click=
"goCemplate"
>
整机排产
</a>
</Badge>
<Badge
:count=
"this.$store.state.countRun"
overflow-count=
"99"
type=
"info"
v-if=
"showRun"
>
<a
href=
"javascript:;"
@
click=
"goStream"
>
流水排产
</a>
<a
@
click=
"goStream"
>
流水排产
</a>
</Badge>
</
template
>
<
template
slot=
"searchForm"
>
<Search
/>
</
template
>
<
template
slot=
"buttons"
></
template
>
<
template
slot=
"buttons"
>
</
template
>
</DataGrid>
<FooterToolbar
extra
v-if=
"footerBar"
>
<Row>
...
...
@@ -148,6 +149,8 @@ export default {
curId
:
0
,
columns
:
[
{
key
:
"selection"
,
title
:
'#'
,
type
:
"selection"
,
width
:
70
,
align
:
"center"
...
...
@@ -562,7 +565,10 @@ export default {
name
:
"aps-stream"
});
},
add
(){
this
.
addModal
=
true
;
},
addOk
()
{
this
.
$refs
.
grid
.
load
();
this
.
addModal
=
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