From 5404d97098d605f1f3ed18b3017b699ad05c8bda Mon Sep 17 00:00:00 2001 From: zxy <353513737@qq.com> Date: Sun, 25 Feb 2024 17:03:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/chengdu/js/detail.js | 2 +- public/chengdu/js/index.js | 2 +- src/views/manage/company/companyList.vue | 2 +- src/views/manage/company/companyTree.vue | 2 +- src/views/manage/mission/count/index.vue | 8 ++++---- .../manage/mission/count/table/detail.vue | 2 +- .../manage/mission/count/table/gather.vue | 2 +- src/views/manage/mission/index.vue | 6 +++--- .../tenant/mission/Dialog/CopyMission.vue | 5 +++++ src/views/tenant/works/Dialog/CopyMission.vue | 12 ++++++++---- src/views/util/work-view.vue | 19 +++++++++---------- vue.config.js | 2 +- 12 files changed, 36 insertions(+), 28 deletions(-) diff --git a/public/chengdu/js/detail.js b/public/chengdu/js/detail.js index e65f595..d8f6d16 100644 --- a/public/chengdu/js/detail.js +++ b/public/chengdu/js/detail.js @@ -1,6 +1,6 @@ //var baseUrl = 'http://cgsu81beft.51xd.pub'; var baseUrl = "http://39.101.167.152:8088/shekecaiji"; -var testUrl = "http://192.168.3.104:8000/jobslink-api/jkworksreport" +var testUrl = "http://192.168.3.108:8000/jobslink-api/jkworksreport" var href = window.location.href.split("="); var shengFen = unescape(href[1].split("&")[0]); diff --git a/public/chengdu/js/index.js b/public/chengdu/js/index.js index 7b898a9..da28aed 100644 --- a/public/chengdu/js/index.js +++ b/public/chengdu/js/index.js @@ -1,6 +1,6 @@ //var baseUrl = 'http://cgsu81beft.51xd.pub'; var baseUrl = "http://39.101.167.152:8088/shekecaiji"; -var testUrl = "http://192.168.3.104:8000/jobslink-api/jkworksreport" +var testUrl = "http://192.168.3.108:8000/jobslink-api/jkworksreport" console.log(document.cookie) // 获取cookie diff --git a/src/views/manage/company/companyList.vue b/src/views/manage/company/companyList.vue index 242f455..4424671 100644 --- a/src/views/manage/company/companyList.vue +++ b/src/views/manage/company/companyList.vue @@ -207,7 +207,7 @@ export default { dialogFullscreen: true, column: [ { - label: "公司名称", + label: "社区街道名称", prop: "companyName", search: true, searchSpan: 5, diff --git a/src/views/manage/company/companyTree.vue b/src/views/manage/company/companyTree.vue index 9c76ebc..194aa7c 100644 --- a/src/views/manage/company/companyTree.vue +++ b/src/views/manage/company/companyTree.vue @@ -4,7 +4,7 @@ ref="search" size="small" prefix-icon="el-icon-search" - placeholder="搜索公司" + placeholder="搜索社区街道" v-model="query.companyName" clearable > diff --git a/src/views/manage/mission/count/index.vue b/src/views/manage/mission/count/index.vue index 83e3a20..ccc3b65 100644 --- a/src/views/manage/mission/count/index.vue +++ b/src/views/manage/mission/count/index.vue @@ -47,8 +47,8 @@ > - - + + @@ -72,8 +72,8 @@ - - + + diff --git a/src/views/manage/mission/count/table/detail.vue b/src/views/manage/mission/count/table/detail.vue index 39499b8..7b9770b 100644 --- a/src/views/manage/mission/count/table/detail.vue +++ b/src/views/manage/mission/count/table/detail.vue @@ -118,7 +118,7 @@ export default { display: false, }, { - label: "公司名称", + label: "社区街道名称", prop: "companyName", }, { diff --git a/src/views/manage/mission/count/table/gather.vue b/src/views/manage/mission/count/table/gather.vue index 86c6206..8e04fe4 100644 --- a/src/views/manage/mission/count/table/gather.vue +++ b/src/views/manage/mission/count/table/gather.vue @@ -76,7 +76,7 @@ export default { dialogClickModal: false, column: [ { - label: "公司名称", + label: "社区街道名称", prop: "companyName", }, { diff --git a/src/views/manage/mission/index.vue b/src/views/manage/mission/index.vue index 1d99f95..5336e27 100644 --- a/src/views/manage/mission/index.vue +++ b/src/views/manage/mission/index.vue @@ -8,10 +8,10 @@ :inline="true" > - + @@ -225,7 +225,7 @@ export default { mStatusList: missionState, column: [ { - label: "公司名称", + label: "社区街道名称", prop: "companyName", display: false, }, diff --git a/src/views/tenant/mission/Dialog/CopyMission.vue b/src/views/tenant/mission/Dialog/CopyMission.vue index 9a258bb..0b899a1 100644 --- a/src/views/tenant/mission/Dialog/CopyMission.vue +++ b/src/views/tenant/mission/Dialog/CopyMission.vue @@ -195,6 +195,7 @@ export default { education: 7, experienceDesc: "不限经验", tradeId:null, + tradeNames: null, userNature:"灵活用工", }, loading: false, @@ -970,8 +971,11 @@ export default { }, //行业类型 handleSelect(item) { + console.log('11111111111') + console.log(item) this.tradeBtnState = true; this.obj.tradeId = item.id + this.obj.tradeNames = item.name }, //工种 handleSelectWorkType(item){ @@ -1135,6 +1139,7 @@ export default { wage: row.wage, wageUnitCategory: row.wageUnitCategory, tradeId: row.tradeId, + tradeNames: this.obj.tradeNames, worktypeIds: row.worktypeIds, skillIds: skillIds, skillNames: skillNames, diff --git a/src/views/tenant/works/Dialog/CopyMission.vue b/src/views/tenant/works/Dialog/CopyMission.vue index 4004f80..0ca5e17 100644 --- a/src/views/tenant/works/Dialog/CopyMission.vue +++ b/src/views/tenant/works/Dialog/CopyMission.vue @@ -195,6 +195,7 @@ export default { education: 7, experienceDesc: "不限经验", tradeId:null, + tradeNames: null, userNature:"灵活用工", }, loading: false, @@ -637,7 +638,7 @@ export default { // }, { label: "岗位描述", - prop: "missionDesc", + prop: "jobDescription", type: "textarea", rules: [ { @@ -965,7 +966,8 @@ export default { //行业类型 handleSelect(item) { this.tradeBtnState = true; - this.obj.tradeId = item.id + this.obj.tradeId = item.id; + this.obj.tradeNames = item.name; }, //工种 handleSelectWorkType(item){ @@ -1129,10 +1131,11 @@ export default { wage: row.wage, wageUnitCategory: row.wageUnitCategory, tradeId: row.tradeId, + tradeNames: this.obj.tradeNames, worktypeIds: row.worktypeIds, skillIds: skillIds, skillNames: skillNames, - missionDesc: row.missionDesc, + jobDescription: row.jobDescription, userNature: row.userNature, sex: row.sex, ageDesc: row.ageDesc, @@ -1180,10 +1183,11 @@ export default { wage: row.wage, wageUnitCategory: row.wageUnitCategory, tradeId: row.tradeId, + tradeNames: this.obj.tradeNames, worktypeIds: row.worktypeIds, skillIds: skillIds, skillNames: skillNames, - missionDesc: row.missionDesc, + jobDescription: row.jobDescription, userNature: row.userNature, sex: row.sex, ageDesc: row.ageDesc, diff --git a/src/views/util/work-view.vue b/src/views/util/work-view.vue index 4d56525..0ca94ba 100644 --- a/src/views/util/work-view.vue +++ b/src/views/util/work-view.vue @@ -11,32 +11,31 @@ {{ - model.missionTitle + model.jobName }} - {{ + {{ model.missionNo }} - + - {{ format(model.stime) }} 至 - {{ format(model.etime) }} + {{ format(model.stime) }} - + @@ -70,8 +69,8 @@ --> - {{ - model.missionDesc + {{ + model.jobDescription }} diff --git a/vue.config.js b/vue.config.js index 1301bfe..f9b7e72 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,7 +23,7 @@ module.exports = { port: 1888, proxy: { "/api": { - target: 'http://192.168.3.104:8000', // 本地服务接口地址 + target: 'http://192.168.3.108:8000', // 本地服务接口地址 // target: "http://39.98.184.58:8000", // 阿里云后台地址 // target: "http://192.168.3.111:8000", // 本地 ws: true,