Commit e0969182 authored by zhangderong's avatar zhangderong

部分bug修改完,复测

parent e1645600
......@@ -2,7 +2,8 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<!-- <meta name="viewport" content="width=device-width,initial-scale=1.0"> -->
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0,user-scalable=0"/>
<title>思坦途</title>
</head>
<body>
......
......@@ -5,6 +5,16 @@
</template>
<script>
window.onload = function() {
  document.addEventListener('touchstart', function(event) {
    if (event.touches.length > 1) {
      event.preventDefault()
    }
  })
  document.addEventListener('gesturestart', function(event) {
    event.preventDefault()
  })
}
export default {
name: 'App',
data() {
......
......@@ -64,4 +64,10 @@ export function changestatus (tid,tstatus) {
return axios.post(`${sapi}/api/resumeFlow/uploadStatus/${tid}/${tstatus}`,{headers: {
'Content-Type':'application/json'
}})
}
// 获取终止面试前的前一个状态
export function formstatus (parmars) {
return axios.post(`${sapi}/api/resumeFlow/getPreReset/${parmars.resumeId}`,{headers: {
'Content-Type':'application/json'
}})
}
\ No newline at end of file
......@@ -54,6 +54,7 @@ import localstorage from '../service/localstorage.service.js'
hName: '1',
vName: ['1'],
vSubName: '1-1',
typearr:["ios-apps-outline","ios-list","ios-paper-outline","ios-cloud-upload-outline","ios-contact-outline","ios-mail-outline","ios-qr-scanner"],
menuList: [
{ name: '1', item: '简历管理', child: [{ name: '1', item: '全部管理', child: [{ name: '1-1', item:'全部简历', route: '/allResume' }] },
{ name: '2', item: '渠道简历', child: [] }]},
......
......@@ -7,7 +7,7 @@
<div style="height:90%;float:left;width:30%;background:rgb(253,85,83);margin-left:3%;margin-top:10px"></div>
<div style="height:90%;float:left;width:30%;background:rgb(0,176,160);margin-left:3%;margin-top:10px"></div>
</div>
<div style="margin-bottom:40px;float:left;margin-left:10px;width:100%">
<div style="float:left;margin-left:1%;width:99%;overflow-y: auto;height:660px;margin-bottom:40px">
<div style="margin:50px auto;width:300px;height:200px;line-height:200px;text-align:center;font-size:20px;color:LightGray" v-show="Essentialinformation.length==0">暂无数据</div>
<div class="leftcontentContent" v-for="(item,index) in Essentialinformation " :key='index'>
<div class="contentMassage">
......@@ -168,14 +168,14 @@
:closable="false"
width='300px'>
<h3 style="text-align:center">更改约面信息</h3>
<Form :label-width="80">
<FormItem label="邀约人" style="margin-top:20px" >
<Form :label-width="80" ref="formInline" :rules="ruleInline">
<FormItem label="邀约人" style="margin-top:20px" prop="ower">
<Input v-model="UpdateOWER" :maxlength="5"/>
</FormItem>
<FormItem label="面试时间" style="margin-top:20px">
<FormItem label="面试时间" style="margin-top:20px" prop="time">
<DatePicker type="datetime" style="width:185px" v-model="UpdateTIME" @on-change="selectTime" placeholder="请选择时间" :options="options3" :editable='false' format="yyyy-MM-dd HH:mm"></DatePicker>
</FormItem>
<FormItem label="面试官" style="margin-top:20px" >
<FormItem label="面试官" style="margin-top:20px" prop="view">
<Input v-model="UpdateVIEW" :maxlength="5"/>
</FormItem>
</Form>
......@@ -203,16 +203,7 @@
width='240px'
>
<h3 style="text-align:center">提示</h3>
<p style="text-align:center">终止面试时的简历状态为:
<span v-if="OPPeninterviewSTA=='HAS_SEE'">已邀约</span>
<span v-if="OPPeninterviewSTA=='SEE_FAIL'">邀约失败</span>
<span v-if="OPPeninterviewSTA=='INTERVIEW_FAIL'">面试淘汰</span>
<span v-if="OPPeninterviewSTA=='TO_SENT_OFFER'">待offer</span>
<span v-if="OPPeninterviewSTA=='TO_ENTRY'">待入职</span>
<span v-if="OPPeninterviewSTA=='HAS_ENTRY'">已入职</span>
<span v-if="OPPeninterviewSTA=='NO_ENTRY'">未入职</span>
<span v-if="OPPeninterviewSTA=='HAS_SENT_OFFER'">已发offer</span>
<span v-if="OPPeninterviewSTA=='END'">终止面试</span>
<p style="text-align:center">终止面试时的简历状态为: {{OPPeninterviewSTA}}
<br>请选择重启后的状态</p>
<div style="text-align:center;margin-top:15px;">
<select name="a" id="333333" @change="selectFnelement($event)" style="text-align:center;margin-top:15px;display:inline-block">
......@@ -236,10 +227,21 @@
</template>
<script>
import moment from 'moment'
import {changeinterviewMassage,SerchList,Serchinterviewor,SerchInvitationOwer,NewAddInterview,SInterview,oppenInterview,recodeLIST,changestatus,seedetail} from '../../api/interview.server.js'
import {changeinterviewMassage,SerchList,Serchinterviewor,SerchInvitationOwer,NewAddInterview,SInterview,oppenInterview,recodeLIST,changestatus,seedetail,formstatus} from '../../api/interview.server.js'
export default {
data(){
return{
ruleInline: {
ower: [
{ required: true, pattern:this.UpdateOWER!=='', message: '邀约人不能为空', trigger: 'blur' }
],
time: [
{ required: true, pattern:this.UpdateTIME!=='', message: '面试时间不能为空', trigger: 'blur' }
],
view: [
{ required: true, pattern:this.UpdateVIEW!=='',message: '面试官不能为空', trigger: 'blur' }
],
},
recordModal:false,
modal2:false,
modal3:false,
......@@ -298,13 +300,6 @@ export default {
}
},
methods: {
ok () {
this.$Message.info('Clicked ok');
},
cancel () {
this.$Message.info('Clicked cancel');
},
// 变更状态
selectFn2(e) {
if(e.target.value==5){
......@@ -354,7 +349,14 @@ export default {
//重启面试
OPPeninterview(tid,sta4){
this.oppenInterviewID=tid
this.OPPeninterviewSTA=sta4
let parmars={
resumeId:tid
}
formstatus(parmars).then(res=>{
if(res.data.success==true){
this.OPPeninterviewSTA=res.data.body.workFlow
}
})
this.modal4=true
},
//操作状态
......@@ -511,6 +513,7 @@ export default {
this. serchListInterview()
}
})
this.modal4=false
},
// 选择变更状态时的元素
selectchangeElement(e,SID){
......@@ -708,6 +711,7 @@ export default {
this.pageSize=page
this.SearchList()
},
},
mounted(){
this.serchListInterview()
......@@ -718,14 +722,14 @@ export default {
</script>
<style>
.interview{
/* min-height: 2000px; */
height: 100%;
width:100%;
background:#EDEDED
}
.interview-left{
/* min-height: 1900px; */
min-height: 800px;
overflow-y: auto;
min-height: 790px;
/* overflow-y: auto; */
overflow-x:hidden;
width: 70%;
float: left;
......@@ -746,7 +750,7 @@ export default {
.leftcontentContent{
width: 100%;
margin-top: 10px;
margin-bottom: 40px
/* margin-bottom: 40px; */
}
.contentMassage{
width: 53%;
......@@ -758,30 +762,30 @@ export default {
/* margin-bottom: 35px */
}
.contentState{
width:22%;
width:23%;
height: 60px;
float: left;
margin-left: 1%;
margin-left: 1.5%;
background: white;
margin-top: 10px
/* margin-bottom: 35px */
}
.contentRecord{
width:19%;
width:20%;
height: 60px;
float: left;
margin-left: 1%;
margin-left: 1.5%;
background: white;
margin-top: 10px
/* margin-bottom: 35px */
}
.InpageBottom{
height: 40px;
width: 55%;
width: 56%;
background:#EDEDED;
position: fixed;
bottom: 0;
margin-left:1%;
margin-left:0.6%;
}
.active2{
color: #0092FF
......
......@@ -50,6 +50,7 @@ export default {
twocontent:false,
twocontentmessage:'',
channelarr:[],
Massage:'',
ISIDMIN:'',
}
},
......@@ -69,26 +70,6 @@ export default {
password:this.formInline.password,
confirmPassWord:this.formInline.passwordTwo
}
// if(this.formInline.password==123456){
// console.log(4444444)
// this.$Notice.error({
// title: '提示',
// desc: '请您填写正确的手机号',
// });
// this.twocontentmessage='输入密码与初始密码相同,请重新输入'
// setInterval(() => {
// this.twocontent=false
// }, 3000)
// return
// }
// if(this.formInline.passwordTwo==123456){
// console.log(4444444)
// this.twocontentmessage='输入密码与初始密码相同,请重新输入'
// setInterval(() => {
// this.twocontent=false
// }, 3000)
// return
// }
if(this.formInline.passwordTwo!==this.formInline.password){
this.twocontentmessage='输入密码不一致,请重新输入'
this.twocontent=true
......@@ -96,13 +77,6 @@ export default {
this.twocontent=false
}, 3000)
return
}else{
if(this.formInline.password==123456||this.formInline.passwordTwo==123456){
console.log(636467)
this.twocontentmessage='输入密码与初始密码相同,请重新输入'
console.log(this.twocontentmessage)
return
}
}
if(this.formInline.password.length>20){
this.twocontentmessage='请输入4-20位密码'
......@@ -139,8 +113,14 @@ export default {
localStorage.setItem('token',res.data.body.token)
this.$router.replace({name:'allResume'})
}
if(res.data.body.code='101'){
this.twocontentmessage=res.data.body.message
if(res.data.success==false){
this.Massage=res.data.body.message
this.twocontent=true
this.twocontentmessage=this.Massage
setInterval(() => {
this.twocontent=false
}, 3000)
}
})
},
......
......@@ -50,7 +50,7 @@
</div>
<div style="width:100%;float:left;margin-bottom:40px" class="a">
<div style="margin:50px auto;width:300px;height:200px;line-height:200px;text-align:center;font-size:20px;color:LightGray" v-show="ajaxData.length==0">暂无数据</div>
<div class="Resumecontent" v-for='(item,i) in ajaxData' :key="i" @mouseover="ahove" >
<div class="Resumecontent" v-for='(item,i) in ajaxData' :key="i" @mouseover="ahove($event)" >
<div class="detailResume" id="a" style="">
<p>
<span style="display:inline-block;height:100%;font-size: 12px;margin-top:5px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap;margin-top:5px">
......@@ -210,14 +210,14 @@
<span>更改为<span style="color:blue">“邀请约面”</span>的状态后,你需要从<span style="color:blue">”面试管理“</span>中对该候选人进行后续的操作。</span>
</p>
<p style="margin-top:20px;line-height:25px">
<Form :label-width="80">
<FormItem label="邀约人" style="margin-top:20px" >
<Form :label-width="80" ref="formInline" :rules="ruleInline">
<FormItem label="邀约人" style="margin-top:20px" prop="ower">
<Input v-model="UpdateOWER" style="width:180px" :maxlength="5"/>
</FormItem>
<FormItem label="面试时间" style="margin-top:20px">
<FormItem label="面试时间" style="margin-top:20px" prop='time'>
<DatePicker type="datetime" style="width:180px" v-model="UpdateTIME" format="yyyy-MM-dd HH:mm" @on-change="changeTime" :options="options3" :editable='false'></DatePicker>
</FormItem>
<FormItem label="面试官" style="margin-top:20px">
<FormItem label="面试官" style="margin-top:20px" prop='view'>
<Input v-model="UpdateVIEW" style="width:180px" :maxlength="5"/>
</FormItem>
</Form>
......@@ -296,6 +296,17 @@ import Router from 'vue-router';
export default {
data () {
return {
ruleInline: {
ower: [
{ required: true, pattern:this.UpdateOWER!=='', message: '邀约人不能为空', trigger: 'blur' }
],
time: [
{ required: true, pattern:this.UpdateTIME!=='', message: '面试时间不能为空', trigger: 'blur' }
],
view: [
{ required: true, pattern:this.UpdateVIEW!=='',message: '面试官不能为空', trigger: 'blur' }
],
},
modal1:false,
modal2:false,
modal3:false,
......@@ -1029,8 +1040,8 @@ import Router from 'vue-router';
this.SearchList(this.pageT)
},
// 鼠标滑过事件
ahove(){
this.bg = 'background-color:red';
ahove(e){
// e.target.style.backgroundColor='#'+;
}
},
......@@ -1055,7 +1066,7 @@ import Router from 'vue-router';
}
.allResume-right{
height: 800px;
overflow-y: auto;
overflow-y: auto;
width: 70%;
float: left;
margin-left:1%;
......
......@@ -209,14 +209,14 @@
<span>更改为<span style="color:blue">“邀请约面”</span>的状态后,你需要从<span style="color:blue">”面试管理“</span>中对该候选人进行后续的操作。</span>
</p>
<p style="margin-top:20px;line-height:25px">
<Form :label-width="80">
<FormItem label="邀约人" style="margin-top:20px">
<Form :label-width="80" ref="formInline" :rules="ruleInline">
<FormItem label="邀约人" style="margin-top:20px" prop="ower">
<Input v-model="UpdateOWER" style="width:180px" :maxlength="5"/>
</FormItem>
<FormItem label="面试时间" style="margin-top:20px">
<FormItem label="面试时间" style="margin-top:20px" prop="time">
<DatePicker type="datetime" style="width:180px" v-model="UpdateTIME" format="yyyy-MM-dd HH:mm:ss" @on-change="changeTime" :editable='false' :options="options3"></DatePicker>
</FormItem>
<FormItem label="面试官" style="margin-top:20px">
<FormItem label="面试官" style="margin-top:20px" prop="view">
<Input v-model="UpdateVIEW" style="width:180px" :maxlength="5"/>
</FormItem>
</Form>
......@@ -292,6 +292,17 @@ import {
export default {
data(){
return {
ruleInline: {
ower: [
{ required: true, pattern:this.UpdateOWER!=='', message: '邀约人不能为空', trigger: 'blur' }
],
time: [
{ required: true, pattern:this.UpdateTIME!=='', message: '面试时间不能为空', trigger: 'blur' }
],
view: [
{ required: true, pattern:this.UpdateVIEW!=='',message: '面试官不能为空', trigger: 'blur' }
],
},
a:[],
checked: false,
activeClass: 0,
......
......@@ -141,9 +141,17 @@ export default {
takeResume:this.formInline.model2
}
submitMassage(parmars).then(res=>{
console.log(9898787887)
if(res.data.success==true){
console.log(9898787887)
this.formInline.model1=''
this.formInline.model2=''
this.formInline.Inviter=''
this.formInline.InviterPhoneNumber=''
this.formInline.date=''
this.formInline.time=''
this.formInline.position=''
this.formInline.name=''
this.formInline.phoneNUmber=''
this.modal4=true
}
})
......
......@@ -31,20 +31,20 @@
<p style="border-bottom:1px solid black;line-height:30px" >
<input type='checkbox' class='input-checkbox' v-model='checked' v-on:click='checkedAll' style="margin-left:25px" v-show="idAdmin==true">
<span style="margin-left:10px;cursor:pointer" v-show="idAdmin==true" >全选</span>
<span style="margin-left:5px;cursor:pointer" v-show="idAdmin==true" >全选</span>
<span style="margin-left:40px;color:#2d8cf0" @click="UntyingAll" v-show="idAdmin==true">解绑</span>
</p>
<!-- <Spin size="large" fix v-if="spinShow" style="font-size:25px" v-show="idAdmin==true">加载中...</Spin> -->
<div v-for='item in ajaxData' :key="item.id" class="emailList">
<input type='checkbox' name='checkboxinput' class='input-checkbox' v-model='checkboxList' :value="item.id" style="margin-left:25px;margin-top:20px;cursor:pointer" @click="selectUntyingEle(item.id)"/>
<span style="margin-left:5px" >{{item.belongs}}</span>
<span style="margin-left:35px;">{{item.emailName}}</span>
<span style="margin-left:35px;">同步时间 | {{item.syncStartDate}} <span style="margin-left:10px">开始</span> </span>
<span style="margin-left:10px">新建时间 | {{item.createTime}}</span>
<span style="margin-left:35px;color:#2d8cf0;cursor:pointer" @click="UpdateEMAIL(item.emailName,item.belongs,item.id)">修改</span>
<span style="margin-left:35px;color:#2d8cf0;cursor:pointer" @click="UnbindingModal(item.id)">解绑</span>
<span style="margin-left:150px" v-if="item.c=='正常'" >{{item.syncMailMsg}}</span>
<span style="margin-left:150px;color:red" v-if="item.c=='系统'" >{{item.syncMailMsg}}</span>
<span style="margin-left:0.3%" >{{item.belongs}}</span>
<span style="margin-left:0.5%;">{{item.emailName}}</span>
<span style="margin-left:0.5%;">同步时间 | {{item.syncStartDate}}</span>
<span style="margin-left:2%;">新建时间 | {{item.createTime}}</span>
<span style="margin-left:1%;color:#2d8cf0;cursor:pointer" @click="UpdateEMAIL(item.emailName,item.belongs,item.id)">修改</span>
<span style="margin-left:1%;color:#2d8cf0;cursor:pointer" @click="UnbindingModal(item.id)">解绑</span>
<span style="margin-left:5%;" v-if="item.c=='正常'" >{{item.syncMailMsg}}</span>
<span style="margin-left:5%;color:red" v-if="item.c=='系统'" >{{item.syncMailMsg}}</span>
</div>
<div class="pageBottom" v-show="this.idAdmin==true">
<Page :total="totalSize" show-elevator show-total @on-change="pageChange" @on-page-size-change="pageSizeChange" :current='pageIndex' :page-size='pageSize' style="text-align:center;margin-top:8px"></Page>
......@@ -101,7 +101,7 @@
</Form>
</div>
<div slot='footer' style="text-align:center">
<Button type='primary' @click='modal4=false'>取消</Button>
<Button type='primary' @click='updatapassT'>取消</Button>
<Button type='primary' @click="UpdateemailTwo" >保存</Button>
</div>
</Modal>
......@@ -130,6 +130,7 @@ export default {
modal4:false,
modal5:false,
condition:'',
Massage:'',
pageT:'',
spinShow:true,
idAdmin:'',
......@@ -192,12 +193,6 @@ export default {
});
}
},
ok () {
this.$Message.info('Clicked ok');
},
cancel () {
this.$Message.info('Clicked cancel');
},
//绑定同步邮箱
bindingSynchronizat(){
if(this.formInline.emailNumber==''||this.formInline.emailPsd==''||this.formInline.UserName==''||this.DATA==''){
......@@ -223,9 +218,16 @@ export default {
this.formInline.emailPsd=''
this.formInline.UserName=''
this.DATA=''
}else{
}
if(res.data.success==false){
this.modal3=false
// this.modal1=true
this.Massage=res.data.body.message
console.log(53256236652,this.Massage)
this.$Notice.error({
title: '提示',
desc: this.Massage,
duration:2
});
}
},()=>{
this.modal3=false
......@@ -301,8 +303,14 @@ export default {
}
updateemailTWO(parmars).then(res=>{
if(res.data.success==true){
this.UpassWord=''
this.modal4=false
this.SearchList(this.pageT)
this.$Notice.success({
title: '提示',
desc: '修改成功',
duration:'2'
});
}else{
this.$Notice.error({
title: '提示',
......@@ -310,7 +318,6 @@ export default {
duration:'2'
});
this.UpassWord=''
// this.modal4=false
}
})
},
......@@ -323,7 +330,11 @@ export default {
Unbinding(){
jiebangEmail(this.NAme).then(res=>{
if(res.data.success==true){
this.$Message.success('解绑成功')
this.$Notice.success({
title: '提示',
desc: '解绑成功',
duration:'2'
});
this.modal5=false
this.SearchList(this.pageT)
}
......@@ -337,7 +348,11 @@ export default {
UntyingAll(){
UntyingAll(this.UntyingAllARR).then(res=>{
if(res.data.success==true){
this.$Message.success('解绑成功')
this.$Notice.success({
title: '提示',
desc: '解绑成功',
duration:'2'
});
this.SearchList(this.pageT)
}
})
......@@ -351,6 +366,10 @@ export default {
this.admin=localStorage.getItem('isADMIN')
let c=JSON.parse(this.admin)
this.idAdmin=c.isAdmin
},
updatapassT(){
this.modal4=false
this.UpassWord=''
}
},
......@@ -388,28 +407,28 @@ export default {
width:100%
}
.emailList :nth-child(2){
width: 80px;
width: 5%;
display: inline-block;
}
.emailList :nth-child(3){
width: 230px;
width: 15%;
display: inline-block;
}
.emailList :nth-child(4){
width: 230px;
display: inline-block;
display: inline-block;
}
.emailList :nth-child(5){
width: 230px;
display: inline-block;
display: inline-block;
}
.emailList :nth-child(6){
width: 30px;
display: inline-block;
display: inline-block;
}
.emailList :nth-child(7){
width: 30px;
display: inline-block;
display: inline-block;
}
.emailList :nth-child(8){
width: 15%;
display: inline-block;
}
.buTon :nth-child(1){
width: 70px;
......
......@@ -56,7 +56,7 @@
<span style="color:Grey;margin:5px 0 0 10px;display:inline-block">{{item.createTime}}入库|</span>
<span>{{item.creator}}</span>
</p>
<Button type='primary' style="margin:-55px 0 0 82%;width:80px;background:#2d8cf0;color:#fff" @click="delateONE(item.resumeId)">删除</Button>
<Button type='primary' style="margin:-55px 0 0 83%;width:60px;z-index:99" @click="delateONE(item.resumeId)">删除</Button>
</div>
</div>
</div>
......
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