Merge branch 'master' of gitee.com:beiwu/cmanager

This commit is contained in:
18500206848
2024-02-17 11:04:37 +08:00
8 changed files with 295 additions and 124 deletions

View File

@@ -22,7 +22,7 @@
<el-option v-for="(item,index) in userNatureList" :key="index" :label="item.label" :value="item.value">{{item.label}}</el-option>
</el-select>
</template> -->
<template slot-scope="{ disabled }" slot="wage">
<!-- <template slot-scope="{ disabled }" slot="wage">
<el-input
placeholder="请输入 参考工资"
v-model="obj.wage"
@@ -46,7 +46,7 @@
</template>
</el-select>
</el-input>
</template>
</template> -->
<template slot="cityId" slot-scope="{ disabled }">
<jl-city-cascader
@@ -89,7 +89,6 @@
:fetch-suggestions="querySearchAsync"
placeholder="请选择行业类型"
@select="handleSelect"
maxlength="15"
show-word-limit
ref="selectTradeId"
>
@@ -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",
},
],

View File

@@ -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'

View File

@@ -22,7 +22,7 @@
<el-option v-for="(item,index) in userNatureList" :key="index" :label="item.label" :value="item.value">{{item.label}}</el-option>
</el-select>
</template> -->
<template slot-scope="{ disabled }" slot="wage">
<!-- <template slot-scope="{ disabled }" slot="wage">
<el-input
placeholder="请输入 参考工资"
v-model="obj.wage"
@@ -46,7 +46,7 @@
</template>
</el-select>
</el-input>
</template>
</template> -->
<template slot="cityId" slot-scope="{ disabled }">
<jl-city-cascader
@@ -89,7 +89,6 @@
:fetch-suggestions="querySearchAsync"
placeholder="请选择行业类型"
@select="handleSelect"
maxlength="15"
show-word-limit
ref="selectTradeId"
>
@@ -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",
},
],

View File

@@ -196,7 +196,7 @@ export default {
column: [
{
label: "岗位名称",
prop: "missionTitle",
prop: "jobName",
slot: true,
display: false,
},

View File

@@ -194,7 +194,7 @@ export default {
column: [
{
label: "岗位名称",
prop: "missionTitle",
prop: "jobName",
display: false,
slot: true,
},

View File

@@ -190,7 +190,7 @@ export default {
column: [
{
label: "岗位名称",
prop: "missionTitle",
prop: "jobName",
display: false,
slot: true,
},

View File

@@ -12,10 +12,10 @@
</template>
<!--/自定义按钮-->
<!--自定义列-->
<template slot="missionTitle" slot-scope="{ row }">
<el-tooltip effect="dark" :content="row.missionTitle" placement="top">
<template slot="jobName" slot-scope="{ row }">
<el-tooltip effect="dark" :content="row.jobName" placement="top">
<div style="color: black">
<b>{{ row.missionTitle | ellipsis }}</b>
<b>{{ row.jobName | ellipsis }}</b>
</div>
</el-tooltip>
</template>
@@ -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;
});
},