Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
Y
ybf
Project
Project
Details
Activity
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
xulili
ybf
Commits
d98bed31
Commit
d98bed31
authored
Jan 09, 2020
by
Z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
💄
Z: Dot: comTask's see and edit is done.
parent
d201c28c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
149 additions
and
37 deletions
+149
-37
index.vue
ybf_admin/src/pages/task/bar/index.vue
+25
-11
index.vue
ybf_admin/src/pages/task/com/index.vue
+124
-26
No files found.
ybf_admin/src/pages/task/bar/index.vue
View file @
d98bed31
...
@@ -101,12 +101,14 @@
...
@@ -101,12 +101,14 @@
<el-table-column
label=
"操作"
align=
"center"
fixed=
"right"
width=
"240"
>
<el-table-column
label=
"操作"
align=
"center"
fixed=
"right"
width=
"240"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
v-if=
"scope.row.taskStatus === 'Top'"
class=
"buttonTextNormal"
type=
"text"
@
click=
"listsUntopClick(scope.row.id)"
>
已置顶
<el-button
v-if=
"scope.row.taskStatus === 'Top'"
class=
"buttonTextNormal"
type=
"text"
@
click=
"listsUntopClick(scope.row.id)"
>
已置顶
</el-button>
</el-button>
<el-button
v-if=
"scope.row.taskStatus !== 'Top'"
class=
"buttonTextNormal"
type=
"text"
@
click=
"listsTopClick(scope.row.id)"
>
置顶
<el-button
v-if=
"scope.row.taskStatus !== 'Top'"
class=
"buttonTextNormal"
type=
"text"
@
click=
"listsTopClick(scope.row.id)"
>
置顶
</el-button>
</el-button>
<el-button
class=
"buttonTextNormal"
type=
"text"
@
click=
"listsSeeClick(scope.row.id)"
>
详情
</el-button>
<el-button
class=
"buttonTextNormal"
type=
"text"
@
click=
"listsSeeClick(scope.row.id)"
>
详情
</el-button>
<el-button
class=
"buttonTextNormal"
type=
"text"
@
click=
"listsEditClick(scope.row)"
>
编辑
</el-button>
<el-button
class=
"buttonTextNormal"
type=
"text"
@
click=
"listsEditClick(scope.row
.id
)"
>
编辑
</el-button>
<el-button
class=
"buttonTextWarning"
type=
"text"
@
click=
"listsDelClick(scope.row)"
>
删除
</el-button>
<el-button
class=
"buttonTextWarning"
type=
"text"
@
click=
"listsDelClick(scope.row)"
>
删除
</el-button>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -228,14 +230,16 @@
...
@@ -228,14 +230,16 @@
<el-row>
<el-row>
<el-col
:span=
"24"
>
<el-col
:span=
"24"
>
<el-form-item
label=
"任务名称:"
prop=
"taskName"
>
<el-form-item
label=
"任务名称:"
prop=
"taskName"
>
<el-input
:disabled=
"true"
v-model=
"data.see.taskName"
autocomplete=
"off"
placeholder=
"任务名称为空"
></el-input>
<el-input
:disabled=
"true"
v-model=
"data.see.taskName"
autocomplete=
"off"
placeholder=
"任务名称为空"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"24"
>
<el-col
:span=
"24"
>
<el-form-item
label=
"任务类型:"
prop=
"taskType"
>
<el-form-item
label=
"任务类型:"
prop=
"taskType"
>
<el-input
:disabled=
"true"
v-model=
"data.see.taskType"
autocomplete=
"off"
placeholder=
"任务类型为空"
></el-input>
<el-input
:disabled=
"true"
v-model=
"data.see.taskType"
autocomplete=
"off"
placeholder=
"任务类型为空"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -249,7 +253,8 @@
...
@@ -249,7 +253,8 @@
<el-row>
<el-row>
<el-col
:span=
"24"
>
<el-col
:span=
"24"
>
<el-form-item
label=
"任务期限:"
prop=
"taskTime"
>
<el-form-item
label=
"任务期限:"
prop=
"taskTime"
>
<el-input
:disabled=
"true"
v-model=
"data.see.taskTime"
autocomplete=
"off"
placeholder=
"任务期限为空"
></el-input>
<el-input
:disabled=
"true"
v-model=
"data.see.taskTime"
autocomplete=
"off"
placeholder=
"任务期限为空"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -481,7 +486,7 @@
...
@@ -481,7 +486,7 @@
bar
:
''
,
bar
:
''
,
taskTime
:
''
,
taskTime
:
''
,
taskDetail
:
''
,
taskDetail
:
''
,
}
}
,
},
},
rule
:
{
rule
:
{
create
:
{
create
:
{
...
@@ -491,8 +496,7 @@
...
@@ -491,8 +496,7 @@
taskTime
:
[{
required
:
true
,
message
:
'任务周期不能为空'
,
trigger
:
'change'
}],
taskTime
:
[{
required
:
true
,
message
:
'任务周期不能为空'
,
trigger
:
'change'
}],
taskDetail
:
[{
required
:
true
,
message
:
'任务详情不能为空'
,
trigger
:
'change'
}],
taskDetail
:
[{
required
:
true
,
message
:
'任务详情不能为空'
,
trigger
:
'change'
}],
},
},
see
:
{
see
:
{},
},
}
}
};
};
},
},
...
@@ -520,6 +524,15 @@
...
@@ -520,6 +524,15 @@
},
},
listsEditClick
()
{
listsEditClick
()
{
this
.
cache
.
status
.
createDialog
=
true
this
.
data
.
create
=
{
taskName
:
'change'
,
taskType
:
'taskType'
,
bar
:
'bar'
,
taskTime
:
''
,
taskDetail
:
''
,
}
},
},
listsDelClick
()
{
listsDelClick
()
{
},
},
...
@@ -631,10 +644,11 @@
...
@@ -631,10 +644,11 @@
margin-right
:
0
;
margin-right
:
0
;
}
}
.buttonTextNormal
{
.buttonTextNormal
{
color
:
#666666
;
color
:
#666666
;
}
}
.buttonTextWarning
{
.buttonTextWarning
{
color
:
#D0021B
;
color
:
#D0021B
;
}
}
</
style
>
</
style
>
ybf_admin/src/pages/task/com/index.vue
View file @
d98bed31
...
@@ -80,10 +80,14 @@
...
@@ -80,10 +80,14 @@
<el-table-column
label=
"操作"
align=
"center"
fixed=
"right"
width=
"240"
>
<el-table-column
label=
"操作"
align=
"center"
fixed=
"right"
width=
"240"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
v-if=
"scope.row.taskStatus === 'Top'"
class=
"buttonTextNormal"
type=
"text"
@
click=
"listsUntopClick(scope.row.id)"
>
已置顶
</el-button>
<el-button
v-if=
"scope.row.taskStatus === 'Top'"
class=
"buttonTextNormal"
type=
"text"
<el-button
v-if=
"scope.row.taskStatus !== 'Top'"
class=
"buttonTextNormal"
type=
"text"
@
click=
"listsTopClick(scope.row.id)"
>
置顶
</el-button>
@
click=
"listsUntopClick(scope.row.id)"
>
已置顶
<el-button
type=
"text"
class=
"buttonTextNormal"
@
click=
"listsSeeClick(scope.row)"
>
详情
</el-button>
</el-button>
<el-button
type=
"text"
class=
"buttonTextNormal"
@
click=
"listsEditClick(scope.row)"
>
编辑
</el-button>
<el-button
v-if=
"scope.row.taskStatus !== 'Top'"
class=
"buttonTextNormal"
type=
"text"
@
click=
"listsTopClick(scope.row.id)"
>
置顶
</el-button>
<el-button
type=
"text"
class=
"buttonTextNormal"
@
click=
"listsSeeClick(scope.row.id)"
>
详情
</el-button>
<el-button
type=
"text"
class=
"buttonTextNormal"
@
click=
"listsEditClick(scope.row.id)"
>
编辑
</el-button>
<el-button
type=
"text"
class=
"buttonTextWarning"
@
click=
"listsDelClick(scope.row)"
>
删除
</el-button>
<el-button
type=
"text"
class=
"buttonTextWarning"
@
click=
"listsDelClick(scope.row)"
>
删除
</el-button>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -157,6 +161,48 @@
...
@@ -157,6 +161,48 @@
<el-button
size=
"small"
type=
"primary"
@
click=
"dialogCreateSubmitSend('createForm')"
>
保存并发布
</el-button>
<el-button
size=
"small"
type=
"primary"
@
click=
"dialogCreateSubmitSend('createForm')"
>
保存并发布
</el-button>
</span>
</span>
</el-dialog>
</el-dialog>
<el-dialog
title=
"查看集团任务"
:visible
.
sync=
"cache.status.seeDialog"
width=
"60%"
:before-close=
"dialogSeeBeforeClose"
>
<div
class=
"dialogMain"
>
<el-form
:model=
"data.see"
:rules=
"rule.see"
label-width=
"120px"
ref=
"seeForm"
>
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"任务标题:"
prop=
"taskName"
>
<el-input
:disabled=
"true"
v-model=
"data.see.taskName"
autocomplete=
"off"
placeholder=
"任务标题为空"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"作者:"
prop=
"author"
>
<el-input
:disabled=
"true"
v-model=
"data.see.authore"
autocomplete=
"off"
placeholder=
"作者为空"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"任务详情:"
prop=
"taskDetail"
>
<el-input
:disabled=
"true"
type=
"textarea"
:rows=
"5"
placeholder=
"任务详情为空"
v-model=
"data.see.taskDetail"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"small"
@
click=
"dialogSeeCancel"
>
取 消
</el-button>
<el-button
size=
"small"
type=
"primary"
@
click=
"dialogSeeSubmitSend('createForm')"
>
发 布
</el-button>
</span>
</el-dialog>
</div>
</div>
</div>
</div>
</template>
</template>
...
@@ -167,9 +213,10 @@
...
@@ -167,9 +213,10 @@
return
{
return
{
cache
:
{
cache
:
{
status
:
{
status
:
{
createDialog
:
false
createDialog
:
false
,
seeDialog
:
false
},
},
list
:{
list
:
{
bar
:
[
bar
:
[
{
{
id
:
"0"
,
id
:
"0"
,
...
@@ -203,7 +250,7 @@
...
@@ -203,7 +250,7 @@
}
}
},
},
list
:
{
list
:
{
main
:[
main
:
[
{
{
id
:
'1001'
,
id
:
'1001'
,
taskName
:
'TaskComAlice'
,
taskName
:
'TaskComAlice'
,
...
@@ -309,13 +356,13 @@
...
@@ -309,13 +356,13 @@
]
]
},
},
data
:
{
data
:
{
search
:{
search
:
{
bar
:
''
,
bar
:
''
,
taskType
:
''
,
taskType
:
''
,
taskDate
:
''
,
taskDate
:
''
,
keys
:
''
,
keys
:
''
,
},
},
page
:{
page
:
{
nowPageNum
:
1
,
nowPageNum
:
1
,
},
},
create
:
{
create
:
{
...
@@ -328,33 +375,71 @@
...
@@ -328,33 +375,71 @@
author
:
''
,
author
:
''
,
taskDetail
:
''
,
taskDetail
:
''
,
},
},
see
:
{
taskName
:
''
,
author
:
''
,
taskDetail
:
''
,
},
seeDefault
:
{
taskName
:
''
,
author
:
''
,
taskDetail
:
''
,
},
},
},
rule
:{
rule
:
{
create
:
{
create
:
{
taskName
:
[{
required
:
true
,
message
:
'任务名称不能为空'
,
trigger
:
'change'
}],
taskName
:
[{
required
:
true
,
message
:
'任务名称不能为空'
,
trigger
:
'change'
}],
taskDetail
:
[{
required
:
true
,
message
:
'任务详情不能为空'
,
trigger
:
'change'
}],
taskDetail
:
[{
required
:
true
,
message
:
'任务详情不能为空'
,
trigger
:
'change'
}],
}
},
see
:
{},
}
}
};
};
},
},
created
()
{
created
()
{
},
},
methods
:
{
methods
:
{
searchsCreate
(){
searchsCreate
()
{
this
.
cache
.
status
.
createDialog
=
true
this
.
cache
.
status
.
createDialog
=
true
},
},
searchsDels
(){},
searchsDels
()
{
searchsSearch
(){},
},
searchsSearch
()
{
},
listsSelectChange
()
{
},
listsUntopClick
()
{
},
listsTopClick
()
{
},
listsSeeClick
(
inData
)
{
this
.
cache
.
status
.
seeDialog
=
true
listsSelectChange
(){},
this
.
data
.
see
=
{
listsUntopClick
(){},
taskName
:
'Bob'
,
listsTopClick
(){},
author
:
'author'
,
listsSeeClick
(){},
taskDetail
:
'taskDetail'
,
listsEditClick
(){},
}
listsDelClick
(){},
pagesSizeChange
(){},
pagesNowPageChange
(){},
},
listsEditClick
(
inData
)
{
this
.
cache
.
status
.
createDialog
=
true
this
.
data
.
create
=
{
taskName
:
'taskName'
,
author
:
'author'
,
taskDetail
:
'taskDetail'
,
}
},
listsDelClick
()
{
},
pagesSizeChange
()
{
},
pagesNowPageChange
()
{
},
dialogCreateAuthorChange
()
{
dialogCreateAuthorChange
()
{
},
},
...
@@ -374,6 +459,16 @@
...
@@ -374,6 +459,16 @@
}
}
})
})
},
},
dialogSeeBeforeClose
()
{
this
.
cache
.
status
.
seeDialog
=
false
},
dialogSeeCancel
()
{
this
.
data
.
see
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
data
.
seeDefault
))
this
.
cache
.
status
.
seeDialog
=
false
},
dialogSeeSubmitSend
()
{
},
}
}
};
};
</
script
>
</
script
>
...
@@ -404,7 +499,8 @@
...
@@ -404,7 +499,8 @@
justify-content
:
flex-start
;
justify-content
:
flex-start
;
align-items
:
center
;
align-items
:
center
;
}
}
.ztask-searchs-forms
{
.ztask-searchs-forms
{
/*border: 2px solid #f900ff;*/
/*border: 2px solid #f900ff;*/
height
:
30px
;
height
:
30px
;
margin-bottom
:
10px
;
margin-bottom
:
10px
;
...
@@ -426,16 +522,18 @@
...
@@ -426,16 +522,18 @@
justify-content
:
flex-end
;
justify-content
:
flex-end
;
align-items
:
flex-end
;
align-items
:
flex-end
;
}
}
.ztask-page
{
.ztask-page
{
/*border: 2px solid red;*/
/*border: 2px solid red;*/
position
:
relative
;
position
:
relative
;
margin-right
:
0
;
margin-right
:
0
;
}
}
.buttonTextNormal
{
.buttonTextNormal
{
color
:
#666666
;
color
:
#666666
;
}
}
.buttonTextWarning
{
.buttonTextWarning
{
color
:
#D0021B
;
color
:
#D0021B
;
}
}
</
style
>
</
style
>
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