From a22b39f1a909a79c773615d9bcd991a86b6e08a6 Mon Sep 17 00:00:00 2001 From: Apcallover <1503963513@qq.com> Date: Wed, 3 Apr 2024 11:45:34 +0800 Subject: [PATCH] =?UTF-8?q?flat:=20=E8=A1=A8=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/mission/index.vue | 62 +++++----- .../tenant/mission/Table/WaitingMission.vue | 109 +++++++++++++----- vue.config.js | 2 +- 3 files changed, 117 insertions(+), 56 deletions(-) diff --git a/src/views/manage/mission/index.vue b/src/views/manage/mission/index.vue index 04ff1cd..7645083 100644 --- a/src/views/manage/mission/index.vue +++ b/src/views/manage/mission/index.vue @@ -165,11 +165,10 @@ import { import { mapGetters } from "vuex"; import missionView from "@/views/util/mission-view"; import zpView from "./zpView"; -import { missionState, wageUnitCategoryState, recruitStatus, dataSourcesEnum } from "@/common/dic"; +import { missionState, wageUnitCategoryState, recruitStatus, dataSourcesEnum, educationState } from "@/common/dic"; import { calcDate } from "@/util/date"; import { Message } from "element-ui"; import lodash from "lodash"; - const message = lodash.throttle( function (options) { Message(options); @@ -244,22 +243,6 @@ export default { searchSpan: 1, display: false, }, - // { - // label: "申请人数", - // prop: "applyNum", - // search: false, - // searchSpan: 1, - // display: false, - // minWidth: 70, - // }, - // { - // label: "录用人数", - // prop: "applyPassNum", - // search: false, - // searchSpan: 1, - // display: false, - // minWidth: 70, - // }, { label: "参考工资", prop: "wage", @@ -271,12 +254,34 @@ export default { label: "工资单位", prop: "wageUnitCategory", search: false, - hide: true, + // hide: true, dicData: wageUnitCategoryState, searchSpan: 5, display: false, }, - + { + label: "零工工种", + prop: "worktypeNames", + search: false, + display: false, + }, { + label: "年龄要求", + prop: "ageDesc", + search: false, + display: false, + },{ + label: "学历要求", + prop: "education", + type: "select", + dicData: educationState, + search: false, + display: false, + },{ + label: "经验要求", + prop: "experienceDesc", + search: false, + display: false, + }, { label: "任务状态", prop: "status", @@ -290,6 +295,7 @@ export default { { label: "任务编码", prop: "missionNo", + hide: true, display: false, }, { @@ -309,6 +315,14 @@ export default { minWidth: 70, format: "yyyy-MM-dd", }, + { + label: "结束日期", + prop: "etime", + type: "date", + display: false, + minWidth: 100, + format: "yyyy-MM-dd", + }, { label: "审核状态", prop: "reviewState", @@ -317,14 +331,6 @@ export default { span: 24, width: 80, }, - // { - // label: "结束日期", - // prop: "etime", - // type: "date", - // display: false, - // minWidth: 100, - // format: "yyyy-MM-dd", - // }, { label: "数据来源", prop: "dataSources", diff --git a/src/views/tenant/mission/Table/WaitingMission.vue b/src/views/tenant/mission/Table/WaitingMission.vue index 3e5de5c..568c78c 100644 --- a/src/views/tenant/mission/Table/WaitingMission.vue +++ b/src/views/tenant/mission/Table/WaitingMission.vue @@ -109,7 +109,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"; +import {dataSourcesEnum, educationState, missionState, recruitStatus, wageUnitCategoryState} from "@/common/dic"; export default { components: { @@ -222,55 +222,110 @@ export default { label: "任务名称", prop: "missionTitle", display: false, - slot: true, }, { label: "招聘人数", prop: "peopleNum", - slot: true, + search: false, + searchSpan: 1, display: false, - width: 110, + }, + { + label: "参考工资", + prop: "wage", + search: false, + searchSpan: 5, + display: false, + }, + { + label: "工资单位", + prop: "wageUnitCategory", + search: false, + // hide: true, + dicData: wageUnitCategoryState, + searchSpan: 5, + display: false, + }, + { + label: "零工工种", + prop: "worktypeNames", + search: false, + display: false, + }, { + label: "年龄要求", + prop: "ageDesc", + search: false, + display: false, + },{ + label: "学历要求", + prop: "education", + type: "select", + dicData: educationState, + search: false, + display: false, + },{ + label: "经验要求", + prop: "experienceDesc", + search: false, + display: false, + }, + { + label: "任务状态", + prop: "status", + type: "select", + dicData: missionState, + display: false, + hide: true, + span: 24, + width: 80, }, { label: "任务编码", prop: "missionNo", + hide: true, display: false, }, + { + label: "任务时长", + prop: "missionDuration", + search: false, + searchSpan: 5, + display: false, + hide: true, + minWidth: 70, + }, { label: "开始日期", prop: "stime", + type: "date", display: false, - width: 130, - slot: true, + minWidth: 70, + format: "yyyy-MM-dd", }, { - label: "完成日期", + label: "结束日期", prop: "etime", + type: "date", display: false, - width: 130, - slot: true, + minWidth: 100, + format: "yyyy-MM-dd", }, { - label: "招聘人数", - prop: "peopleNum", - slot: true, + label: "审核状态", + prop: "reviewState", + dicData: recruitStatus, display: false, - width: 110, + span: 24, + width: 80, + }, + { + label: "数据来源", + prop: "dataSources", + dicData: dataSourcesEnum, + display: false, + span: 24, + width: 80, }, - // { - // label: "申请人数", - // prop: "signUpCount", - // slot: true, - // display: false, - // width: 110, - // }, - // { - // label: "录用人数", - // prop: "takeOnCount", - // slot: true, - // display: false, - // width: 110, - // }, { label: "机构名称", prop: "companyName", diff --git a/vue.config.js b/vue.config.js index daacde0..d02b6dc 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,7 +23,7 @@ module.exports = { port: 1888, proxy: { "/api": { - target: 'http://10.165.0.173:8000', + target: 'http://192.168.1.106:8000', ws: true, changeOrigin: true, pathRewrite: {