Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apaas-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gzga-jzapi
apaas-ui
Commits
8e9b5db2
Commit
8e9b5db2
authored
Aug 06, 2020
by
徐一鸣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消息管理模板选择组件fixed
parent
fc9208c5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
2 deletions
+46
-2
src/components/message-steps/select-template.vue
src/components/message-steps/select-template.vue
+43
-1
src/pages/message-management/directed-push/directed-push-add.vue
...es/message-management/directed-push/directed-push-add.vue
+1
-0
src/pages/message-management/message-alert/message-alert-add.vue
...es/message-management/message-alert/message-alert-add.vue
+2
-1
No files found.
src/components/message-steps/select-template.vue
View file @
8e9b5db2
...
@@ -9,6 +9,18 @@
...
@@ -9,6 +9,18 @@
placeholder=
"请输入消息模板名称/id"
placeholder=
"请输入消息模板名称/id"
></el-input>
></el-input>
</div>
</div>
<div
class=
"filter_item"
v-if=
"tpl_types.length > 1"
>
<span
class=
"filter_title"
>
模板类型:
</span>
<el-select
v-model=
"type"
placeholder=
"请选择"
>
<el-option
v-for=
"item in tpl_types"
:label=
"item.name"
:value=
"item.value"
:key=
"item.value"
>
</el-option>
</el-select>
</div>
<div
class=
"filter_item"
>
<div
class=
"filter_item"
>
<span
class=
"filter_title"
>
最后更新时间:
</span>
<span
class=
"filter_title"
>
最后更新时间:
</span>
<el-date-picker
<el-date-picker
...
@@ -127,6 +139,10 @@ export default {
...
@@ -127,6 +139,10 @@ export default {
type
:
Boolean
,
type
:
Boolean
,
defailt
:
false
,
defailt
:
false
,
},
},
tmpTypes
:
{
type
:
Array
,
defailt
:
[],
},
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -138,6 +154,7 @@ export default {
...
@@ -138,6 +154,7 @@ export default {
pageSize
:
10
,
pageSize
:
10
,
currentPage
:
1
,
currentPage
:
1
,
keyword
:
""
,
keyword
:
""
,
type
:
""
,
updateTime
:
""
,
updateTime
:
""
,
types
:
[
types
:
[
{
{
...
@@ -161,6 +178,7 @@ export default {
...
@@ -161,6 +178,7 @@ export default {
value
:
4
,
value
:
4
,
},
},
],
],
tpl_types
:
[],
detail
:
{
detail
:
{
name
:
""
,
name
:
""
,
tpl_type
:
""
,
tpl_type
:
""
,
...
@@ -234,12 +252,36 @@ export default {
...
@@ -234,12 +252,36 @@ export default {
},
},
];
];
if
(
this
.
tmpTypes
.
length
>
0
)
{
let
tpl_types
=
[];
this
.
types
.
forEach
((
item
)
=>
{
if
(
this
.
tmpTypes
.
indexOf
(
item
.
value
)
>
-
1
)
{
tpl_types
.
push
(
item
);
}
});
if
(
this
.
tmpTypes
.
length
>
1
)
{
tpl_types
=
[
{
name
:
"
全部
"
,
value
:
this
.
tmpTypes
.
join
(
"
,
"
),
},
...
tpl_types
,
];
}
this
.
tpl_types
=
tpl_types
;
this
.
type
=
tpl_types
[
0
].
value
;
}
this
.
getTemplateList
();
this
.
getTemplateList
();
},
},
methods
:
{
methods
:
{
getTemplateList
()
{
getTemplateList
()
{
let
params
=
{
let
params
=
{
page
:
this
.
currentPage
,
page
:
this
.
currentPage
,
tpl_type
:
this
.
type
,
size
:
this
.
pageSize
,
size
:
this
.
pageSize
,
keyword
:
this
.
keyword
,
keyword
:
this
.
keyword
,
update_time_s
:
(
this
.
updateTime
&&
this
.
updateTime
[
0
])
||
""
,
update_time_s
:
(
this
.
updateTime
&&
this
.
updateTime
[
0
])
||
""
,
...
@@ -358,7 +400,7 @@ export default {
...
@@ -358,7 +400,7 @@ export default {
...
this
.
selected
,
...
this
.
selected
,
content
:
this
.
detail
.
content
,
content
:
this
.
detail
.
content
,
});
});
this
.
$refs
.
dialog
.
hide
();
this
.
$refs
.
dialog
.
hide
();
},
},
},
},
...
...
src/pages/message-management/directed-push/directed-push-add.vue
View file @
8e9b5db2
...
@@ -51,6 +51,7 @@
...
@@ -51,6 +51,7 @@
>
>
<select-template
<select-template
class=
"apaas_step_content"
class=
"apaas_step_content"
:tmp-types=
"[1]"
@
change=
"selectTemplate"
@
change=
"selectTemplate"
></select-template>
></select-template>
...
...
src/pages/message-management/message-alert/message-alert-add.vue
View file @
8e9b5db2
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<select-template
<select-template
class=
"apaas_step_content"
class=
"apaas_step_content"
:edit=
"true"
:edit=
"true"
:tmp-types=
"[2, 3]"
@
change=
"selectTemplate"
@
change=
"selectTemplate"
></select-template>
></select-template>
...
@@ -98,7 +99,7 @@ export default {
...
@@ -98,7 +99,7 @@ export default {
step
:
0
,
step
:
0
,
done
:
false
,
done
:
false
,
templateId
:
""
,
templateId
:
""
,
templateContent
:
""
,
templateContent
:
""
,
targetUserIds
:
""
,
targetUserIds
:
""
,
};
};
},
},
...
...
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