From 9ef1e612c32dd84cccf74d0c97c70ad897f020de Mon Sep 17 00:00:00 2001 From: zxy <353513737@qq.com> Date: Tue, 27 Feb 2024 16:48:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/dic.js | 14 +- src/views/manage/mission/index.vue | 8 +- src/views/manage/works/count/index.vue | 10 +- src/views/manage/works/count/table/detail.vue | 24 +- src/views/manage/works/count/table/gather.vue | 22 +- src/views/manage/works/index.vue | 14 +- src/views/tenant/main/label/index.vue | 10 +- .../tenant/mission/Dialog/CopyMission.vue | 2 + .../tenant/mission/Table/WaitingMission.vue | 11 +- src/views/tenant/works/Dialog/CopyMission.vue | 260 +++++++----------- src/views/tenant/works/Dialog/Employ.vue | 6 +- src/views/tenant/works/Dialog/Recommend.vue | 4 +- .../tenant/works/Table/WaitingMission.vue | 2 +- src/views/util/work-view.vue | 3 + 14 files changed, 171 insertions(+), 219 deletions(-) diff --git a/src/common/dic.js b/src/common/dic.js index 9487047..1fbb3b4 100644 --- a/src/common/dic.js +++ b/src/common/dic.js @@ -24,7 +24,7 @@ export const orderGoods = [ export const timeStatus = [ { value: 0, label: "开始时间" }, { value: 1, label: "结束时间" }, - { value: 2, label: "截止时间" }, + // { value: 2, label: "截止时间" }, ]; export const jobStatus = [ // { value: "", label: "全部" }, @@ -71,10 +71,10 @@ export const companyMissionState = [ { value: 4, label: "已失效" }, ]; export const companyPostState = [ - { value: 1, label: "在招" }, - { value: 2, label: "已招" }, - { value: 3, label: "过期" }, - { value: 4, label: "未正式发布" }, + { value: 1, label: "招聘中" }, + // { value: 2, label: "已招" }, + { value: 3, label: "已完成" }, + { value: 4, label: "未发布" }, ]; //电子签章管理 export const esignatureState = [ @@ -347,4 +347,8 @@ export const serviceType = [ label: "个人标签", value: 1, }, + { + label: "服务标签", + value: 2, + } ]; diff --git a/src/views/manage/mission/index.vue b/src/views/manage/mission/index.vue index fe6fef9..c7538e4 100644 --- a/src/views/manage/mission/index.vue +++ b/src/views/manage/mission/index.vue @@ -333,10 +333,10 @@ export default { span: 24, width: 80, }, - { - label:"备注", - prop:"remarks" - } + // { + // label:"备注", + // prop:"remarks" + // } ], }, data: [], diff --git a/src/views/manage/works/count/index.vue b/src/views/manage/works/count/index.vue index df9ad4b..9601f48 100644 --- a/src/views/manage/works/count/index.vue +++ b/src/views/manage/works/count/index.vue @@ -17,8 +17,8 @@ 招聘中{{ taskGather.recruitCount }} 已完成{{ taskGather.completCount }} - 已失效{{ taskGather.invalidCount }} - 审核未通过{{ taskGather.rejectCount }} + + 未发布{{ taskGather.rejectCount }} @@ -178,9 +178,9 @@ export default { }) }, detailInfoInit() { - detailInfo().then(res => { - this.taskDetail = res.data.data - }) + // detailInfo().then(res => { + // this.taskDetail = res.data.data + // }) }, radioGroup(v) { setStore({ name: 'taskStatus', content: v, type: 'session' }) diff --git a/src/views/manage/works/count/table/detail.vue b/src/views/manage/works/count/table/detail.vue index 13bc7fd..090530c 100644 --- a/src/views/manage/works/count/table/detail.vue +++ b/src/views/manage/works/count/table/detail.vue @@ -68,7 +68,7 @@ export default { case 4: return '已失效' case 9: - return '审核未通过' + return '未发布' } } }, @@ -142,22 +142,22 @@ export default { label: "录用人数", prop: "employedCount", }, - { - label: "发工资人数", - prop: "userPayCount", - }, + // { + // label: "发工资人数", + // prop: "userPayCount", + // }, { - label: "工资", + label: "参考工资", prop: "wage", slot: true }, - { - label: "报名截止日期", - prop: "etimePub", - slot: true, - display: false, - }, + // { + // label: "报名截止日期", + // prop: "etimePub", + // slot: true, + // display: false, + // }, { label: "开始时间", prop: "stime", diff --git a/src/views/manage/works/count/table/gather.vue b/src/views/manage/works/count/table/gather.vue index db218a2..b476174 100644 --- a/src/views/manage/works/count/table/gather.vue +++ b/src/views/manage/works/count/table/gather.vue @@ -93,22 +93,22 @@ export default { prop: "recruitCount", display: false, }, - { - label: "任务中", - prop: "startCount", - display: false, - }, + // { + // label: "任务中", + // prop: "startCount", + // display: false, + // }, { label: "已完成", prop: "completCount", display: false, }, + // { + // label: "已失效", + // prop: "invalidCount", + // }, { - label: "已失效", - prop: "invalidCount", - }, - { - label: "审核未通过", + label: "未发布", prop: "rejectCount", display: false, }, @@ -134,7 +134,7 @@ export default { // display: false, // }, { - label: "最新发布岗位时间", + label: "发布时间", prop: "openTime", slot: true, display: false diff --git a/src/views/manage/works/index.vue b/src/views/manage/works/index.vue index 27379ba..dc888f9 100644 --- a/src/views/manage/works/index.vue +++ b/src/views/manage/works/index.vue @@ -33,7 +33,7 @@ - + @@ -270,6 +270,7 @@ export default { searchSpan: 5, display: false, minWidth: 70, + hide: true, }, { label: "", @@ -292,6 +293,7 @@ export default { type: "date", display: false, minWidth: 100, + hide: true, format: "yyyy-MM-dd", }, { @@ -302,6 +304,7 @@ export default { searchSpan: 5, display: false, minWidth: 100, + hide: true, format: "yyyy-MM-dd", }, { @@ -319,6 +322,7 @@ export default { dicData: wageUnitCategoryState, searchSpan: 5, display: false, + hide: true, }, { label: "岗位状态", @@ -329,10 +333,10 @@ export default { span: 24, width: 80, }, - { - label:"备注", - prop:"jobDescription" - } + // { + // label:"备注", + // prop:"jobDescription" + // } ], }, data: [], diff --git a/src/views/tenant/main/label/index.vue b/src/views/tenant/main/label/index.vue index 6f153af..6de6117 100644 --- a/src/views/tenant/main/label/index.vue +++ b/src/views/tenant/main/label/index.vue @@ -53,8 +53,8 @@ - - + + @@ -290,7 +290,7 @@ export default { }; return { height: "auto", - dialogWidth: "30%", + dialogWidth: "50%", calcHeight: 180, align: "center", menuAlign: "center", @@ -304,11 +304,11 @@ export default { index: true, indexLabel: "序号", selection: true, - dialogType: "dialog", + dialogType: "drawer", dialogClickModal: false, column: [ { - label: "标签", + label: "标签名称", prop: "name", // search: true, span: 24, diff --git a/src/views/tenant/mission/Dialog/CopyMission.vue b/src/views/tenant/mission/Dialog/CopyMission.vue index a494676..cacbc1a 100644 --- a/src/views/tenant/mission/Dialog/CopyMission.vue +++ b/src/views/tenant/mission/Dialog/CopyMission.vue @@ -879,8 +879,10 @@ export default { }, //工种 handleSelectWorkType(item){ + console.log('222222') this.workTypeBtnState = true; this.obj.worktypeIds = item.id; + console.log(item) }, //点击行业类型添加按钮 handleIconClick() { diff --git a/src/views/tenant/mission/Table/WaitingMission.vue b/src/views/tenant/mission/Table/WaitingMission.vue index 030542a..534b736 100644 --- a/src/views/tenant/mission/Table/WaitingMission.vue +++ b/src/views/tenant/mission/Table/WaitingMission.vue @@ -112,6 +112,7 @@ import { mapGetters } from "vuex"; import { dateFormat } from "@/util/date"; import { getTemplate } from "@/api/resource/template"; import saveButton from "./saveButton"; +import { missionState } from "@/common/dic"; export default { components: { @@ -262,7 +263,14 @@ export default { display: false, width: 110, }, - + { + label: "状态", + prop: "status", + // slot: true, + dicData: missionState, + display: false, + // width: 200, + }, { label: "提示", prop: "toStart", @@ -270,6 +278,7 @@ export default { display: false, width: 200, }, + ], }; }, diff --git a/src/views/tenant/works/Dialog/CopyMission.vue b/src/views/tenant/works/Dialog/CopyMission.vue index 0ca5e17..6947292 100644 --- a/src/views/tenant/works/Dialog/CopyMission.vue +++ b/src/views/tenant/works/Dialog/CopyMission.vue @@ -422,34 +422,8 @@ 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: "发布时间", - // labelWidth: 0, prop: "stime", type: "date", placeholder: "请选择岗位开始日期", @@ -471,10 +445,6 @@ export default { if(value){ self.stimeDate=value.split(' ')[0] self.endTimeFlag=false - // let date=value.split(' ')[0] - // getMounthDays(date).then(res=>{ - // self.days=res.data.data; - // }) } else{ self.endTimeFlag=true @@ -490,41 +460,44 @@ export default { ], 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: "结束时间", + prop: "etime", + type: "date", + placeholder: "请选择岗位结束日期", + format: "yyyy-MM-dd", + valueFormat: "yyyy-MM-dd 00:00:00", + // pickerOptions: { + // disabledDate(time) { + // return !( + // time.getTime() > Date.now() && + // (!self.endTime || + // (time.getTime() < self.endTime && + // time.getTime() > self.endTime - 2678400000)) && + // (!self.siginTime || time.getTime() > self.siginTime) + // ); + // }, + // }, + // change:({value})=>{ + // self.obj.etime=''; + // if(value){ + // self.etimeDate=value.split(' ')[0] + // self.endTimeFlag=false + // } + // else{ + // self.endTimeFlag=true + // } + // }, - // }, - // }, - // rules: [ - // { - // required: true, - // message: "请选择岗位结束日期", - // trigger: "blur", - // }, - // ], - // span: 7, - // }, + rules: [ + { + required: true, + message: "请选择岗位结束日期", + trigger: "blur", + }, + ], + span: 12, + }, ], }, { @@ -559,8 +532,6 @@ export default { rules: [ { required: true, - // whitespace: true, - // validator: wage, trigger: "blur", }, ], @@ -572,12 +543,6 @@ export default { formslot: true, labelslot: false, errorslot: false, - // type: "tree", - // dicData: self.tradeData, - // props: { - // label: "name", - // value: "id", - // }, rules: [ { required: true, @@ -593,7 +558,6 @@ export default { type: "tree", search: true, display: true, - // width: '150', dicUrl: `/api/jobslink-api/tenant/worktypes/base/list?type=2`, dicFormatter: (res) => { return res.data; //返回字典的层级结构 @@ -605,37 +569,12 @@ export default { rules: [ { required: true, - // validator: workType, message: "请输入岗位名", - // trigger: ["change", "blur"], trigger: "blur", }, ], - // dicData: self.workData, - // props: { - // label: "name", - // value: "id", - // }, - // rules: [ - // { - // required: true, - // message: "请选择工种", - // trigger: ["change"], - // }, - // ], span: 12, }, - // { - // label: "技能要求", - // prop: "skillIds", - // formslot: true, - // labelslot: false, - // errorslot: false, - // rules: [ - // { required: true, validator: skill, trigger: "change" }, - // ], - // span: 24, - // }, { label: "岗位描述", prop: "jobDescription", @@ -685,15 +624,6 @@ export default { ], span: 8, }, - // { - // label: "性别要求", - // type: "radio", - // prop: "sex", - // dicData: genderState, - // span: 10, - // offset: 6, - // clearable: false, - // }, { label: "年龄要求", type: "select", @@ -1011,45 +941,45 @@ export default { }, //点击工种添加按钮 - handleIconClickWorkType() { - this.$message.closeAll(); - let nameState = this.workDataNameAttr.indexOf(this.workTypeState) - if(this.workTypeState == ""){ - this.$message({ - type: "error", - message: "请输入要添加的工种！", - }) - }else if(nameState != -1){ - this.$message({ - type: "error", - message: "此工种已存在，请在列表中选择！", - }) - }else{ - workListAdd(this.obj.tradeId,this.workTypeState).then((res) =>{ - if(res.data.code == 200){ - this.obj.worktypeIds = res.data.data; - this.$message({ - type: "success", - message: res.data.msg, - }) - this.workTypeBtnState = true; - this.clearValidator('worktypeIds'); - getWork(this.obj.tradeId).then((res) => { - this.workData = res; - this.workDataNameAttr = res.map((ele)=>{ - return ele.name - }) - }) - }else{ - this.$message({ - type: "error", - message: res.data.msg, - }) - } - }); - } + // handleIconClickWorkType() { + // this.$message.closeAll(); + // let nameState = this.workDataNameAttr.indexOf(this.workTypeState) + // if(this.workTypeState == ""){ + // this.$message({ + // type: "error", + // message: "请输入要添加的工种！", + // }) + // }else if(nameState != -1){ + // this.$message({ + // type: "error", + // message: "此工种已存在，请在列表中选择！", + // }) + // }else{ + // workListAdd(this.obj.tradeId,this.workTypeState).then((res) =>{ + // if(res.data.code == 200){ + // this.obj.worktypeIds = res.data.data; + // this.$message({ + // type: "success", + // message: res.data.msg, + // }) + // this.workTypeBtnState = true; + // this.clearValidator('worktypeIds'); + // getWork(this.obj.tradeId).then((res) => { + // this.workData = res; + // this.workDataNameAttr = res.map((ele)=>{ + // return ele.name + // }) + // }) + // }else{ + // this.$message({ + // type: "error", + // message: res.data.msg, + // }) + // } + // }); + // } - }, + // }, // addressDel(){ this.obj.address = ""; @@ -1229,8 +1159,8 @@ export default { if(type!='edit'){ getLastTaskInfo().then(res=>{ const data=res.data.data; - this.obj.callName=data.callName; - this.obj.callTel=data.callTel; + // this.obj.callName=data.callName; + // this.obj.callTel=data.callTel; }) } @@ -1288,12 +1218,12 @@ export default { }) // 判断有无此技能 if(newSelectedSkills.length == 0){ - setTimeout(()=>{ - this.$message({ - type: "error", - message: "此岗位所包含技能已经不存在，请重新选择！", - }) - },1000); + // setTimeout(()=>{ + // this.$message({ + // type: "error", + // message: "此岗位所包含技能已经不存在，请重新选择！", + // }) + // },1000); }else{ this.selectedSkills = newSelectedSkills; } @@ -1330,12 +1260,12 @@ export default { if(tradeIdState == -1){ this.$message.closeAll(); this.obj.tradeId = ""; - setTimeout(()=>{ - this.$message({ - type: "error", - message: "此岗位所包含行业已经不存在，请重新选择！", - }) - },1000); + // setTimeout(()=>{ + // this.$message({ + // type: "error", + // message: "此岗位所包含行业已经不存在，请重新选择！", + // }) + // },1000); }else{ this.tradeState = this.obj.tradeNames; //判断有无此工种 @@ -1349,12 +1279,12 @@ export default { if(workDataIdState == -1){ this.$message.closeAll(); this.obj.worktypeIds = ""; - setTimeout(()=>{ - this.$message({ - type: "error", - message: "此岗位所包含工种已经不存在，请重新选择！", - }) - },1000); + // setTimeout(()=>{ + // this.$message({ + // type: "error", + // message: "此岗位所包含工种已经不存在，请重新选择！", + // }) + // },1000); }else{ this.workTypeState = this.obj.worktypeNames; getSkillList(this.obj.worktypeIds).then((res) => { diff --git a/src/views/tenant/works/Dialog/Employ.vue b/src/views/tenant/works/Dialog/Employ.vue index 12a1c57..6d2488e 100644 --- a/src/views/tenant/works/Dialog/Employ.vue +++ b/src/views/tenant/works/Dialog/Employ.vue @@ -425,7 +425,7 @@ export default { editBtn: false, excelBtn: false, columnBtn: false, - searchBtn: true, + searchBtn: false, searchShow: true, searchMenuSpan: 6, searchLabelWidth: 60, @@ -455,7 +455,7 @@ export default { { label: "姓名", prop: "realName", - search: true, + search: false, searchSpan: 4, width:70, }, @@ -509,7 +509,7 @@ export default { prop: "groupId", type: "tree", span: 24, - search: true, + search: false, display: true, width: '150', dicUrl: `/api/jobslink-api/tenant/talents/group/listAll`, diff --git a/src/views/tenant/works/Dialog/Recommend.vue b/src/views/tenant/works/Dialog/Recommend.vue index 1222986..18fe6b7 100644 --- a/src/views/tenant/works/Dialog/Recommend.vue +++ b/src/views/tenant/works/Dialog/Recommend.vue @@ -211,13 +211,13 @@ export default { // span: 24, // }, { - label: "人才库", + label: "重点人群库", prop: "groupId", type: "tree", span: 24, search: true, display: true, - width: '150', + width: '200', dicUrl: `/api/jobslink-api/tenant/talents/group/listAll`, dicFormatter: (res) => { return res.data.list; //返回字典的层级结构 diff --git a/src/views/tenant/works/Table/WaitingMission.vue b/src/views/tenant/works/Table/WaitingMission.vue index edbce66..9d357ed 100644 --- a/src/views/tenant/works/Table/WaitingMission.vue +++ b/src/views/tenant/works/Table/WaitingMission.vue @@ -56,7 +56,7 @@ 录用登记 查看 - 复制 + 编辑 {{ format(model.stime) }} + + {{ format(model.etime) }} +