Commit d66910cc authored by zhangderong's avatar zhangderong

合并代码

parents d5b26790 d85f0f1d
...@@ -293,6 +293,7 @@ export default { ...@@ -293,6 +293,7 @@ export default {
UpdateTIMENEW:'', UpdateTIMENEW:'',
UpdateVIEWNEW:'', UpdateVIEWNEW:'',
highestDegreeNum:'', highestDegreeNum:'',
emailName:'',
flowStatusList:[], flowStatusList:[],
inviterName:'',//邀约人 inviterName:'',//邀约人
interviewerName:'',//面试官 interviewerName:'',//面试官
...@@ -395,7 +396,8 @@ export default { ...@@ -395,7 +396,8 @@ export default {
resumeId:this.UpdateID, resumeId:this.UpdateID,
inviterName:this.formInline.UpdateOWER, inviterName:this.formInline.UpdateOWER,
seeTime:moment(this.formInline.UpdateTIME).format('YYYY-MM-DD HH:mm'), seeTime:moment(this.formInline.UpdateTIME).format('YYYY-MM-DD HH:mm'),
interviewerName:this.formInline.UpdateVIEW interviewerName:this.formInline.UpdateVIEW,
email:this.emailName
} }
if(this.formInline.UpdateOWER==''||this.formInline.UpdateTIME==""||this.formInline.UpdateVIEW==''){ if(this.formInline.UpdateOWER==''||this.formInline.UpdateTIME==""||this.formInline.UpdateVIEW==''){
this.$Notice.error({ this.$Notice.error({
...@@ -725,11 +727,18 @@ export default { ...@@ -725,11 +727,18 @@ export default {
let list = [] let list = []
query = query.split('(')[0] query = query.split('(')[0]
findCompanyEmailByKey(query).then(res => { findCompanyEmailByKey(query).then(res => {
list = res if(res.data.success==true){
this.options = list.data.body list = res
this.options = list.data.body || []
this.options.map(item=>{
this.emailName=item.email
})
} else{
this.options=[]
}
// this.options.push({name: '不限', email: ''}) // this.options.push({name: '不限', email: ''})
}) })
}, 500); }, 200);
} else { } else {
this.options = []; this.options = [];
} }
......
...@@ -1574,7 +1574,7 @@ import {mapState} from 'vuex' ...@@ -1574,7 +1574,7 @@ import {mapState} from 'vuex'
this.loading1 = false; this.loading1 = false;
query = query.split('(')[0] query = query.split('(')[0]
let list = await findCompanyEmailByKey(query) let list = await findCompanyEmailByKey(query)
this.options = list.data.body this.options = list.data.body || []
}, 200); }, 200);
} else { } else {
this.options = []; this.options = [];
......
...@@ -1566,7 +1566,7 @@ export default { ...@@ -1566,7 +1566,7 @@ export default {
query = query.split('(')[0] query = query.split('(')[0]
findCompanyEmailByKey(query).then(res => { findCompanyEmailByKey(query).then(res => {
list = res list = res
this.options = list.data.body this.options = list.data.body || []
}, 200); }, 200);
}) })
} else { } else {
......
...@@ -42,7 +42,6 @@ instance.interceptors.request.use(function (config) { ...@@ -42,7 +42,6 @@ instance.interceptors.request.use(function (config) {
let url = config.url.split('api/')[1] let url = config.url.split('api/')[1]
let headers = config.headers let headers = config.headers
if (headers.status!='init'&&needLoading.includes(url)){ if (headers.status!='init'&&needLoading.includes(url)){
console.log('hajhsbdha')
showFullScreenLoading() showFullScreenLoading()
} }
delete headers.status delete headers.status
......
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