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
b7422d31
Commit
b7422d31
authored
Apr 21, 2020
by
康振飞
Committed by
佟礼
Apr 21, 2020
Browse files
Options
Browse Files
Download
Plain Diff
班组长排产
parents
215b9d63
645a1c5a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
116 additions
and
11 deletions
+116
-11
dataGrid.vue
components/page/dataGrid.vue
+3
-4
index.vue
pages/aps/dispatch/index.vue
+5
-1
api.js
pages/resourceManagement/productionResources/api.js
+3
-0
index.vue
pages/resourceManagement/productionResources/index.vue
+105
-6
No files found.
components/page/dataGrid.vue
View file @
b7422d31
...
...
@@ -111,7 +111,7 @@
<slot
name=
"batch"
></slot>
</div>
<Button
@
click=
"cancelFooterToolbar"
>
取消
</Button>
<Button
@
click=
"cancelFooterToolbar"
class=
"btn"
>
取消
</Button>
</FooterToolbar>
</div>
</
template
>
...
...
@@ -477,10 +477,9 @@ export default {
selectAll
(
status
)
{
this
.
$refs
.
table
.
selectAll
(
status
);
},
cancelFooterToolbar
()
{
cancelFooterToolbar
()
{
this
.
$refs
.
table
.
selectAll
(
false
);
this
.
footerToolbar
=
false
this
.
footerToolbar
=
false
;
}
},
computed
:
{
...
...
pages/aps/dispatch/index.vue
View file @
b7422d31
...
...
@@ -559,7 +559,11 @@ export default {
});
this
.
$refs
[
"formValidate"
].
validate
(
valid
=>
{
if
(
valid
)
{
Api
.
saveTeamentry
(
item
).
then
(
res
=>
{
let
params
=
{
isDispatch
:
1
,
//派工是1,保存是0
entryList
:
item
};
Api
.
saveTeamentry
(
params
).
then
(
res
=>
{
if
(
res
.
success
)
{
this
.
$Message
.
success
(
"设备派工成功。"
);
this
.
getUserInfoFn
();
...
...
pages/resourceManagement/productionResources/api.js
View file @
b7422d31
...
...
@@ -17,6 +17,9 @@ export default {
update
(
params
)
{
return
Api
.
post
(
`
${
systemUrl
}
/equipcalendarwork/createorupdate`
,
params
);
},
set
(
params
)
{
return
Api
.
post
(
`
${
systemUrl
}
/planresource/setplanresource`
,
params
);
},
//删除:
delete
(
params
)
{
return
Api
.
delete
(
`
${
systemUrl
}
/planresource/delete`
,
{
params
:
params
});
...
...
pages/resourceManagement/productionResources/index.vue
View file @
b7422d31
<
template
>
<div>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:high=
"false"
>
<div
class=
"resources-p"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:high=
"false"
@
on-selection-change=
"onSelect"
>
<template
slot=
"easySearch"
>
<Form
ref=
"formInline"
:model=
"easySearch"
inline
>
<FormItem
prop=
"keys"
>
<Input
placeholder=
"请输入
关键字资源名称/资源编号/资源
类型/部门"
v-model=
"easySearch.keys.value"
/>
<Input
placeholder=
"请输入
资源名称/编号/
类型/部门"
v-model=
"easySearch.keys.value"
/>
</FormItem>
<FormItem>
<Button
type=
"primary"
@
click=
"search"
>
查询
</Button>
</FormItem>
</Form>
</
template
>
<
template
slot=
"batch"
>
<Form
ref=
"form"
:model=
"entity"
:rules=
"rules"
:label-width=
"90"
class=
"form-row"
>
<Row>
<Col
span=
"8"
>
<FormItem
:label=
"l('isimportant')"
prop=
"isimportant"
>
<RadioGroup
v-model=
"entity.isimportant"
>
<Radio
label=
"0"
>
是
</Radio>
<Radio
label=
"1"
>
否
</Radio>
</RadioGroup>
</FormItem>
</Col>
<Col
span=
"12"
>
<FormItem
:label=
"l('capabilityValue')"
>
<InputNumber
v-model=
"entity.capabilityValue"
></InputNumber>
</FormItem>
</Col>
<Col
span=
"4"
>
<FormItem>
<Button
type=
"primary"
@
click=
"handleSubmit"
:disabled=
"disabled"
>
保存
</Button>
</FormItem>
</Col>
</Row>
</Form>
</
template
>
</DataGrid>
<Modal
v-model=
"editModal"
title=
"编辑"
footer-hide
>
...
...
@@ -38,14 +68,23 @@ export default {
easySearch
:
{
keys
:
{
op
:
"title,code,type,departTitle"
,
value
:
null
}
},
entity
:
{},
disabled
:
false
,
ids
:
[],
editModal
:
false
,
deletelModal
:
false
,
curId
:
0
,
rules
:
{
isimportant
:
[{
required
:
true
,
message
:
"必填"
,
trigger
:
"blur"
}],
capabilityValue
:
[{
required
:
true
,
message
:
"必填"
,
trigger
:
"blur"
}]
},
columns
:
[
{
key
:
"id"
,
title
:
this
.
l
(
"id"
),
hide
:
true
,
align
:
"left"
},
{
type
:
"selection"
,
width
:
70
,
align
:
"center"
},
// {
// key: "deleterUserId",
// title: this.l("deleterUserId"),
...
...
@@ -194,6 +233,46 @@ export default {
this
.
editModal
=
false
;
this
.
deletedlModal
=
false
;
},
onSelect
(
a
,
b
)
{
console
.
log
(
a
);
//批量选择
let
selectRows
=
a
;
this
.
ids
=
[];
selectRows
.
forEach
(
e
=>
{
this
.
ids
.
push
(
e
.
id
);
});
},
handleSubmit
()
{
this
.
$refs
.
form
.
validate
(
v
=>
{
if
(
v
)
{
this
.
disabled
=
true
;
let
data
=
{
ids
:
this
.
ids
,
isimportant
:
this
.
entity
.
isimportant
,
capabilityValue
:
this
.
entity
.
capabilityValue
};
Api
.
set
(
data
)
.
then
(
r
=>
{
this
.
disabled
=
false
;
if
(
r
.
success
)
{
this
.
$Message
.
success
(
"保存成功"
);
}
else
{
this
.
$Message
.
error
(
"保存失败"
);
}
})
.
catch
(
err
=>
{
this
.
disabled
=
false
;
this
.
$Message
.
error
(
"保存失败"
);
console
.
warn
(
err
);
});
}
});
},
handleClose
()
{
this
.
footer
=
false
;
this
.
handleSelectAll
(
false
);
},
l
(
key
)
{
let
vkey
=
"plan_resource"
+
"."
+
key
;
return
this
.
$t
(
vkey
)
||
key
;
...
...
@@ -202,4 +281,24 @@ export default {
};
</
script
>
<
style
lang=
"less"
>
.resources-p {
.form-row {
width: 600px;
margin-left: 50px;
margin-top: -45px;
.ivu-form-item-label {
color: #fff !important;
}
}
.ivu-footer-toolbar-right {
width: 1100px;
position: relative !important;
}
.btn {
position: absolute !important;
top: 12px !important;
right: 40px !important;
}
}
</
style
>
\ No newline at end of file
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