Commit 885799d0 885799d077f54f87cc502c7374303af2d1572737 by zhanghao

commit

1 parent 6865df7b
...@@ -285,6 +285,7 @@ ...@@ -285,6 +285,7 @@
285 export default { 285 export default {
286 data() { 286 data() {
287 return { 287 return {
288 mailReceiver: this.$route.query.mailReceiver,
288 nowActList: [], 289 nowActList: [],
289 nowDateByStartTimeList: [], 290 nowDateByStartTimeList: [],
290 yesterdayByStartTimeList: [], 291 yesterdayByStartTimeList: [],
...@@ -311,6 +312,7 @@ ...@@ -311,6 +312,7 @@
311 } 312 }
312 } 313 }
313 this.$http.get('/tool/selectActOnline?'+this.$qs.stringify({ 314 this.$http.get('/tool/selectActOnline?'+this.$qs.stringify({
315 mailReceiver: this.mailReceiver
314 }),config).then((res)=>{ 316 }),config).then((res)=>{
315 console.log(res.data) 317 console.log(res.data)
316 this.nowActList=res.data.nowActList 318 this.nowActList=res.data.nowActList
...@@ -320,6 +322,19 @@ ...@@ -320,6 +322,19 @@
320 this.nowDateByEndTimeList=res.data.nowDateByEndTimeList 322 this.nowDateByEndTimeList=res.data.nowDateByEndTimeList
321 this.yesterdayByEndTimeList=res.data.yesterdayByEndTimeList 323 this.yesterdayByEndTimeList=res.data.yesterdayByEndTimeList
322 this.tomorrowByEndTimeList=res.data.tomorrowByEndTimeList 324 this.tomorrowByEndTimeList=res.data.tomorrowByEndTimeList
325 if(res.data.mailReceiver=='success') {
326 this.$message({
327 showClose: true,
328 message: '邮件发送成功',
329 type: 'success'
330 });
331 } else if(res.data.mailReceiver=='fail') {
332 this.$message({
333 showClose: true,
334 message: '邮件发送失败',
335 type: 'error'
336 });
337 }
323 loading.close(); 338 loading.close();
324 }).catch(error=>{ 339 }).catch(error=>{
325 console.log(error); 340 console.log(error);
......
...@@ -787,6 +787,9 @@ ...@@ -787,6 +787,9 @@
787 </div> 787 </div>
788 <div class="text item"> 788 <div class="text item">
789 <el-form-item> 789 <el-form-item>
790 <el-input placeholder="如需发送邮件,可输入公司邮箱地址;如有多个地址以,号分隔" v-model="selectActOnline.mailReceiver" clearable></el-input>
791 </el-form-item>
792 <el-form-item>
790 <el-button round @click="selectActOnlineSubmit">查询上下线情况</el-button> 793 <el-button round @click="selectActOnlineSubmit">查询上下线情况</el-button>
791 </el-form-item> 794 </el-form-item>
792 </div> 795 </div>
...@@ -1104,6 +1107,7 @@ ...@@ -1104,6 +1107,7 @@
1104 }] 1107 }]
1105 }, 1108 },
1106 selectActOnline: { 1109 selectActOnline: {
1110 mailReceiver: ''
1107 }, 1111 },
1108 actProvinceOptions: [], 1112 actProvinceOptions: [],
1109 actCityOptions: [], 1113 actCityOptions: [],
...@@ -1771,7 +1775,7 @@ ...@@ -1771,7 +1775,7 @@
1771 }, 1775 },
1772 selectActOnlineSubmit() { 1776 selectActOnlineSubmit() {
1773 const {href} = this.$router.resolve({ name:'selectActOnline', query: 1777 const {href} = this.$router.resolve({ name:'selectActOnline', query:
1774 {}}) 1778 {mailReceiver: this.selectActOnline.mailReceiver}})
1775 window.open(href, '_blank') 1779 window.open(href, '_blank')
1776 }, 1780 },
1777 changeOrgAllSubmit() { 1781 changeOrgAllSubmit() {
......