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
432df91c
Commit
432df91c
authored
Oct 15, 2020
by
renjintao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aps/首选资源
parent
832e28b3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
3 deletions
+39
-3
zh-CN.js
i18n/locale/zh-CN.js
+1
-0
excute.vue
pages/aps/aps/components/excute.vue
+38
-3
No files found.
i18n/locale/zh-CN.js
View file @
432df91c
...
...
@@ -1108,6 +1108,7 @@ export default {
efficiency_value
:
'效率系数'
,
singleout
:
'单件产出'
,
first_equip
:
'首选资源'
,
firsT_EQUIP_CODE
:
'首选资源编号'
,
equip_type
:
'设备类型'
,
cal_id
:
'连班策略'
,
machine_rule
:
'设备优先规则'
,
...
...
pages/aps/aps/components/excute.vue
View file @
432df91c
...
...
@@ -144,8 +144,9 @@ export default {
key
:
"firsT_EQUIP_CODE"
,
title
:
this
.
l
(
"first_equip"
),
align
:
"left"
,
easy
:
true
,
high
:
true
render
:
(
h
,
params
)
=>
{
//test:PCZYBZBH_20200804_1 params.row.firsT_EQUIP_CODE
return
h
(
"span"
,
{},
this
.
getResourceName
(
params
.
row
.
firsT_EQUIP_CODE
))
}
},
{
key
:
"setup_time"
,
...
...
@@ -366,7 +367,9 @@ export default {
count
:
0
//生产计划数量
},
//设置参数结束
rowData
:
{}
//编辑时传入行数据
rowData
:
{},
//编辑时传入行数据
resources
:
[],
types
:
[],
};
},
mounted
()
{
...
...
@@ -378,6 +381,10 @@ export default {
})
{
await
store
.
dispatch
(
"loadDictionary"
);
// 加载数据字典
},
created
()
{
this
.
types
=
this
.
$store
.
getters
.
dictionaryByKey
(
"aps.resource.type"
);
this
.
getResource
();
},
methods
:
{
//根据点击副组件传过来id进行加载数据
loadData
(
expendId
)
{
...
...
@@ -499,6 +506,34 @@ export default {
this
.
deletedlModal
=
false
;
this
.
insertlModal
=
false
;
},
getResourceName
(
code
)
{
let
name
=
""
let
resources
=
this
.
$u
.
clone
(
this
.
resources
);
if
(
code
&&
code
!=
''
)
{
resources
.
forEach
(
e
=>
{
if
(
e
.
code
==
code
)
{
let
type
=
e
.
type
this
.
types
.
forEach
(
el
=>
{
if
(
type
&&
type
!=
''
&&
el
.
code
==
e
.
type
)
{
name
=
el
.
name
+
"/"
+
e
.
title
}
})
}
})
}
return
name
;
},
getResource
()
{
let
url
=
`
${
systemUrl
}
/planresource/list`
;
let
name
=
""
this
.
$api
.
post
(
url
,
{
pageSize
:
2000
})
.
then
(
r
=>
{
this
.
resources
=
r
.
result
;
});
},
l
(
key
)
{
let
vkey
=
"mes_op_task_plan_simulate"
+
"."
+
key
;
return
this
.
$t
(
vkey
)
||
key
;
...
...
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