|
@@ -3,27 +3,29 @@
|
|
<el-dialog
|
|
<el-dialog
|
|
title="推送订阅消息"
|
|
title="推送订阅消息"
|
|
:visible.sync="dialogVisible"
|
|
:visible.sync="dialogVisible"
|
|
- width="70%">
|
|
|
|
|
|
+ width="60%">
|
|
<el-form :model="formData" :rules="rules" ref="pushForm" class="demo-form-inline" label-width='100px'>
|
|
<el-form :model="formData" :rules="rules" ref="pushForm" class="demo-form-inline" label-width='100px'>
|
|
<el-row>
|
|
<el-row>
|
|
- <el-col :span="12">
|
|
|
|
|
|
+ <el-col :span="8">
|
|
<el-form-item label="事件标题:" prop="eventTitle">
|
|
<el-form-item label="事件标题:" prop="eventTitle">
|
|
<el-input v-model="formData.eventTitle" placeholder="请输入事件标题"></el-input>
|
|
<el-input v-model="formData.eventTitle" placeholder="请输入事件标题"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :span="12">
|
|
|
|
|
|
+ <el-col :span="8">
|
|
<el-form-item label="消息模板:" prop="priTmplId">
|
|
<el-form-item label="消息模板:" prop="priTmplId">
|
|
- <el-select @change="priTmplIdChange" v-model="formData.priTmplId" placeholder="请选择订阅消息模板">
|
|
|
|
|
|
+ <el-select style="width: 100%;" @change="priTmplIdChange" v-model="formData.priTmplId" placeholder="请选择订阅消息模板">
|
|
<el-option
|
|
<el-option
|
|
v-for="item in msgTemplateList"
|
|
v-for="item in msgTemplateList"
|
|
:key="item.priTmplId"
|
|
:key="item.priTmplId"
|
|
:label="item.title"
|
|
:label="item.title"
|
|
:value="item.priTmplId">
|
|
:value="item.priTmplId">
|
|
|
|
+ <span style="float: left">{{ item.title }}</span>
|
|
|
|
+ <span style="float: right; color: #8492a6; font-size: 13px">{{ item.type == 2 ? '一次性订阅' : item.type == 3 ? '长期订阅' : '' }}</span>
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :span="12">
|
|
|
|
|
|
+ <el-col :span="8">
|
|
<el-form-item label="跳转地址:" prop="urlLink">
|
|
<el-form-item label="跳转地址:" prop="urlLink">
|
|
<el-input v-model="formData.urlLink" placeholder="请输入点击跳转地址"></el-input>
|
|
<el-input v-model="formData.urlLink" placeholder="请输入点击跳转地址"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -51,7 +53,7 @@ import request from '../../utils/request.js'
|
|
export default {
|
|
export default {
|
|
name: "PushMessageDialog",
|
|
name: "PushMessageDialog",
|
|
watch: {
|
|
watch: {
|
|
- //监听dialog关闭清空表单
|
|
|
|
|
|
+ //监听dialog关闭重置表单
|
|
dialogVisible: {
|
|
dialogVisible: {
|
|
// eslint-disable-next-line no-unused-vars
|
|
// eslint-disable-next-line no-unused-vars
|
|
handler(newval, oldval) {
|
|
handler(newval, oldval) {
|
|
@@ -59,6 +61,7 @@ export default {
|
|
this.formData.fieldList = []
|
|
this.formData.fieldList = []
|
|
this.formData.priTmplId = ''
|
|
this.formData.priTmplId = ''
|
|
this.formData.urlLink = ''
|
|
this.formData.urlLink = ''
|
|
|
|
+ this.$refs.pushForm.resetFields()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -91,7 +94,7 @@ export default {
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
loadMsgTemplateList() {
|
|
loadMsgTemplateList() {
|
|
- request.get('msg/getMsgTemplate').then(res => {
|
|
|
|
|
|
+ request.get('api/problem/msg/getMsgTemplate').then(res => {
|
|
if (!res.data.result) {
|
|
if (!res.data.result) {
|
|
this.$message.error('订阅消息模板加载失败:' + res.data.msg);
|
|
this.$message.error('订阅消息模板加载失败:' + res.data.msg);
|
|
}
|
|
}
|
|
@@ -109,6 +112,8 @@ export default {
|
|
return {'label': label, 'key': key, value: ''}
|
|
return {'label': label, 'key': key, value: ''}
|
|
})
|
|
})
|
|
_this.formData.fieldList = fieldList
|
|
_this.formData.fieldList = fieldList
|
|
|
|
+ _this.formData.templateTitle = msgTemplate.title
|
|
|
|
+ _this.formData.templateType = msgTemplate.type
|
|
//添加表单验证
|
|
//添加表单验证
|
|
/*_this.formData.fieldList.forEach((t,i) => {
|
|
/*_this.formData.fieldList.forEach((t,i) => {
|
|
_this.rules[t.key] = [
|
|
_this.rules[t.key] = [
|
|
@@ -122,18 +127,18 @@ export default {
|
|
_this.formData.templateId = _this.formData.priTmplId
|
|
_this.formData.templateId = _this.formData.priTmplId
|
|
_this.formData.content = _this.formData.fieldList
|
|
_this.formData.content = _this.formData.fieldList
|
|
_this.$refs.pushForm.validate((valid) => {
|
|
_this.$refs.pushForm.validate((valid) => {
|
|
- if (valid) {
|
|
|
|
- request.post('msg/pushMessage',_this.formData).then(res => {
|
|
|
|
- if (!res.data.result) {
|
|
|
|
- this.$message.error('推送订阅消息失败:' + res.data.msg);
|
|
|
|
- } else {
|
|
|
|
- this.$message.error('推送订阅消息成功。');
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- return true;
|
|
|
|
- } else {
|
|
|
|
- return false;
|
|
|
|
|
|
+ if (!valid) {
|
|
|
|
+ return false
|
|
}
|
|
}
|
|
|
|
+ request.post('api/problem/msg/pushMessage',_this.formData).then(res => {
|
|
|
|
+ if (!res.data.result) {
|
|
|
|
+ _this.$message.error('推送订阅消息失败:' + res.data.msg);
|
|
|
|
+ } else {
|
|
|
|
+ _this.dialogVisible = false
|
|
|
|
+ _this.$message.success('推送订阅消息成功。');
|
|
|
|
+ _this.$parent.loadData()
|
|
|
|
+ }
|
|
|
|
+ })
|
|
})
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|