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
b165d59f
Commit
b165d59f
authored
Oct 31, 2020
by
zhanglongtao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改页面
parent
7fea4d16
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
112 additions
and
33 deletions
+112
-33
api.js
pages/produce/execute/api.js
+3
-0
add.vue
pages/produce/execute/taskTime/add.vue
+2
-2
index.vue
pages/produce/execute/taskTime/index.vue
+107
-31
No files found.
pages/produce/execute/api.js
View file @
b165d59f
...
@@ -71,6 +71,9 @@ export default {
...
@@ -71,6 +71,9 @@ export default {
subcreatemodelhours
(
params
)
{
subcreatemodelhours
(
params
)
{
return
Api
.
post
(
`
${
technologyUrl
}
workhours/createmoremodel`
,
params
);
return
Api
.
post
(
`
${
technologyUrl
}
workhours/createmoremodel`
,
params
);
},
},
subupdatehours
(
params
)
{
// 编辑 提交修改的工时
return
Api
.
post
(
`
${
technologyUrl
}
workhours/updatecount`
,
params
);
},
//工时分配--删除一条
//工时分配--删除一条
deletehours
(
params
)
{
deletehours
(
params
)
{
return
Api
.
delete
(
`
${
technologyUrl
}
workhours/delete?id=`
+
params
);
return
Api
.
delete
(
`
${
technologyUrl
}
workhours/delete?id=`
+
params
);
...
...
pages/produce/execute/taskTime/add.vue
View file @
b165d59f
...
@@ -63,10 +63,10 @@
...
@@ -63,10 +63,10 @@
</FormItem>
</FormItem>
</Col>
</Col>
<Col
span=
"24"
v-show=
"showSelect"
>
<Col
span=
"24"
v-show=
"showSelect"
>
<FormItem
label=
"添加人员"
style=
"width: 90%"
>
<
!--
<
FormItem
label=
"添加人员"
style=
"width: 90%"
>
<UserSelect
ref=
"userSelected"
v-model=
"entity.userse"
/>
<UserSelect
ref=
"userSelected"
v-model=
"entity.userse"
/>
<!-- :roleTitle="roleTitle" :datas="userlist" :multiple="true" @on-change="changeUser"-->
<!-- :roleTitle="roleTitle" :datas="userlist" :multiple="true" @on-change="changeUser"-->
<
/FormItem>
<
!--
</FormItem>
-->
</Col>
</Col>
<Col
span=
"24"
>
<Col
span=
"24"
>
<FormItem
label=
"分配工时"
prop=
"setTime"
>
<FormItem
label=
"分配工时"
prop=
"setTime"
>
...
...
pages/produce/execute/taskTime/index.vue
View file @
b165d59f
...
@@ -44,22 +44,34 @@
...
@@ -44,22 +44,34 @@
<p>
所属班组:
{{
item
.
groupTitle
}}
</p>
<p>
所属班组:
{{
item
.
groupTitle
}}
</p>
<p
class=
"gs_time"
>
<p
class=
"gs_time"
>
<span
class=
"b_size"
>
{{
item
.
workHour
}}
</span>
工时
<span
v-show=
"!item.showInputWorkHour"
class=
"b_size"
>
{{
item
.
workHour
}}
</span>
<InputNumber
v-show=
"item.showInputWorkHour"
:max=
"maxHour"
:min=
"1"
:editable=
"false"
v-model=
"item.workHour"
@
on-change=
"testChange(item.workHour)"
></InputNumber>
工时
</p>
</p>
<!--
<p
class=
"gs_p"
>
<!--
<p
class=
"gs_p"
>
<span
class=
"b_size"
>
100
</span>
分
<span
class=
"b_size"
>
100
</span>
分
</p>
</p>
<p
class=
"gs_p"
>
<p
class=
"gs_p"
>
<span
class=
"b_size"
>
100
</span>
秒
<span
class=
"b_size"
>
100
</span>
秒
</p>
-->
</p>
-->
<p
class=
"gs_footer"
>
<p
class=
"gs_footer"
>
<a
class=
"gs_edit"
@
click=
"editItem"
>
<a
class=
"gs_edit"
@
click=
"editItem
(item, index)
"
>
<Icon
type=
"md-create"
/>
<Icon
type=
"md-create"
/>
编辑
</a
编辑
</a
>
>
<a
<a
class=
"gs_del"
class=
"gs_del"
style=
"position: absolute;
right:0px; width: 50%;
"
style=
"position: absolute;
right: 0px; width: 50%
"
@
click=
"delItem(item.id)"
@
click=
"delItem(item.id)"
>
>
<Icon
type=
"ios-trash-outline"
/>
删除
<Icon
type=
"ios-trash-outline"
/>
删除
...
@@ -67,7 +79,7 @@
...
@@ -67,7 +79,7 @@
</p>
</p>
</Card>
</Card>
<a
class=
"gs_card gs_add"
@
click=
"addItem"
v-show=
"this.waitHours != 0"
>
<a
class=
"gs_card gs_add"
@
click=
"addItem"
v-show=
"this.waitHours != 0"
>
<Icon
type=
"ios-add"
style=
"vertical-align:
middle"
/>
<Icon
type=
"ios-add"
style=
"vertical-align:
middle"
/>
</a>
</a>
</div>
</div>
<div
<div
...
@@ -79,13 +91,20 @@
...
@@ -79,13 +91,20 @@
bottom: 25px;
bottom: 25px;
"
"
>
>
<Button
type=
"primary"
v-noClick
style=
"height: 50px; width: 100px"
>
<Button
type=
"primary"
v-noClick
@
click=
"submitWorkHour"
style=
"height: 50px; width: 100px"
>
提交
提交
</Button>
</Button>
<Button
<Button
class=
"mr20"
class=
"mr20"
style=
"background: #d0d2d9; height: 50px; width: 100px"
style=
"background: #d0d2d9; height: 50px; width: 100px"
v-noClick
@
click=
"editCancel"
>
>
取消
取消
</Button>
</Button>
...
@@ -119,13 +138,15 @@ export default {
...
@@ -119,13 +138,15 @@ export default {
waitHours
:
0
,
waitHours
:
0
,
cardMan
:
[
cardMan
:
[
// {
// {
// userName: "张三",
// showInputWorkHour: true,
// cardNo: 123123,
// userName: "张三",
// workHour: 0,
// cardNo: 123123,
// workHour: 0,
// },
// },
],
],
cardManCopy
:[],
cardManCopy
:
[],
topInfoShow
:
{},
topInfoShow
:
{},
maxHour
:
10
,
};
};
},
},
created
()
{
created
()
{
...
@@ -165,7 +186,7 @@ export default {
...
@@ -165,7 +186,7 @@ export default {
this
.
$refs
.
addview
.
maxHour
=
this
.
waitHours
;
this
.
$refs
.
addview
.
maxHour
=
this
.
waitHours
;
// 如果工时还未分配,则默认人员平均分配
// 如果工时还未分配,则默认人员平均分配
if
(
this
.
allHours
==
this
.
waitHours
)
{
if
(
res
.
result
.
allHours
==
res
.
result
.
waitHours
)
{
let
id
=
this
.
$route
.
query
.
id
;
let
id
=
this
.
$route
.
query
.
id
;
// 获取既定users
// 获取既定users
Api
.
getentryusers
({
Id
:
id
}).
then
((
res
)
=>
{
Api
.
getentryusers
({
Id
:
id
}).
then
((
res
)
=>
{
...
@@ -251,15 +272,33 @@ export default {
...
@@ -251,15 +272,33 @@ export default {
Api
.
getentrylist
(
parm
).
then
((
rest
)
=>
{
Api
.
getentrylist
(
parm
).
then
((
rest
)
=>
{
if
(
rest
.
success
)
{
if
(
rest
.
success
)
{
this
.
cardMan
=
rest
.
result
;
this
.
cardMan
=
rest
.
result
;
this
.
cardManCopy
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
cardMan
));
}
else
{
}
else
{
console
.
log
(
"获取失败。"
);
console
.
log
(
"获取失败。"
);
}
}
});
});
},
},
// 编辑工时
editItem
()
{
editItem
(
item
,
index
)
{
this
.
$Message
.
success
(
"编辑工时..."
);
// 关闭其他编辑框
for
(
var
i
=
0
;
i
<
this
.
cardMan
.
length
;
i
++
)
{
if
(
this
.
cardMan
[
i
]
!=
item
&&
this
.
cardMan
[
i
].
showInputWorkHour
==
true
)
{
this
.
cardMan
[
i
].
showInputWorkHour
=
false
;
this
.
$set
(
this
.
cardMan
,
i
,
this
.
cardMan
[
i
]);
}
}
// 编辑或关闭当前编辑框
console
.
log
(
item
.
workHour
)
this
.
maxHour
=
item
.
workHour
+
this
.
waitHours
;
item
.
showInputWorkHour
=
!
item
.
showInputWorkHour
;
this
.
$set
(
this
.
cardMan
,
index
,
item
);
},
},
// 删除工时
delItem
(
itmid
)
{
delItem
(
itmid
)
{
this
.
$Modal
.
confirm
({
this
.
$Modal
.
confirm
({
title
:
this
.
title
,
title
:
this
.
title
,
...
@@ -276,27 +315,39 @@ export default {
...
@@ -276,27 +315,39 @@ export default {
},
},
});
});
},
},
// 提交
submitWorkHour
()
{
if
(
this
.
cardMan
.
length
==
0
)
{
return
this
.
$Message
.
success
(
"没有工时可提交"
);
}
Api
.
subupdatehours
(
this
.
cardMan
).
then
((
res
)
=>
{
if
(
res
.
success
)
{
this
.
$Message
.
success
(
"已提交"
);
this
.
laodHorse
();
}
else
{
this
.
$Message
.
error
(
"提交失败..."
);
}
});
},
editCancel
()
{
// this.laodHorse()
this
.
cardMan
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
cardManCopy
));
},
cancel
()
{
cancel
()
{
this
.
addmodal
=
false
;
this
.
addmodal
=
false
;
},
},
// 打开添加分配人员页面
// 打开添加分配人员页面
addItem
()
{
addItem
()
{
// let aa=this.$refs.addview.$refs.userSelected.getSelectItems()
// 添加分配人员时关闭所有编辑框
// console.log("1",aa)
for
(
var
i
=
0
;
i
<
this
.
cardMan
.
length
;
i
++
)
{
// if(this.allHours==0){
if
(
this
.
cardMan
[
i
].
showInputWorkHour
==
true
)
{
// this.$Message.info("无工时分配...")
this
.
cardMan
[
i
].
showInputWorkHour
=
false
;
// return
this
.
$set
(
this
.
cardMan
,
i
,
this
.
cardMan
[
i
]);
// }
}
}
this
.
$refs
.
addview
.
maxHour
=
this
.
waitHours
;
this
.
addmodal
=
true
;
this
.
addmodal
=
true
;
let
id
=
this
.
$route
.
query
.
id
;
// 获取人员
// 既定users
// Api.getentryusers({ Id: id }).then((res) => {
// let result = res.result;
// result.map((u) => {
// u.checked = false;
// });
// this.$refs.addview.listMan = result;
// });
let
parm
=
{
let
parm
=
{
partmentId
:
0
,
partmentId
:
0
,
search
:
""
,
search
:
""
,
...
@@ -312,8 +363,9 @@ export default {
...
@@ -312,8 +363,9 @@ export default {
workHour
:
1
,
workHour
:
1
,
};
};
},
},
// 保存
添加分配人员
// 保存 添加分配人员
addInfo
(
formdata
)
{
addInfo
(
formdata
)
{
this
.
addmodal
=
false
;
let
parme
=
[
let
parme
=
[
{
{
userTitle
:
formdata
.
userName
,
userTitle
:
formdata
.
userName
,
...
@@ -328,12 +380,36 @@ export default {
...
@@ -328,12 +380,36 @@ export default {
Api
.
subcreatemodelhours
(
parme
).
then
((
res
)
=>
{
Api
.
subcreatemodelhours
(
parme
).
then
((
res
)
=>
{
if
(
res
.
success
)
{
if
(
res
.
success
)
{
this
.
laodHorse
();
this
.
laodHorse
();
this
.
addmodal
=
false
;
}
else
{
}
else
{
this
.
addmodal
=
true
;
this
.
addmodal
=
true
;
}
}
});
});
},
},
// 检验编辑内容
testChange
(
workHour
)
{
// 该方法在input内容改变是就会触发进行检测
this
.
numberChange
(
workHour
);
// 调用函数
// 编辑框发生变化时,修改待分配工时
let
editWorkHour
=
0
;
this
.
cardMan
.
forEach
((
item
)
=>
{
editWorkHour
+=
item
.
workHour
;
});
this
.
waitHours
=
this
.
allHours
-
editWorkHour
;
},
// 封装控制小数点位数的函数
numberChange
(
VauleNumber
)
{
// VauleNumber你想要控制位数的数字
let
newNumber
=
null
;
if
(
VauleNumber
>=
0
)
{
let
reg
=
/.*
\.
.*/
;
if
(
reg
.
test
(
VauleNumber
))
{
newNumber
=
parseFloat
(
VauleNumber
.
toFixed
(
1
));
}
else
{
newNumber
=
VauleNumber
;
}
}
return
newNumber
;
},
},
},
};
};
</
script
>
</
script
>
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