|
|
|
@ -279,11 +279,23 @@ |
|
|
|
<view class="dis-flex f-24 formtitle"> |
|
|
|
<view class="t-r" style="flex: 0.3;"> |
|
|
|
<view class="dis-il-block" style="font-size: 20upx;color: #FFFFFF;float: left;">*</view> |
|
|
|
工作经历 |
|
|
|
在校职务 |
|
|
|
</view> |
|
|
|
<view style="flex: 0.8;padding-left: 40upx;" @click="schoolWorkShow = true"> |
|
|
|
<view class="uni-input"> |
|
|
|
点击编辑在校职务经验 |
|
|
|
<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="dis-flex f-24 formtitle"> |
|
|
|
<view class="t-r" style="flex: 0.3;"> |
|
|
|
<view class="dis-il-block" style="font-size: 20upx;color: #FFFFFF;float: left;">*</view> |
|
|
|
实习经验 |
|
|
|
</view> |
|
|
|
<view style="flex: 0.8;padding-left: 40upx;" @click="afterWorkShow = true"> |
|
|
|
<view class="uni-input"> |
|
|
|
点击编辑项目经验 |
|
|
|
点击编辑实习经验 |
|
|
|
<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
@ -373,10 +385,93 @@ |
|
|
|
</view> |
|
|
|
</view> --> |
|
|
|
</PopManager> |
|
|
|
<PopManager :show="schoolWorkShow" :type="'center'" :overlay="'false'" :showOverlay="'false'"> |
|
|
|
<view class="after-work"> |
|
|
|
<view class="after-work-title dis-flex"> |
|
|
|
<view class="flex-box f-32 f-w">在校职务经验</view> |
|
|
|
<view class="flex-box iconfont icon-close t-r" @click="schoolWorkShow = false"></view> |
|
|
|
</view> |
|
|
|
<view class="f-28" style="padding: 30upx 0;height: 50vh;overflow: auto;"> |
|
|
|
<view class="after-item" v-for="(item, index) in school_officeList"> |
|
|
|
<view class="dis-flex after-item-item"> |
|
|
|
<view style="flex: 0.3;" class="f-w">学校名称</view> |
|
|
|
<view style="flex: 0.8;padding-left: 20upx;">{{ item.school_name }}</view> |
|
|
|
</view> |
|
|
|
<view class="dis-flex after-item-item"> |
|
|
|
<view style="flex: 0.3;" class="f-w">职务名称</view> |
|
|
|
<view style="flex: 0.8;padding-left: 20upx;">{{ item.position }}</view> |
|
|
|
</view> |
|
|
|
<view class="dis-flex after-item-item"> |
|
|
|
<view style="flex: 0.3;" class="f-w">任职时间</view> |
|
|
|
<view style="flex: 0.8;padding-left: 20upx;">{{ item.starttime }}-{{ item.endtime }}</view> |
|
|
|
</view> |
|
|
|
<!-- <view class="dis-flex after-item-item"> |
|
|
|
<view style="flex: 0.3;" class="f-w">职务内容</view> |
|
|
|
<view style="flex: 0.8;padding-left: 20upx;">{{ item.content }}</view> |
|
|
|
</view> --> |
|
|
|
<view class="dis-flex after-item-item"> |
|
|
|
<view style="flex: 0.5;" class="f-w"></view> |
|
|
|
<view style="flex: 0.5;text-align: right;"> |
|
|
|
<view class="dis-il-block c-ff4444" @click="deleteSchoolWork(index)">删除</view> |
|
|
|
<view class="dis-il-block" style="color: #008CFF;padding-left: 50upx;" @click="redactSchoolWork(item, index)">编辑</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="work-btn" @click="addSchoolWorkShow = true">添加经验</view> |
|
|
|
<PopManager :show="addSchoolWorkShow" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="closeaddschool"> |
|
|
|
<view class="add-work" v-show="addSchoolWorkShow"><!-- 此处添加v-show，增强视图效果 --> |
|
|
|
<view class="dis-flex" style="padding-bottom: 30upx;"> |
|
|
|
<view class="flex-box f-32">添加在校职务经验</view> |
|
|
|
<view class="flex-box iconfont icon-close t-r" @click="closeaddschool"></view> |
|
|
|
</view> |
|
|
|
<view> |
|
|
|
<view class="dis-flex" style="padding-bottom: 40upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;"> |
|
|
|
<view class="f-26" style="flex: 0.3;line-height: 45upx;">学校名称</view> |
|
|
|
<view style="flex: 0.7;"> |
|
|
|
<input type="text" style="font-size: 26upx;" placeholder="请填写学校名称" v-model="school_office.school_name" /> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="dis-flex" style="padding-bottom: 40upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;"> |
|
|
|
<view class="f-26" style="flex: 0.3;">职务名称</view> |
|
|
|
<view style="flex: 0.7;"> |
|
|
|
<input type="text" style="font-size: 26upx;" placeholder="请填写职务名称" v-model="school_office.position" /> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="dis-flex" style="padding-bottom: 40upx;padding-top: 10upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;"> |
|
|
|
<view class="f-26" style="flex: 0.3;">开始时间</view> |
|
|
|
<view :class="school_office.starttime ? 'f-26' : 'f-26 col-6'" style="flex: 0.7;line-height: 30upx;" @click="startTime = true"> |
|
|
|
{{ school_office.starttime || '请选择任职开始时间' }} |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="dis-flex" style="padding-bottom: 40upx;padding-top: 10upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;"> |
|
|
|
<view class="f-26" style="flex: 0.3;">结束时间</view> |
|
|
|
<view :class="school_office.endtime ? 'f-26' : 'f-26 col-6'" style="flex: 0.7;line-height: 30upx;" @click="endTime = true"> |
|
|
|
{{ school_office.endtime || '请选择任职结束时间' }} |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<!-- <view class="dis-flex" style="padding-bottom: 20upx;padding-top: 40upx;"> |
|
|
|
<view class="f-26" style="flex: 0.3;">职务内容</view> |
|
|
|
<view style="flex: 0.7;"> |
|
|
|
<textarea |
|
|
|
type="text" |
|
|
|
style="font-size: 26upx;width: 100%;height: 400upx;" |
|
|
|
maxlength="9999" |
|
|
|
placeholder="请填写职务内容" |
|
|
|
v-model="school_office.content" |
|
|
|
/> |
|
|
|
</view> |
|
|
|
</view> --> |
|
|
|
<view class="dis-il-block t-c redbtn" style="bottom: -20%;" @click.stop="addschool_office">保存</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</PopManager> |
|
|
|
</view> |
|
|
|
</PopManager> |
|
|
|
<PopManager :show="afterWorkShow" :type="'center'" :overlay="'false'" :showOverlay="'false'"> |
|
|
|
<view class="after-work"> |
|
|
|
<view class="after-work-title dis-flex"> |
|
|
|
<view class="flex-box f-32 f-w">项目经历</view> |
|
|
|
<view class="flex-box f-32 f-w">实习经验</view> |
|
|
|
<view class="flex-box iconfont icon-close t-r" @click="afterWorkShow = false"></view> |
|
|
|
</view> |
|
|
|
<view class="f-28" style="padding: 30upx 0;height: 50vh;overflow: auto;"> |
|
|
|
@ -406,11 +501,11 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="work-btn" @click="addWorkShow = true">添加经历</view> |
|
|
|
<view class="work-btn" @click="addWorkShow = true">添加经验</view> |
|
|
|
<PopManager :show="addWorkShow" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="closeadd"> |
|
|
|
<view class="add-work" v-show="addWorkShow"><!-- 此处添加v-show，增强视图效果 --> |
|
|
|
<view class="dis-flex" style="padding-bottom: 30upx;"> |
|
|
|
<view class="flex-box f-32">添加项目经历</view> |
|
|
|
<view class="flex-box f-32">添加实习经验</view> |
|
|
|
<view class="flex-box iconfont icon-close t-r" @click="closeadd"></view> |
|
|
|
</view> |
|
|
|
<view> |
|
|
|
@ -468,6 +563,10 @@ |
|
|
|
<view style="flex: 0.3;" class="f-w">学校名称</view> |
|
|
|
<view style="flex: 0.8;padding-left: 20upx;">{{ item.school }}</view> |
|
|
|
</view> |
|
|
|
<view class="dis-flex after-item-item"> |
|
|
|
<view style="flex: 0.3;" class="f-w">学校类型</view> |
|
|
|
<view style="flex: 0.8;padding-left: 20upx;">{{ item.graduated_school }}</view> |
|
|
|
</view> |
|
|
|
<view class="dis-flex after-item-item"> |
|
|
|
<view style="flex: 0.3;" class="f-w">就读时间</view> |
|
|
|
<view style="flex: 0.8;padding-left: 20upx;">{{ item.start_time }}-{{ item.end_time }}</view> |
|
|
|
@ -499,6 +598,12 @@ |
|
|
|
<input type="text" style="font-size: 26upx;" placeholder="请填写学校名称" v-model="educational_experience.school" /> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="dis-flex" style="padding-bottom: 40upx;padding-top: 10upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;"> |
|
|
|
<view class="f-26" style="flex: 0.3;">学校类型</view> |
|
|
|
<view :class="educational_experience.graduated_school ? 'f-26' : 'f-26 col-6'" style="flex: 0.7;line-height: 30upx;" @click="graduated_show = true"> |
|
|
|
{{ educational_experience.graduated_school || '请选择学校类型' }} |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="dis-flex" style="padding-bottom: 40upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;"> |
|
|
|
<view class="f-26" style="flex: 0.3;">所属专业</view> |
|
|
|
<view style="flex: 0.7;"> |
|
|
|
@ -567,6 +672,15 @@ |
|
|
|
:disabled-after="false" |
|
|
|
ref="dateb" |
|
|
|
></w-picker> |
|
|
|
<w-picker |
|
|
|
:visible.sync="graduated_show" |
|
|
|
mode="selector" |
|
|
|
:value="educational_experience.graduated_school" |
|
|
|
default-type="label" |
|
|
|
:options="graduatedTypeOptions" |
|
|
|
@confirm="onConfirmGra($event, 'gra')" |
|
|
|
ref="gra" |
|
|
|
></w-picker> |
|
|
|
</view> |
|
|
|
</template> |
|
|
|
|
|
|
|
@ -593,6 +707,8 @@ export default{ |
|
|
|
addteachShow:false, |
|
|
|
afterWorkShow:false, |
|
|
|
educationShow:false, |
|
|
|
schoolWorkShow: false, |
|
|
|
addSchoolWorkShow: false, |
|
|
|
address:'', |
|
|
|
lblis:{}, |
|
|
|
klis:false, |
|
|
|
@ -635,6 +751,13 @@ export default{ |
|
|
|
experienceList:[], |
|
|
|
experienceIndex:0, |
|
|
|
businessList:[], |
|
|
|
school_office:{ |
|
|
|
school_name:'', |
|
|
|
position:'', |
|
|
|
starttime:'', |
|
|
|
endtime:'' |
|
|
|
}, |
|
|
|
school_officeList:[], |
|
|
|
work_experience:{ |
|
|
|
title:'', |
|
|
|
corporate_name:'', |
|
|
|
@ -642,11 +765,13 @@ export default{ |
|
|
|
end_time:'', |
|
|
|
content:'' |
|
|
|
}, |
|
|
|
graduated_show: false, |
|
|
|
educational_experience:{ |
|
|
|
school:'', |
|
|
|
graduated_school: '', |
|
|
|
major:'', |
|
|
|
start_time:'', |
|
|
|
end_time:'', |
|
|
|
end_time:'' |
|
|
|
}, |
|
|
|
work_experienceList:[], |
|
|
|
educational_experienceList:[], |
|
|
|
@ -654,6 +779,19 @@ export default{ |
|
|
|
upimg:false |
|
|
|
} |
|
|
|
}, |
|
|
|
computed:{ |
|
|
|
graduatedTypeOptions(){ |
|
|
|
let arr = []; |
|
|
|
for(let key in this.userInfo.graduated_school){ |
|
|
|
arr.push({ |
|
|
|
value:key, |
|
|
|
label:this.userInfo.graduated_school[key] |
|
|
|
}) |
|
|
|
} |
|
|
|
// console.log(arr, '学校类型数组'); |
|
|
|
return arr; |
|
|
|
}, |
|
|
|
}, |
|
|
|
components:{ |
|
|
|
wPicker, |
|
|
|
PopManager, |
|
|
|
@ -748,6 +886,11 @@ export default{ |
|
|
|
_this.educationIndex = index; |
|
|
|
} |
|
|
|
}) |
|
|
|
_this.educationList.map((item,index)=>{ |
|
|
|
if(item.id == _this.userInfo.education_label_id){ |
|
|
|
_this.educationIndex = index; |
|
|
|
} |
|
|
|
}) |
|
|
|
_this.experienceList.map((item,index)=>{ |
|
|
|
if(item.id == _this.userInfo.experience_label_id){ |
|
|
|
_this.experienceIndex = index; |
|
|
|
@ -764,6 +907,7 @@ export default{ |
|
|
|
} |
|
|
|
}) |
|
|
|
_this.genderIndex = Number(_this.userInfo.gender) - 2; |
|
|
|
_this.school_officeList = _this.userInfo.school_office; |
|
|
|
_this.educational_experienceList = _this.userInfo.educational_experience; |
|
|
|
_this.work_experienceList = _this.userInfo.work_experience; |
|
|
|
_this.userInfo.provinceid = _this.userInfo.expect_work_province; |
|
|
|
@ -794,6 +938,13 @@ export default{ |
|
|
|
} |
|
|
|
); |
|
|
|
}, |
|
|
|
redactSchoolWork(item,index){ |
|
|
|
// this.work_experience = item; |
|
|
|
let objString = JSON.stringify(item); |
|
|
|
this.school_office = JSON.parse(objString); |
|
|
|
this.redactIndex = index; |
|
|
|
this.addSchoolWorkShow = true; |
|
|
|
}, |
|
|
|
redact(item,index){ |
|
|
|
// this.work_experience = item; |
|
|
|
let objString = JSON.stringify(item); |
|
|
|
@ -839,6 +990,22 @@ export default{ |
|
|
|
true |
|
|
|
); |
|
|
|
}, |
|
|
|
deleteSchoolWork(index){ |
|
|
|
App.showError( |
|
|
|
`确定要删除该在校职务经验?`, |
|
|
|
data => { |
|
|
|
if (data.confirm) { |
|
|
|
this.school_officeList.map((item,indexs)=>{ |
|
|
|
if(index == indexs){ |
|
|
|
this.school_officeList.splice(index,1) |
|
|
|
} |
|
|
|
}) |
|
|
|
return |
|
|
|
} |
|
|
|
}, |
|
|
|
true |
|
|
|
); |
|
|
|
}, |
|
|
|
addTeach_experience(){ |
|
|
|
for(let key in this.educational_experience){ |
|
|
|
if(!this.educational_experience[key]){ |
|
|
|
@ -860,17 +1027,11 @@ export default{ |
|
|
|
this.addteachShow = false; |
|
|
|
this.educational_experience ={ |
|
|
|
school:'', |
|
|
|
graduated_school: '', |
|
|
|
major:'', |
|
|
|
start_time:'', |
|
|
|
end_time:'', |
|
|
|
}; |
|
|
|
this.work_experience ={ |
|
|
|
title:'', |
|
|
|
corporate_name:'', |
|
|
|
start_time:'', |
|
|
|
end_time:'', |
|
|
|
content:'' |
|
|
|
}; |
|
|
|
}, |
|
|
|
addwork_experience(){ |
|
|
|
for(let key in this.work_experience){ |
|
|
|
@ -896,12 +1057,30 @@ export default{ |
|
|
|
end_time:'', |
|
|
|
content:'' |
|
|
|
}; |
|
|
|
this.educational_experience ={ |
|
|
|
school:'', |
|
|
|
major:'', |
|
|
|
start_time:'', |
|
|
|
end_time:'', |
|
|
|
}; |
|
|
|
}, |
|
|
|
addschool_office(){ |
|
|
|
for(let key in this.school_office){ |
|
|
|
if(!this.school_office[key]){ |
|
|
|
uni.showToast({ |
|
|
|
icon:'none', |
|
|
|
title:'请完善在校职务经验' |
|
|
|
}); |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
if(this.redactIndex != null){ |
|
|
|
this.school_officeList.splice(this.redactIndex,1,this.school_office); |
|
|
|
this.redactIndex = null; |
|
|
|
}else{ |
|
|
|
this.school_officeList.push(this.school_office); |
|
|
|
} |
|
|
|
this.addSchoolWorkShow = false; |
|
|
|
this.school_office = { |
|
|
|
school_name:'', |
|
|
|
position:'', |
|
|
|
starttime:'', |
|
|
|
endtime:'', |
|
|
|
} |
|
|
|
}, |
|
|
|
onConfirmage(e){ |
|
|
|
this.userInfo.birth_time = e.result; |
|
|
|
@ -909,17 +1088,35 @@ export default{ |
|
|
|
onConfirmendTime(e){ |
|
|
|
this.educational_experience.end_time = e.result; |
|
|
|
this.work_experience.end_time = e.result; |
|
|
|
this.school_office.endtime = e.result; |
|
|
|
}, |
|
|
|
onConfirmstartTime(e){ |
|
|
|
console.log(e, '111111111111111111') |
|
|
|
// console.log(e, '111111111111111111') |
|
|
|
this.educational_experience.start_time = e.result; |
|
|
|
this.work_experience.start_time = e.result; |
|
|
|
this.school_office.starttime = e.result; |
|
|
|
}, |
|
|
|
onConfirmGra(e){ |
|
|
|
// console.log(e, '111111111111111111'); |
|
|
|
this.educational_experience.graduated_school = e.result; |
|
|
|
}, |
|
|
|
closeaddschool(){ |
|
|
|
this.addSchoolWorkShow = false; |
|
|
|
setTimeout(()=>{ |
|
|
|
this.school_office ={ |
|
|
|
school_name:'', |
|
|
|
position:'', |
|
|
|
starttime:'', |
|
|
|
endtime:'' |
|
|
|
}; |
|
|
|
},500) |
|
|
|
}, |
|
|
|
closeaddteach(){ |
|
|
|
this.addteachShow = false; |
|
|
|
setTimeout(()=>{ |
|
|
|
this.educational_experience ={ |
|
|
|
school:'', |
|
|
|
graduated_school: '', |
|
|
|
major:'', |
|
|
|
start_time:'', |
|
|
|
end_time:'', |
|
|
|
@ -977,6 +1174,7 @@ export default{ |
|
|
|
|
|
|
|
console.log(data,'------------') |
|
|
|
|
|
|
|
data.school_office = JSON.parse(JSON.stringify(_this.school_officeList)); |
|
|
|
data.work_experience = JSON.parse(JSON.stringify(_this.work_experienceList)); |
|
|
|
data.educational_experience = JSON.parse(JSON.stringify(_this.educational_experienceList)); |
|
|
|
data.expect_work_province = _this.userInfo.provinceid || data.expect_work_province; |
|
|
|
@ -1005,9 +1203,10 @@ export default{ |
|
|
|
delete data.industry_id; |
|
|
|
delete data.industry_pid; |
|
|
|
delete data.show_expect_position; |
|
|
|
delete data.graduated_school; |
|
|
|
console.log(data); |
|
|
|
for(let key in data){ |
|
|
|
if(!data[key] && data[key] !== 0){ |
|
|
|
if(!data[key] && data[key] !== 0){ |
|
|
|
uni.showToast({ |
|
|
|
icon:'none', |
|
|
|
title:'请完善资料' |
|
|
|
|
