|
|
@@ -137,7 +137,7 @@
|
|
|
<view class="form-item">
|
|
|
<view class="form-label">
|
|
|
工作内容
|
|
|
- <text class="word-count">{{ resume.workContent.length }}/1000</text>
|
|
|
+ <text class="word-count">{{ resume.workContent && resume.workContent.length || 0 }}/1000</text>
|
|
|
</view>
|
|
|
<view class="form-input">
|
|
|
<textarea v-model="resume.workContent" placeholder="选填,请输入" maxlength="1000" auto-height
|
|
|
@@ -153,7 +153,7 @@
|
|
|
<view class="form-item">
|
|
|
<view class="form-label">
|
|
|
工作业绩
|
|
|
- <text class="word-count">{{ resume.workPerformance.length }}/1000</text>
|
|
|
+ <text class="word-count">{{ resume.workPerformance && resume.workPerformance.length || 0 }}/1000</text>
|
|
|
</view>
|
|
|
<view class="form-input">
|
|
|
<textarea v-model="resume.workPerformance" placeholder="选填,请输入" maxlength="1000" auto-height
|
|
|
@@ -357,6 +357,19 @@ export default {
|
|
|
res = res.data
|
|
|
that.formData.companyName = res.workExp.companyName
|
|
|
that.formData.businessTypes = JSON.parse(res.workExp.type)
|
|
|
+ // 设置公司业务类型回显
|
|
|
+ if (this.formData.businessTypes.length) {
|
|
|
+ for (let i = 0; i < this.formData.businessTypes.length; i++) {
|
|
|
+ for (let opt = 0; i < this.businessTypeOptions.length; opt++) {
|
|
|
+ const option = this.businessTypeOptions[opt]
|
|
|
+ if (this.formData.businessTypes[i] == option.value) {
|
|
|
+ this.businessTypeOptions[opt].checked = true
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ console.log(that.formData.businessTypes)
|
|
|
res.workExpDetails.forEach(function (item) {
|
|
|
item.skills = JSON.parse(item.skills)
|
|
|
item.employmentTime = item.startTime == '' ? [] : [item.startTime, item
|
|
|
@@ -563,6 +576,19 @@ export default {
|
|
|
this.$queue.showToast('任职时间不能为空')
|
|
|
return false;
|
|
|
}
|
|
|
+
|
|
|
+ // 判断开始时间是否大于结束时间
|
|
|
+ let startTime = ''
|
|
|
+ let endTime = ''
|
|
|
+ if (item.employmentTime.length == 2) {
|
|
|
+ startTime = item.employmentTime[0].split(' ')[0]
|
|
|
+ endTime = item.employmentTime[1].split(' ')[0]
|
|
|
+ }
|
|
|
+ if (startTime && endTime && startTime > endTime) {
|
|
|
+ this.$queue.showToast('任职开始时间不能大于任职结束时间')
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
if (item.position == '') {
|
|
|
this.$queue.showToast('岗位不能为空')
|
|
|
return false;
|