Commit 0dc37eb1 authored by zhangderong's avatar zhangderong

邮箱问题修复

parent 210240cb
Pipeline #31 canceled with stages
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<Icon :type="menu.icon" style="font-size:20px;font-weight:bold"/> <Icon :type="menu.icon" style="font-size:20px;font-weight:bold"/>
{{menu.item}} {{menu.item}}
</template> </template>
<MenuItem v-for="child in menu.child" :key="child.name" :name="child.name" @click="go" :active-name="levelThreeName">{{child.item}}</MenuItem> <MenuItem v-for="(child,index) in menu.child" :key="index" :name="child.name" @click="go" :active-name="levelThreeName">{{child.item}}</MenuItem>
</Submenu> </Submenu>
</template> </template>
</Menu> </Menu>
......
...@@ -307,11 +307,11 @@ ...@@ -307,11 +307,11 @@
</FormItem> </FormItem>
<FormItem label="收件人" style="margin-top:20px" :show-massage='false'> <FormItem label="收件人" style="margin-top:20px" :show-massage='false'>
<Input style="width:95%" v-model="emailInline.receiveEmail" @on-blur='receiveEmail'/> <Input style="width:95%" v-model="emailInline.receiveEmail" @on-blur='receiveEmail'/>
<span style="position: absolute;left:0;top:30px">输入多个邮箱地址以英文”;“分</span> <span style="position: absolute;left:0;top:30px">输入多个邮箱地址以英文”;“分</span>
</FormItem> </FormItem>
<FormItem label="抄送" style="margin-top:20px"> <FormItem label="抄送" style="margin-top:20px">
<Input style="width:95%" v-model="emailInline.copyname" @on-blur='copyname'/> <Input style="width:95%" v-model="emailInline.copyname" @on-blur='copyname'/>
<span style="position: absolute;left:0;top:30px">输入多个邮箱地址以英文”;“分</span> <span style="position: absolute;left:0;top:30px">输入多个邮箱地址以英文”;“分</span>
</FormItem> </FormItem>
<FormItem label="主题" style="margin-top:20px"> <FormItem label="主题" style="margin-top:20px">
<Input style="width:95%" v-model="emailInline.theme" @on-blur='theme'/> <Input style="width:95%" v-model="emailInline.theme" @on-blur='theme'/>
...@@ -320,8 +320,8 @@ ...@@ -320,8 +320,8 @@
</p> </p>
</div> </div>
<div class="emailModalTitle-right" v-show="interviewIsShow==true"> <div class="emailModalTitle-right" v-show="interviewIsShow==true">
<h3 style="text-align:center;margin-top:10px">请输入约面信息</h3> <h3 style="text-align:center;margin-top:20px">请输入约面信息</h3>
<Form :label-width="75" ref="formInline" :rules="ruleInline" :model="formInline" style="margin-top:27px" label-position="left"> <Form :label-width="75" ref="formInline" :rules="ruleInline" :model="formInline" style="margin-top:35px" label-position="left">
<FormItem label="邀约人" style="margin-top:20px" prop="UpdateOWER"> <FormItem label="邀约人" style="margin-top:20px" prop="UpdateOWER">
<Input v-model="formInline.UpdateOWER" style="width:100%" :maxlength="5"/> <Input v-model="formInline.UpdateOWER" style="width:100%" :maxlength="5"/>
</FormItem> </FormItem>
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
<Input v-model="formInline.UpdateVIEW" style="width:100%" :maxlength="5"/> <Input v-model="formInline.UpdateVIEW" style="width:100%" :maxlength="5"/>
</FormItem> </FormItem>
</Form> </Form>
<Checkbox v-model="disabledSingle" style="margin-left:40px" @on-change='changenotice'><span style="margin-left:20px">微信通知面试官</span></Checkbox> <!-- <Checkbox v-model="disabledSingle" style="margin-left:40px" @on-change='changenotice'><span style="margin-left:20px">微信通知面试官</span></Checkbox> -->
</div> </div>
</div> </div>
<div class="ckeditor"> <div class="ckeditor">
...@@ -357,8 +357,8 @@ ...@@ -357,8 +357,8 @@
</div> </div>
<div slot='footer' style="text-align:center" class="Ubt"> <div slot='footer' style="text-align:center" class="Ubt">
<Button type='primary' @click='emailModalPush'>取消</Button> <Button type='primary' @click='emailModalPush'>取消</Button>
<Button type='primary' @click='confireSendEmail' v-show="this.isShowAll==false">发送</Button> <Button type='primary' @click='confireSendEmail' v-show="this.isShowAll==false" :disabled="!isDisable">发送</Button>
<Button type='primary' @click='confireSendEmail' v-show="this.isShowAll==true">添加并发送</Button> <Button type='primary' @click='confireSendEmail' v-show="this.isShowAll==true" :disabled="!isDisable">添加并发送</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
...@@ -429,6 +429,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -429,6 +429,7 @@ import ckeditor from '../../components/ckeditor'
isShowAll:false, isShowAll:false,
isShowTwo:false, isShowTwo:false,
isLimitSize:false, isLimitSize:false,
isDisable:true,
disabledSingle:true, disabledSingle:true,
emailId:'', emailId:'',
RescopyArr:[], RescopyArr:[],
...@@ -997,8 +998,6 @@ import ckeditor from '../../components/ckeditor' ...@@ -997,8 +998,6 @@ import ckeditor from '../../components/ckeditor'
// 选择input元素 // 选择input元素
selectInputElement(index,doID,doStatus,sss){ selectInputElement(index,doID,doStatus,sss){
this.DOWNLOAD=doID this.DOWNLOAD=doID
this.emailIdArr.push(doID)
this.emailId=doID
sss=!sss sss=!sss
this.ajaxData[index].STATES=sss this.ajaxData[index].STATES=sss
Array.prototype.indexOf = function(val) { Array.prototype.indexOf = function(val) {
...@@ -1014,16 +1013,17 @@ import ckeditor from '../../components/ckeditor' ...@@ -1014,16 +1013,17 @@ import ckeditor from '../../components/ckeditor'
} }
} }
if(sss==true){ if(sss==true){
this.emailIdArr.push(doID)
this.emailId=doID
this.delateARRALL.push(doID) this.delateARRALL.push(doID)
this.delateARRALL2.push(doID) this.delateARRALL2.push(doID)
this.flowStatusarr.push(doStatus) this.flowStatusarr.push(doStatus)
console.log(this.delateARRALL,8888888, this.ajaxData[index].STATES)
} }
if(sss==false){ if(sss==false){
this.delateARRALL.remove(doID) this.delateARRALL.remove(doID)
this.delateARRALL2.remove(doID) this.delateARRALL2.remove(doID)
this.flowStatusarr.remove(doStatus) this.flowStatusarr.remove(doStatus)
console.log(this.delateARRALL,5555555, this.ajaxData[index].STATES) this.emailIdArr.push(doID)
} }
}, },
//查看简历详情 //查看简历详情
...@@ -1220,15 +1220,22 @@ import ckeditor from '../../components/ckeditor' ...@@ -1220,15 +1220,22 @@ import ckeditor from '../../components/ckeditor'
}, },
getEmailContentValue(value){ getEmailContentValue(value){
this.temp=value this.temp=value
console.log(this.isShowTwo,45666666)
if(this.isShowTwo==true){ if(this.isShowTwo==true){
this.isShowAll=true this.isShowAll=true
this.interviewIsShow=true this.interviewIsShow=true
}else{ }else{
console.log(99999999999999)
if(this.emailIdArr.length>1&&(value=='TEMP_0001'||value=='TEMP_0005'||value=='TEMP_0006')){ if(this.emailIdArr.length>1&&(value=='TEMP_0001'||value=='TEMP_0005'||value=='TEMP_0006')){
this.allEmailVilitor=true this.allEmailVilitor=true
}else{ }else {
this.allEmailVilitor=false this.allEmailVilitor=false
console.log(66666666666666)
if(this.temp='TEMP_0001'){
console.log(44444444444444)
this.isShowAll=true
}else{
this.isShowAll=false
}
} }
if(value=='TEMP_0001'){ if(value=='TEMP_0001'){
this.interviewIsShow=true this.interviewIsShow=true
...@@ -1249,8 +1256,9 @@ import ckeditor from '../../components/ckeditor' ...@@ -1249,8 +1256,9 @@ import ckeditor from '../../components/ckeditor'
this.emailMassage=true this.emailMassage=true
} }
else{ else{
if(value=='TEMP_0001'){this.isShowAll=true}else{this.isShowAll=false}
this.interviewBtu=false this.interviewBtu=false
this.isShowAll=false
this.emailMassage=false this.emailMassage=false
}} }}
this.emailCode=value this.emailCode=value
...@@ -1289,6 +1297,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1289,6 +1297,7 @@ import ckeditor from '../../components/ckeditor'
this.formInline.UpdateTIME='' this.formInline.UpdateTIME=''
this.emailInline.copyname='' this.emailInline.copyname=''
this.isShowTwo=false this.isShowTwo=false
this.isLimitSize=false
this.uploadFileList=[] this.uploadFileList=[]
this.SouSuo(this.pageT) this.SouSuo(this.pageT)
}, },
...@@ -1297,26 +1306,38 @@ import ckeditor from '../../components/ckeditor' ...@@ -1297,26 +1306,38 @@ import ckeditor from '../../components/ckeditor'
}, },
delateFile(index){ delateFile(index){
this.fileList.splice(index,1) this.fileList.splice(index,1)
this.isLimitSize=false
}, },
// 确认发送邮件 // 确认发送邮件
confireSendEmail(){ confireSendEmail(){
if(this.emailInline.moo==''||this.emailInline.receiveEmail==''||this.emailInline.copyname==''||this.emailInline.theme==''||this.emailInline.UpdateOWER==''||this.emailInline.UpdateVIEW==''||this.emailInline.UpdateTIME==''){
this.$Notice.error({
title: '提示',
desc: '请填写完整的信息'
});
return
}
if((this.temp=='TEMP_0001'|| this.temp=='TEMP_0005'|| this.temp=='TEMP_0006')){
if(this.emailId==''){
this.$Notice.error({
title: '提示',
desc: '请先选择简历'
});
return
}
}
this.uploadFileList.map(item=>{ this.uploadFileList.map(item=>{
if(item.size/1024 > 10240){ if(item.size/1024 > 10240){
console.log(item.size,67676767)
this.isLimitSize=true this.isLimitSize=true
}else{ }else{
this.isLimitSize=false this.isLimitSize=false
} }
}) })
console.log(872343678,)
if(this.isLimitSize==true){ if(this.isLimitSize==true){
this.$Notice.error({ this.$Notice.error({
title: '提示', title: '提示',
desc: '单个文件不能大于10M' desc: '单个文件不能大于10M'
}); });
// this.emailMOdal=false
// this.SouSuo(this.pageT)
// this.uploadFileList=[]
return return
} }
this.attachFileList=this.uploadFileList.length==0?'':this.uploadFileList this.attachFileList=this.uploadFileList.length==0?'':this.uploadFileList
...@@ -1342,13 +1363,16 @@ import ckeditor from '../../components/ckeditor' ...@@ -1342,13 +1363,16 @@ import ckeditor from '../../components/ckeditor'
formData.append('resumeInterviewVO.interviewerName',this.formInline.UpdateVIEW==''?'':this.formInline.UpdateVIEW) formData.append('resumeInterviewVO.interviewerName',this.formInline.UpdateVIEW==''?'':this.formInline.UpdateVIEW)
formData.append('resumeInterviewVO.seeTime',moment( this.UpdateTIMETwo).format('YYYY/MM/DD HH:mm')) formData.append('resumeInterviewVO.seeTime',moment( this.UpdateTIMETwo).format('YYYY/MM/DD HH:mm'))
formData.append(' flowStatus',this.flowStatusTT) formData.append(' flowStatus',this.flowStatusTT)
this.isDisable=false
sendEmail(formData).then(res=>{ sendEmail(formData).then(res=>{
this.isDisable=true
if(res.data.success==true){ if(res.data.success==true){
this.$Notice.success({ this.$Notice.success({
title: '提示', title: '提示',
desc: '发送邮件成功' desc: '发送邮件成功'
}); });
this.emailMOdal=false this.emailMOdal=false
this.emailInline.modalArr=[] this.emailInline.modalArr=[]
this.emailInline.theme='' this.emailInline.theme=''
this.emailInline.receiveEmail='' this.emailInline.receiveEmail=''
...@@ -1374,6 +1398,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1374,6 +1398,7 @@ import ckeditor from '../../components/ckeditor'
desc: '发送邮件失败' desc: '发送邮件失败'
}); });
this.emailMOdal=false this.emailMOdal=false
// this.isDisable=true
this.emailInline.modalArr=[] this.emailInline.modalArr=[]
this.emailInline.theme='' this.emailInline.theme=''
this.emailInline.receiveEmail='' this.emailInline.receiveEmail=''
...@@ -1410,6 +1435,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1410,6 +1435,7 @@ import ckeditor from '../../components/ckeditor'
formData.append('ccEmail',this.emailInline.copyname) formData.append('ccEmail',this.emailInline.copyname)
formData.append('emailContent',this.emailContent) formData.append('emailContent',this.emailContent)
formData.append(' flowStatus',this.flowStatusTT) formData.append(' flowStatus',this.flowStatusTT)
this.isDisable=false
sendEmail(formData).then(res=>{ sendEmail(formData).then(res=>{
if(res.data.success==true){ if(res.data.success==true){
this.$Notice.success({ this.$Notice.success({
...@@ -1417,6 +1443,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1417,6 +1443,7 @@ import ckeditor from '../../components/ckeditor'
desc: '发送邮件成功' desc: '发送邮件成功'
}) })
this.emailMOdal=false this.emailMOdal=false
// this.isDisable=true
this.emailInline.modalArr=[] this.emailInline.modalArr=[]
this.emailInline.theme='' this.emailInline.theme=''
this.emailInline.receiveEmail='' this.emailInline.receiveEmail=''
...@@ -1432,6 +1459,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1432,6 +1459,7 @@ import ckeditor from '../../components/ckeditor'
this.formInline.UpdateVIEW='' this.formInline.UpdateVIEW=''
this.formInline.UpdateTIME='' this.formInline.UpdateTIME=''
this.isShowTwo=false this.isShowTwo=false
this.isLimitSize=false
this.emailInline.copyname='' this.emailInline.copyname=''
this.uploadFileList=[] this.uploadFileList=[]
this.SouSuo(this.pageT) this.SouSuo(this.pageT)
...@@ -1442,6 +1470,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1442,6 +1470,7 @@ import ckeditor from '../../components/ckeditor'
desc: '发送邮件失败' desc: '发送邮件失败'
}); });
this.emailMOdal=false this.emailMOdal=false
// this.isDisable=true
this.emailInline.modalArr=[] this.emailInline.modalArr=[]
this.emailInline.theme='' this.emailInline.theme=''
this.emailInline.receiveEmail='' this.emailInline.receiveEmail=''
...@@ -1458,6 +1487,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1458,6 +1487,7 @@ import ckeditor from '../../components/ckeditor'
this.formInline.UpdateTIME='' this.formInline.UpdateTIME=''
this.emailInline.copyname='' this.emailInline.copyname=''
this.isShowTwo=false this.isShowTwo=false
this.isLimitSize=false
this.uploadFileList=[] this.uploadFileList=[]
this.SouSuo(this.pageT) this.SouSuo(this.pageT)
} }
...@@ -1468,26 +1498,15 @@ import ckeditor from '../../components/ckeditor' ...@@ -1468,26 +1498,15 @@ import ckeditor from '../../components/ckeditor'
console.log(a,654321) console.log(a,654321)
}, },
receiveEmail(){ receiveEmail(){
if(this.emailInline.receiveEmail==''){
this.$Notice.error({
title: '提示',
desc: '请填写收件人'
});
}
if(!(/^((([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6}\;))*(([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})))$/.test(this.emailInline.receiveEmail))){ if(!(/^((([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6}\;))*(([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})))$/.test(this.emailInline.receiveEmail))){
this.$Notice.error({ this.$Notice.error({
title: '提示', title: '提示',
desc: '请正确填写收件人邮箱' desc: '请正确填写收件人邮箱'
}); });
return
} }
}, },
copyname(){ copyname(){
if(this.emailInline.copyname==''){
this.$Notice.error({
title: '提示',
desc: '请填写抄送人'
});
}
if(!(/^((([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6}\;))*(([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})))$/.test(this.emailInline.copyname))){ if(!(/^((([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6}\;))*(([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})))$/.test(this.emailInline.copyname))){
this.$Notice.error({ this.$Notice.error({
title: '提示', title: '提示',
......
...@@ -10,7 +10,6 @@ CKEDITOR.editorConfig = function( config ) { ...@@ -10,7 +10,6 @@ CKEDITOR.editorConfig = function( config ) {
config.toolbarGroups = [ config.toolbarGroups = [
{ name: 'clipboard', groups: [ 'clipboard', 'undo' ] }, { name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
{ name: 'styles', groups: [ 'styles' ] }, { name: 'styles', groups: [ 'styles' ] },
{ name: 'document', groups: [ 'mode', 'document', 'doctools' ] },
{ name: 'forms', groups: [ 'forms' ] }, { name: 'forms', groups: [ 'forms' ] },
{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] }, { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi', 'paragraph' ] }, { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi', 'paragraph' ] },
...@@ -20,10 +19,11 @@ CKEDITOR.editorConfig = function( config ) { ...@@ -20,10 +19,11 @@ CKEDITOR.editorConfig = function( config ) {
{ name: 'tools', groups: [ 'tools' ] }, { name: 'tools', groups: [ 'tools' ] },
{ name: 'editing', groups: [ 'find', 'selection', 'spellchecker', 'editing' ] }, { name: 'editing', groups: [ 'find', 'selection', 'spellchecker', 'editing' ] },
{ name: 'others', groups: [ 'others' ] }, { name: 'others', groups: [ 'others' ] },
{ name: 'about', groups: [ 'about' ] } { name: 'about', groups: [ 'about' ] },
{ name: 'document', groups: [ 'mode', 'document', 'doctools' ] },
]; ];
config.removeButtons = 'Cut,Copy,Paste,PasteText,PasteFromWord,Source,Save,Templates,NewPage,Preview,Print,About,ShowBlocks,Flash,PageBreak,Iframe,Anchor,SelectAll,BidiLtr,BidiRtl,Language,CreateDiv,Superscript,Subscript,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,Find,Replace;Smiley,Smiley,Replace'; config.removeButtons = 'Cut,Copy,Paste,PasteText,PasteFromWord,Save,Templates,NewPage,Preview,Print,About,ShowBlocks,Flash,PageBreak,Iframe,Anchor,SelectAll,BidiLtr,BidiRtl,Language,CreateDiv,Superscript,Subscript,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,Find,Replace;Smiley,Smiley,Replace';
config.removeDialogTabs = 'image:advanced;link:advanced'; config.removeDialogTabs = 'image:advanced;link:advanced';
config.removePlugins = 'elementspath,resize'; // 移除编辑器底部状态栏显示的元素路径和调整编辑器大小的按钮 config.removePlugins = 'elementspath,resize'; // 移除编辑器底部状态栏显示的元素路径和调整编辑器大小的按钮
config.image_previewText = ' '; // 图片信息面板预览区内容的文字内容,默认显示CKEditor自带的内容 config.image_previewText = ' '; // 图片信息面板预览区内容的文字内容,默认显示CKEditor自带的内容
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment