Skip to content

R
recruiting-management
Commit 7fd9511d authored by FE-安焕焕's avatar FE-安焕焕 👣
Browse files
Options

Merge branch 'Ztext1' of http://git.quantgroup.cn/ui/recruiting-management into deploy 

Conflicts:
	src/page/resume/allResume.vue
	src/page/resume/channel.vue
parents 92f46174 9f71b14b
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 5 deletions
src/page/resume/allResume.vue
View file @ 7fd9511d
...@@ -360,8 +360,21 @@ ...@@ -360,8 +360,21 @@
</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" :disabled="!isDisable">发送</Button> <Button type='primary' @click='modal10=true' v-show="this.isShowAll==false" :disabled="!isDisable">发送</Button>
<Button type='primary' @click='confireSendEmail' v-show="this.isShowAll==true" :disabled="!isDisable">添加并发送</Button> <Button type='primary' @click='modal10=true' v-show="this.isShowAll==true" :disabled="!isDisable">添加并发送</Button>
</div>
</Modal>
<Modal
v-model="modal10"
width='280px'
:closable='false'>
<div >
<h2 style="text-align: center;color:black">提示</h2>
<p style="text-align:center">确定要发送邮件吗？</p>
</div>
<div slot='footer' style="text-align:center">
<Button type='primary' @click='modal10=false'>取消</Button>
<Button type='primary' @click="confireSendEmail" :disabled="!isDisable">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
...@@ -451,6 +464,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -451,6 +464,7 @@ import ckeditor from '../../components/ckeditor'
modal5:false, modal5:false,
modal6:false, modal6:false,
modal7:false, modal7:false,
modal10:false,
title:'', title:'',
emailMOdal:false, emailMOdal:false,
DOSTA:'', DOSTA:'',
...@@ -1227,6 +1241,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1227,6 +1241,7 @@ import ckeditor from '../../components/ckeditor'
}) })
}, },
getEmailContentValue(value){ getEmailContentValue(value){
this.isDisable=true
this.temp=value this.temp=value
if(this.isShowTwo==true){ if(this.isShowTwo==true){
this.isShowAll=true this.isShowAll=true
...@@ -1291,6 +1306,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1291,6 +1306,7 @@ import ckeditor from '../../components/ckeditor'
} }
}) })
console.log("+++++++++++++++")
}, },
uploadFile(){ uploadFile(){
// this.uploadFileList=[] // this.uploadFileList=[]
...@@ -1313,6 +1329,8 @@ import ckeditor from '../../components/ckeditor' ...@@ -1313,6 +1329,8 @@ import ckeditor from '../../components/ckeditor'
} }
return false return false
}, },
// 确认发送提示
sendEmailOk(){},
// 发送全部内容 // 发送全部内容
sendContent(){}, sendContent(){},
emailModalPush(){ emailModalPush(){
...@@ -1339,6 +1357,22 @@ import ckeditor from '../../components/ckeditor' ...@@ -1339,6 +1357,22 @@ import ckeditor from '../../components/ckeditor'
getEditorValue(value){ // 调编辑器组件方法获取数据 getEditorValue(value){ // 调编辑器组件方法获取数据
return this.$refs.editor.getValue() return this.$refs.editor.getValue()
}, },
// getEditorValue(value){
// this.emailContent=value
// this.sad = value
// console.log( this.emailContent,777777,this.sad)
// // if(this.sad==''){this.$Notice.error({
// // title: '提示',
// // desc: '正文不能为空'
// // });
// // }
// // if(this.emailContent==''){
// // this.isDisable=false
// // }else{
// // this.isDisable=true
// // }
// },
delateFile(index){ delateFile(index){
this.fileList.splice(index,1) this.fileList.splice(index,1)
this.uploadFileList.splice(index,1) this.uploadFileList.splice(index,1)
...@@ -1435,6 +1469,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1435,6 +1469,7 @@ import ckeditor from '../../components/ckeditor'
desc: '发送邮件成功' desc: '发送邮件成功'
}); });
this.emailMOdal=false this.emailMOdal=false
this.modal10=false
this.emailInline.modalArr=[] this.emailInline.modalArr=[]
this.emailInline.theme='' this.emailInline.theme=''
this.emailInline.receiveEmail='' this.emailInline.receiveEmail=''
...@@ -1460,6 +1495,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1460,6 +1495,7 @@ import ckeditor from '../../components/ckeditor'
desc: '发送邮件失败' desc: '发送邮件失败'
}); });
this.emailMOdal=false this.emailMOdal=false
this.modal10=false
// this.isDisable=true // this.isDisable=true
this.emailInline.modalArr=[] this.emailInline.modalArr=[]
this.emailInline.theme='' this.emailInline.theme=''
...@@ -1506,6 +1542,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1506,6 +1542,7 @@ import ckeditor from '../../components/ckeditor'
desc: '发送邮件成功' desc: '发送邮件成功'
}) })
this.emailMOdal=false this.emailMOdal=false
this.modal10=false
// this.isDisable=true // this.isDisable=true
this.emailInline.modalArr=[] this.emailInline.modalArr=[]
this.emailInline.theme='' this.emailInline.theme=''
...@@ -1533,6 +1570,7 @@ import ckeditor from '../../components/ckeditor' ...@@ -1533,6 +1570,7 @@ import ckeditor from '../../components/ckeditor'
desc: '发送邮件失败' desc: '发送邮件失败'
}); });
this.emailMOdal=false this.emailMOdal=false
this.modal10=false
// this.isDisable=true // this.isDisable=true
this.emailInline.modalArr=[] this.emailInline.modalArr=[]
this.emailInline.theme='' this.emailInline.theme=''
......
src/page/resume/channel.vue
View file @ 7fd9511d
...@@ -353,8 +353,21 @@ ...@@ -353,8 +353,21 @@
</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" :disabled="!isDisable">发送</Button> <Button type='primary' @click='modal10=true' v-show="this.isShowAll==false" :disabled="!isDisable">发送</Button>
<Button type='primary' @click='confireSendEmail' v-show="this.isShowAll==true" :disabled="!isDisable">添加并发送</Button> <Button type='primary' @click='modal10=true' v-show="this.isShowAll==true" :disabled="!isDisable">添加并发送</Button>
</div>
</Modal>
<Modal
v-model="modal10"
width='280px'
:closable='false'>
<div >
<h2 style="text-align: center;color:black">提示</h2>
<p style="text-align:center">确定要发送邮件吗？</p>
</div>
<div slot='footer' style="text-align:center">
<Button type='primary' @click='modal10=false'>取消</Button>
<Button type='primary' @click="confireSendEmail" :disabled="!isDisable">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
...@@ -464,6 +477,7 @@ export default { ...@@ -464,6 +477,7 @@ export default {
modal4:false, modal4:false,
modal5:false, modal5:false,
modal7:false, modal7:false,
modal10:false,
optcode:'', optcode:'',
toseename:'', toseename:'',
// UpdateOWER:'', // UpdateOWER:'',
...@@ -1120,6 +1134,7 @@ export default { ...@@ -1120,6 +1134,7 @@ export default {
}) })
}, },
getEmailContentValue(value){ getEmailContentValue(value){
this.isDisable=true
this.temp=value this.temp=value
if(this.isShowTwo==true){ if(this.isShowTwo==true){
this.isShowAll=true this.isShowAll=true
...@@ -1329,7 +1344,7 @@ export default { ...@@ -1329,7 +1344,7 @@ export default {
desc: '发送邮件成功' desc: '发送邮件成功'
}); });
this.emailMOdal=false this.emailMOdal=false
this.modal10=false
this.emailInline.modalArr=[] this.emailInline.modalArr=[]
this.emailInline.theme='' this.emailInline.theme=''
this.emailInline.receiveEmail='' this.emailInline.receiveEmail=''
...@@ -1355,6 +1370,7 @@ export default { ...@@ -1355,6 +1370,7 @@ export default {
desc: '发送邮件失败' desc: '发送邮件失败'
}); });
this.emailMOdal=false this.emailMOdal=false
this.modal10=false
// this.isDisable=true // this.isDisable=true
this.emailInline.modalArr=[] this.emailInline.modalArr=[]
this.emailInline.theme='' this.emailInline.theme=''
...@@ -1401,6 +1417,7 @@ export default { ...@@ -1401,6 +1417,7 @@ export default {
desc: '发送邮件成功' desc: '发送邮件成功'
}) })
this.emailMOdal=false this.emailMOdal=false
this.modal10=false
// this.isDisable=true // this.isDisable=true
this.emailInline.modalArr=[] this.emailInline.modalArr=[]
this.emailInline.theme='' this.emailInline.theme=''
...@@ -1428,6 +1445,7 @@ export default { ...@@ -1428,6 +1445,7 @@ export default {
desc: '发送邮件失败' desc: '发送邮件失败'
}); });
this.emailMOdal=false this.emailMOdal=false
this.modal10=false
// this.isDisable=true // this.isDisable=true
this.emailInline.modalArr=[] this.emailInline.modalArr=[]
this.emailInline.theme='' this.emailInline.theme=''
......
src/page/resume/resumeDetail.vue
View file @ 7fd9511d
...@@ -137,11 +137,14 @@ export default { ...@@ -137,11 +137,14 @@ export default {
reList:[], reList:[],
downresume:'', downresume:'',
detialID:'', detialID:'',
showBtn:'',
} }
}, },
methods: { methods: {
getDETAIL(){ getDETAIL(){
this.detialID=this.$route.query.id this.detialID=this.$route.query.id
// this.showBtn=this.$router.query.noShowBtn
// console.log(this.showBtn)
let parmars={ let parmars={
resumeId:this.$route.query.id resumeId:this.$route.query.id
} }
......
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