diff --git a/src/views/manage/mission/index.vue b/src/views/manage/mission/index.vue index 39c16e2..0200afb 100644 --- a/src/views/manage/mission/index.vue +++ b/src/views/manage/mission/index.vue @@ -171,6 +171,9 @@ v-if="vaildData(permission.manage_mission_zpview, false)" >招聘情况 --> + + {{row.wage}}{{wageUnitCategoryStateEnum[row.wageUnitCategory]}} + @@ -196,6 +199,10 @@ import zpView from "./zpView"; import { missionState, wageUnitCategoryState, recruitStatus, dataSourcesEnum, educationState } from "@/common/dic"; import { calcDate } from "@/util/date"; import { Message } from "element-ui"; +const wageUnitCategoryStateEnum = {} +wageUnitCategoryState.map((item) => { + wageUnitCategoryStateEnum[item.value] = item.label +}) import lodash from "lodash"; const message = lodash.throttle( function (options) { @@ -214,6 +221,7 @@ export default { dataSourcesEnum, educationState, downloadButton: false, + wageUnitCategoryStateEnum, view: {}, form: {}, selectionList: [], @@ -284,15 +292,8 @@ export default { search: false, searchSpan: 5, display: false, - }, - { - label: "工资单位", - prop: "wageUnitCategory", - search: false, - // hide: true, - dicData: wageUnitCategoryState, - searchSpan: 5, - display: false, + slot: true, + width: 140, }, { label: "零工工种", diff --git a/src/views/manage/works/index.vue b/src/views/manage/works/index.vue index 66a59ef..a25e8a6 100644 --- a/src/views/manage/works/index.vue +++ b/src/views/manage/works/index.vue @@ -131,6 +131,9 @@ >导出 + + {{row.wage}}{{wageUnitCategoryStateEnum[row.wageUnitCategory]}} + { + wageUnitCategoryStateEnum[item.value] = item.label +}) const message = lodash.throttle( function (options) { Message(options); @@ -186,6 +192,7 @@ export default { dataSourcesEnum, educationState, downloadButton: false, + wageUnitCategoryStateEnum, view: {}, form: {}, selectionList: [], @@ -254,15 +261,8 @@ export default { search: false, searchSpan: 5, display: false, - }, - { - label: "工资单位", - prop: "wageUnitCategory", - search: false, - // hide: true, - dicData: wageUnitCategoryState, - searchSpan: 5, - display: false, + slot: true, + width: 140, }, { label: "岗位工种", diff --git a/src/views/tenant/mission/Table/WaitingMission.vue b/src/views/tenant/mission/Table/WaitingMission.vue index e4d79b2..902883d 100644 --- a/src/views/tenant/mission/Table/WaitingMission.vue +++ b/src/views/tenant/mission/Table/WaitingMission.vue @@ -10,6 +10,9 @@ 批量导入 + + {{row.wage}}{{wageUnitCategoryStateEnum[row.wageUnitCategory]}} + @@ -110,7 +113,10 @@ import { dateFormat } from "@/util/date"; import { getTemplate } from "@/api/resource/template"; import saveButton from "./saveButton"; import {dataSourcesEnum, educationState, missionState, recruitStatus, wageUnitCategoryState} from "@/common/dic"; - +const wageUnitCategoryStateEnum = {} +wageUnitCategoryState.map((item) => { + wageUnitCategoryStateEnum[item.value] = item.label +}) export default { components: { CopyMission, @@ -135,6 +141,7 @@ export default { }, data() { return { + wageUnitCategoryStateEnum, excelBox: false, excelForm: { isCovered: 1 }, excelOption: { @@ -240,15 +247,8 @@ export default { search: false, searchSpan: 5, display: false, - }, - { - label: "工资单位", - prop: "wageUnitCategory", - search: false, - // hide: true, - dicData: wageUnitCategoryState, - searchSpan: 5, - display: false, + slot: true, + width: 140, }, { label: "零工工种", diff --git a/src/views/tenant/works/Table/WaitingMission.vue b/src/views/tenant/works/Table/WaitingMission.vue index a13f0b5..4c7adaa 100644 --- a/src/views/tenant/works/Table/WaitingMission.vue +++ b/src/views/tenant/works/Table/WaitingMission.vue @@ -10,6 +10,9 @@ 批量导入 + + {{row.wage}}{{wageUnitCategoryStateEnum[row.wageUnitCategory]}} + @@ -115,7 +118,10 @@ import { dateFormat } from "@/util/date"; import { getTemplate } from "@/api/resource/template"; import saveButton from "./saveButton"; import {dataSourcesEnum, educationState, missionState, recruitStatus, wageUnitCategoryState} from "@/common/dic"; - +const wageUnitCategoryStateEnum = {} +wageUnitCategoryState.map((item) => { + wageUnitCategoryStateEnum[item.value] = item.label +}) export default { components: { CopyMission, @@ -139,6 +145,7 @@ export default { }, data() { return { + wageUnitCategoryStateEnum, excelBox: false, excelForm: { isCovered: 1 }, excelOption: { @@ -243,15 +250,8 @@ export default { search: false, searchSpan: 5, display: false, - }, - { - label: "工资单位", - prop: "wageUnitCategory", - search: false, - // hide: true, - dicData: wageUnitCategoryState, - searchSpan: 5, - display: false, + slot: true, + width: 140, }, { label: "岗位工种", diff --git a/vue.config.js b/vue.config.js index d02b6dc..daacde0 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,7 +23,7 @@ module.exports = { port: 1888, proxy: { "/api": { - target: 'http://192.168.1.106:8000', + target: 'http://10.165.0.173:8000', ws: true, changeOrigin: true, pathRewrite: {