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
65efb352
Commit
65efb352
authored
Nov 17, 2020
by
周远喜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ok
parent
77a5571f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
10 deletions
+15
-10
dateRange.vue
components/page/dateRange.vue
+1
-1
detail.vue
pages/project/task/detail.vue
+10
-3
index.vue
pages/project/task/index.vue
+4
-6
No files found.
components/page/dateRange.vue
View file @
65efb352
...
...
@@ -23,7 +23,7 @@
<span
v-else
v-text=
"placeholder"
>
</span>
</div>
</DatePicker>
<div
class=
"time-view"
v-else-if=
"!edit &&
startDate && endDate
"
>
<div
class=
"time-view"
v-else-if=
"!edit &&
( startDate || endDate)
"
>
<span>
{{
startDate
}}
</span>
<span
class=
"jian-tou"
>
{{
jg
}}
{{
unit
}}
</span>
<span>
{{
endDate
}}
</span>
...
...
pages/project/task/detail.vue
View file @
65efb352
...
...
@@ -22,11 +22,11 @@
<Filed
:span=
"24"
:name=
"l('userIds')"
>
<User
v-for=
"(li,i) in entity.userIds"
:value=
"li"
:key=
"i"
class=
"ml10"
/>
</Filed>
<Filed
:span=
"12"
:name=
"l('startDate')
"
>
<Filed
:span=
"12"
name=
"计划日期
"
>
<DateRange
:value=
"entity"
></DateRange>
</Filed>
<Filed
:span=
"12"
:name=
"l('plansToStartDate')
"
>
<DateRange
:value=
"entity"
start=
"
plansToStartDate"
end=
"plansTo
EndTime"
></DateRange>
<Filed
:span=
"12"
name=
"执行日期
"
>
<DateRange
:value=
"entity"
start=
"
runStartDate"
end=
"run
EndTime"
></DateRange>
</Filed>
<Filed
:span=
"24"
:name=
"l('note')"
>
<div
v-html=
"entity.note"
></div>
...
...
@@ -173,6 +173,13 @@ export default {
id
:
this
.
eid
,
status
:
this
.
status
,
};
if
(
this
.
status
==
1
){
params
.
runStartDate
=
""
;
}
else
if
(
this
.
status
==
2
){
params
.
runEndDate
=
""
;
}
else
if
(
this
.
status
==
3
){
params
.
runEndDate
=
""
;
}
Api
.
updatepart
(
params
).
then
((
r
)
=>
{
if
(
r
.
success
)
{
this
.
$Message
.
success
(
"任务状态汇报成功"
);
...
...
pages/project/task/index.vue
View file @
65efb352
...
...
@@ -205,15 +205,13 @@ export default {
render
:
(
h
,
params
)
=>
{
return
h
(
"DateRange"
,
{
props
:
{
value
:
params
.
row
,
start
:
"plansToStartDate"
,
end
:
"plansToEndTime"
,
value
:
params
.
row
},
});
},
},
{
key
:
"
s
tartDate"
,
key
:
"
runS
tartDate"
,
title
:
"执行日期"
,
align
:
"center"
,
high
:
true
,
...
...
@@ -468,10 +466,10 @@ export default {
status
:
valStatus
,
};
if
(
valStatus
==
1
)
{
params
.
s
tartDate
=
""
;
params
.
runS
tartDate
=
""
;
}
if
(
valStatus
==
2
)
{
params
.
e
ndDate
=
""
;
params
.
runE
ndDate
=
""
;
}
Api
.
updatepart
(
params
)
.
then
((
r
)
=>
{
...
...
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