diff --git a/src/common/dic.js b/src/common/dic.js index 3cc5a56..3b1c917 100644 --- a/src/common/dic.js +++ b/src/common/dic.js @@ -161,6 +161,10 @@ export const wageUnitCategoryState = [ ]; export const educationState = [ + { + label: '不限', + value: 8, + }, { label: '初中及以下', value: 7, @@ -188,6 +192,10 @@ export const educationState = [ { label: '博士', value: 1, + }, + { + label: 'MBA/EMBA', + value: 0, } ]; diff --git a/src/views/tenant/mission/Dialog/CopyMission.vue b/src/views/tenant/mission/Dialog/CopyMission.vue index 29ee8bb..db35080 100644 --- a/src/views/tenant/mission/Dialog/CopyMission.vue +++ b/src/views/tenant/mission/Dialog/CopyMission.vue @@ -22,7 +22,7 @@ {{item.label}} --> - + @@ -116,7 +115,6 @@ :fetch-suggestions="querySearchAsyncWorkType" placeholder="请选择工种" @select="handleSelectWorkType" - maxlength="15" show-word-limit :disabled = "worktypeDisabled" > @@ -554,14 +552,94 @@ export default { { label: "参考工资", prop: "wage", - formslot: true, - labelslot: false, - errorslot: false, + type: "select", + dicData: [ + { + value: '10-15元/小时', + label: '10-15元/小时', + }, + { + value: '16-20元/小时', + label: '16-20元/小时', + }, + { + value: '21-25元/小时', + label: '21-25元/小时', + }, + { + value: '26-30元/小时', + label: '26-30元/小时', + }, + { + value: '30元/小时以上', + label: '30元/小时以上', + }, + { + value: '100-150元/天', + label: '100-150元/天', + }, + { + value: '151-200元/天', + label: '151-200元/天', + }, + { + value: '201-250元/天', + label: '201-250元/天', + }, + { + value: '251-300元/天', + label: '251-300元/天', + }, + { + value: '300元/天以上', + label: '300元/天以上', + }, + { + value: '2000元(含)以下/月', + label: '2000元(含)以下/月', + }, + { + value: '2000-5000元(含)/月', + label: '2000-5000元(含)/月', + }, + { + value: '5000-8000元(含)/月', + label: '5000-8000元(含)/月', + }, + { + value: '8000-10000元(含)/月', + label: '8000-10000元(含)/月', + }, + { + value: '10000-15000元(含)/月', + label: '10000-15000元(含)/月', + }, + { + value: '15000-20000元(含)/月', + label: '15000-20000元(含)/月', + }, + { + value: '20000-25000元(含)/月', + label: '20000-25000元(含)/月', + }, + { + value: '25000-30000元(含)/月', + label: '25000-30000元(含)/月', + }, + { + value: '30000元以上/月', + label: '30000元以上/月', + }, + { + value: '面议、暂无要求', + label: '面议、暂无要求', + } + ], rules: [ { required: true, - whitespace: true, - validator: wage, + // whitespace: true, + // validator: wage, trigger: "blur", }, ], diff --git a/src/views/tenant/mission/Dialog/Employ.vue b/src/views/tenant/mission/Dialog/Employ.vue index 8b21d7a..7b57d95 100644 --- a/src/views/tenant/mission/Dialog/Employ.vue +++ b/src/views/tenant/mission/Dialog/Employ.vue @@ -199,7 +199,7 @@ import { viewContractImg, certCheckPass, getCode, resetPwd } from "@/api/manage/ import { contractDownload } from "@/api/manage/esignature.js";//api import Resume from "@/components/resume/index"; import { idNumberDDesensitization } from "@/util/util"; -import { applyStatus } from '@/api/manage/econtract' +// import { applyStatus } from '@/api/manage/econtract' import { mapGetters } from 'vuex' import { dateFormat } from "@/util/date"; import { getConfig } from '@/api/tenant/config' diff --git a/src/views/tenant/works/Dialog/CopyMission.vue b/src/views/tenant/works/Dialog/CopyMission.vue index 87ac880..7c24f0c 100644 --- a/src/views/tenant/works/Dialog/CopyMission.vue +++ b/src/views/tenant/works/Dialog/CopyMission.vue @@ -22,7 +22,7 @@ {{item.label}} --> - + @@ -116,7 +115,6 @@ :fetch-suggestions="querySearchAsyncWorkType" placeholder="请选择工种" @select="handleSelectWorkType" - maxlength="15" show-word-limit :disabled = "worktypeDisabled" > @@ -422,34 +420,34 @@ export default { { validator: validatePass, trigger: 'blur' } ], }, + // { + // label: "发布时间", + // prop: "etimePub", + // type: "date", + // placeholder: "请选择报名截止日期", + // format: "yyyy-MM-dd", + // valueFormat: "yyyy-MM-dd 23:59:59", + // pickerOptions: { + // disabledDate(time) { + // return !( + // time.getTime() > Date.now() - 8.64e7&& + // (!self.startTime || time.getTime() < self.startTime) && + // (!self.endTime || time.getTime() < self.endTime) + // ); + // }, + // }, + // rules: [ + // { + // required: true, + // message: "请选择报名截止日期", + // trigger: "blur", + // }, + // ], + // span: 10, + // }, { - label: "岗位时间", - prop: "etimePub", - type: "date", - placeholder: "请选择报名截止日期", - format: "yyyy-MM-dd", - valueFormat: "yyyy-MM-dd 23:59:59", - pickerOptions: { - disabledDate(time) { - return !( - time.getTime() > Date.now() - 8.64e7&& - (!self.startTime || time.getTime() < self.startTime) && - (!self.endTime || time.getTime() < self.endTime) - ); - }, - }, - rules: [ - { - required: true, - message: "请选择报名截止日期", - trigger: "blur", - }, - ], - span: 10, - }, - { - label: "", - labelWidth: 0, + label: "发布时间", + // labelWidth: 0, prop: "stime", type: "date", placeholder: "请选择岗位开始日期", @@ -488,43 +486,43 @@ export default { trigger: "blur", }, ], - span: 7, + span: 12, }, - { - label: "", - labelWidth: 0, - prop: "etime", - type: "date", - placeholder: "请选择岗位结束日期", - format: "yyyy-MM-dd", - valueFormat: "yyyy-MM-dd 23:59:59", - disabled:self.endTimeFlag, - pickerOptions: { - disabledDate(time) { - if(!self.obj.stime){ - return true - } - if(self.days){ - let mutiply=1000*60*60*24; - return !( - time.getTime() > Date.now() && - (!self.startTime || - (time.getTime() > self.startTime && - time.getTime() < self.startTime + self.days*mutiply)) - ); - } + // { + // label: "", + // labelWidth: 0, + // prop: "etime", + // type: "date", + // placeholder: "请选择岗位结束日期", + // format: "yyyy-MM-dd", + // valueFormat: "yyyy-MM-dd 23:59:59", + // disabled:self.endTimeFlag, + // pickerOptions: { + // disabledDate(time) { + // if(!self.obj.stime){ + // return true + // } + // if(self.days){ + // let mutiply=1000*60*60*24; + // return !( + // time.getTime() > Date.now() && + // (!self.startTime || + // (time.getTime() > self.startTime && + // time.getTime() < self.startTime + self.days*mutiply)) + // ); + // } - }, - }, - rules: [ - { - required: true, - message: "请选择岗位结束日期", - trigger: "blur", - }, - ], - span: 7, - }, + // }, + // }, + // rules: [ + // { + // required: true, + // message: "请选择岗位结束日期", + // trigger: "blur", + // }, + // ], + // span: 7, + // }, ], }, { @@ -554,14 +552,94 @@ export default { { label: "参考工资", prop: "wage", - formslot: true, - labelslot: false, - errorslot: false, + type: "select", + dicData: [ + { + value: '10-15元/小时', + label: '10-15元/小时', + }, + { + value: '16-20元/小时', + label: '16-20元/小时', + }, + { + value: '21-25元/小时', + label: '21-25元/小时', + }, + { + value: '26-30元/小时', + label: '26-30元/小时', + }, + { + value: '30元/小时以上', + label: '30元/小时以上', + }, + { + value: '100-150元/天', + label: '100-150元/天', + }, + { + value: '151-200元/天', + label: '151-200元/天', + }, + { + value: '201-250元/天', + label: '201-250元/天', + }, + { + value: '251-300元/天', + label: '251-300元/天', + }, + { + value: '300元/天以上', + label: '300元/天以上', + }, + { + value: '2000元(含)以下/月', + label: '2000元(含)以下/月', + }, + { + value: '2000-5000元(含)/月', + label: '2000-5000元(含)/月', + }, + { + value: '5000-8000元(含)/月', + label: '5000-8000元(含)/月', + }, + { + value: '8000-10000元(含)/月', + label: '8000-10000元(含)/月', + }, + { + value: '10000-15000元(含)/月', + label: '10000-15000元(含)/月', + }, + { + value: '15000-20000元(含)/月', + label: '15000-20000元(含)/月', + }, + { + value: '20000-25000元(含)/月', + label: '20000-25000元(含)/月', + }, + { + value: '25000-30000元(含)/月', + label: '25000-30000元(含)/月', + }, + { + value: '30000元以上/月', + label: '30000元以上/月', + }, + { + value: '面议、暂无要求', + label: '面议、暂无要求', + } + ], rules: [ { required: true, - whitespace: true, - validator: wage, + // whitespace: true, + // validator: wage, trigger: "blur", }, ], diff --git a/src/views/tenant/works/Table/ExpiredMission.vue b/src/views/tenant/works/Table/ExpiredMission.vue index ca64803..c74cc03 100644 --- a/src/views/tenant/works/Table/ExpiredMission.vue +++ b/src/views/tenant/works/Table/ExpiredMission.vue @@ -196,7 +196,7 @@ export default { column: [ { label: "岗位名称", - prop: "missionTitle", + prop: "jobName", slot: true, display: false, }, diff --git a/src/views/tenant/works/Table/FinishedMission.vue b/src/views/tenant/works/Table/FinishedMission.vue index 55483a0..00631bf 100644 --- a/src/views/tenant/works/Table/FinishedMission.vue +++ b/src/views/tenant/works/Table/FinishedMission.vue @@ -194,7 +194,7 @@ export default { column: [ { label: "岗位名称", - prop: "missionTitle", + prop: "jobName", display: false, slot: true, }, diff --git a/src/views/tenant/works/Table/OngoingMission.vue b/src/views/tenant/works/Table/OngoingMission.vue index 9bd6538..ae6089b 100644 --- a/src/views/tenant/works/Table/OngoingMission.vue +++ b/src/views/tenant/works/Table/OngoingMission.vue @@ -190,7 +190,7 @@ export default { column: [ { label: "岗位名称", - prop: "missionTitle", + prop: "jobName", display: false, slot: true, }, diff --git a/src/views/tenant/works/Table/WaitingMission.vue b/src/views/tenant/works/Table/WaitingMission.vue index 6cc7970..17e9cfd 100644 --- a/src/views/tenant/works/Table/WaitingMission.vue +++ b/src/views/tenant/works/Table/WaitingMission.vue @@ -12,10 +12,10 @@ - - + + - {{ row.missionTitle | ellipsis }} + {{ row.jobName | ellipsis }} @@ -224,51 +224,56 @@ export default { }, { label: "岗位编码", - prop: "id", + prop: "missionNo", width: 180, - display: false, + display: true, }, { - label: "开始日期", - prop: "stime", - display: false, - width: 130, - slot: true, + label: "发布时间", + prop: "createTime", + display: true, + width: 160, }, + // { + // label: "岗位状态", + // prop: "jobStatus", + // slot: true, + // display: false, + // width: 110, + // dicData: [ + // { + // label: "在招", + // value: 1, + // }, + // { + // label: "已招", + // value: 2, + // }, + // { + // label: "过期", + // value: 3, + // }, + // { + // label: "未正式发布", + // value: 4, + // }, + // ], + // }, { - label: "岗位状态", - prop: "jobStatus", - slot: true, - display: false, - width: 110, - dicData: [ - { - label: "在招", - value: 1, - }, - { - label: "已招", - value: 2, - }, - { - label: "过期", - value: 3, - }, - { - label: "未正式发布", - value: 4, - }, - ], - }, - { - label: "申请人数", + label: "招聘人数", prop: "peopleNum", - slot: true, - display: false, + slot: false, + display: true, }, { - label: "录用人数", - prop: "applyNum", + label: "薪资待遇", + prop: "wage", + slot: false, + display: true, + }, + { + label: "报名人数", + prop: "signUpCount", slot: true, display: false, }, @@ -384,6 +389,8 @@ export default { const data = res.data.data; this.page.total = data.total; this.data = data.records; + console.log(data.records) + console.log(this.data) this.loading = false; }); },