From e2e4f5c488fc7727a086f399ef5ae62a73e50e8c Mon Sep 17 00:00:00 2001 From: 18500206848 Date: Fri, 16 Feb 2024 18:18:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/tenant/postzp.js | 17 +++++----- src/views/tenant/mission/Dialog/Recommend.vue | 32 +++++++++---------- src/views/tenant/works/Dialog/Recommend.vue | 32 +++++++++---------- vue.config.js | 5 ++- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/api/tenant/postzp.js b/src/api/tenant/postzp.js index 3298c77..f1b9bba 100644 --- a/src/api/tenant/postzp.js +++ b/src/api/tenant/postzp.js @@ -124,7 +124,7 @@ export const detail = (missionNo) => { /*获取待录用 已录用人员列表 */ export const employList = (current, size, params, missionNo) => { return request({ - url: '/api/jobslink-api/jkWorks/jkWorks/apply/list', + url: '/api/jobslink-api/missions/mission/apply/list', method: 'get', params: { ...params, @@ -138,7 +138,7 @@ export const employList = (current, size, params, missionNo) => { /*录用人员 */ export const employ = (missionNo, ids,fpTitleId,fpAddressId) => { return request({ - url: '/api/jobslink-api/jkWorks/jkWorks/apply/employed/new', + url: '/api/jobslink-api/missions/mission/apply/employed/new', method: 'post', params: { missionNo, @@ -152,7 +152,7 @@ export const employ = (missionNo, ids,fpTitleId,fpAddressId) => { /*取消录用*/ export const cancelEmploy = (missionNo, ids) => { return request({ - url: '/api/jobslink-api/jkWorks/jkWorks/apply/cancelEmployed', + url: '/api/jobslink-api/missions/mission/apply/cancelEmployed', method: 'post', params: { missionNo, @@ -238,16 +238,17 @@ export const invite = (rows) => { /*批量邀请人员 */ export const inviteUser = (rows) => { return request({ - url: '/api/jobslink-api/jkWorks/jkWorks/apply/notice/inviteUser', + url: '/api/jobslink-api/missions/mission/apply/notice/inviteUser', method: 'post', data: rows }) } + /*邀请人员剩余次数 */ export const inviteCount = (idNumber, missionNo) => { return request({ - url: '/api/jobslink-api/jkWorks/jkWorks/apply/notice/list', + url: '/api/jobslink-api/missions/mission/apply/notice/list', method: 'get', params: { idNumber, @@ -277,7 +278,7 @@ export const personCountList = () => { /*未申请任务的人才库人员列表接口 */ export const userLists = (missionNo,groupIds) => { return request({ - url: '/api/jobslink-api/jkWorks/jkWorks/apply/tenant/group/userlist', + url: '/api/jobslink-api/missions/mission/apply/tenant/group/userlist', method: 'get', params: { missionNo, @@ -287,7 +288,7 @@ export const userLists = (missionNo,groupIds) => { } /*未申请任务的人才库人员列表接口 导出*/ export const userListsExport = (missionNo,groupIds) => { - return `jobslink-api/jkWorks/jkWorks/apply/tenant/group/userlist/export?missionNo=${missionNo}&groupIds=${groupIds}&Jobslink-Auth=${getToken()}` + return `jobslink-api/missions/mission/apply/tenant/group/userlist/export?missionNo=${missionNo}&groupIds=${groupIds}&Jobslink-Auth=${getToken()}` } /*未申请任务的人才库人员列表接口 导出*/ export const recommendExportList = (missionNo,name,worktypes,groupId) => { @@ -347,4 +348,4 @@ export const getMounthDays = (date) => { /*导入任务*/ export const upload = () => { return `/api/jobslink-api/jkWorks/jkWorks/importJkWorks?isCovered=1` -} \ No newline at end of file +} diff --git a/src/views/tenant/mission/Dialog/Recommend.vue b/src/views/tenant/mission/Dialog/Recommend.vue index e44b7c9..f73ca82 100644 --- a/src/views/tenant/mission/Dialog/Recommend.vue +++ b/src/views/tenant/mission/Dialog/Recommend.vue @@ -194,22 +194,22 @@ export default { width:150, slot: true }, - { - label: "工种", - type: "tree", - prop: "worktypes", - multiple: true, - dicUrl: `/api/jobslink-api/tenant/worktypes/base/list`, - dicFormatter: (res) => { - return res.data; //返回字典的层级结构 - }, - props: { - label: "name", - value: "name", - }, - search: true, - span: 24, - }, + // { + // label: "工种", + // type: "tree", + // prop: "worktypes", + // multiple: true, + // dicUrl: `/api/jobslink-api/tenant/worktypes/base/list`, + // dicFormatter: (res) => { + // return res.data; //返回字典的层级结构 + // }, + // props: { + // label: "name", + // value: "name", + // }, + // search: true, + // span: 24, + // }, { label: "人才库", prop: "groupId", diff --git a/src/views/tenant/works/Dialog/Recommend.vue b/src/views/tenant/works/Dialog/Recommend.vue index e8e3404..1222986 100644 --- a/src/views/tenant/works/Dialog/Recommend.vue +++ b/src/views/tenant/works/Dialog/Recommend.vue @@ -194,22 +194,22 @@ export default { width:150, slot: true }, - { - label: "工种", - type: "tree", - prop: "worktypes", - multiple: true, - dicUrl: `/api/jobslink-api/tenant/worktypes/base/list`, - dicFormatter: (res) => { - return res.data; //返回字典的层级结构 - }, - props: { - label: "name", - value: "name", - }, - search: true, - span: 24, - }, + // { + // label: "工种", + // type: "tree", + // prop: "worktypes", + // multiple: true, + // dicUrl: `/api/jobslink-api/tenant/worktypes/base/list`, + // dicFormatter: (res) => { + // return res.data; //返回字典的层级结构 + // }, + // props: { + // label: "name", + // value: "name", + // }, + // search: true, + // span: 24, + // }, { label: "人才库", prop: "groupId", diff --git a/vue.config.js b/vue.config.js index dea5b9f..8181689 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,9 +23,8 @@ module.exports = { port: 1888, proxy: { "/api": { - //本地服务接口地址 - // target: "http://192.168.31.246:8000", // 本地后台地址 - target: "http://39.98.184.58:8000", // 阿里云后台地址 + target: 'http://127.0.0.1:8000', // 本地服务接口地址 + // target: "http://39.98.184.58:8000", // 阿里云后台地址 ws: true, changeOrigin: true, pathRewrite: { From 437f96fc9800c00d17e5e7a8ac6574c403b20d51 Mon Sep 17 00:00:00 2001 From: 18500206848 Date: Sat, 17 Feb 2024 16:08:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9ec9ec3..8a2e4f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10475,7 +10475,7 @@ "version": "0.3.20", "resolved": "http://r.cnpmjs.org/sockjs/download/sockjs-0.3.20.tgz", "integrity": "sha1-smooPsVi74smh7RAM6Tuzqx12FU=", - "dev": true, + "dev": false, "requires": { "faye-websocket": "^0.10.0", "uuid": "^3.4.0", @@ -10486,7 +10486,7 @@ "version": "1.4.0", "resolved": "http://r.cnpmjs.org/sockjs-client/download/sockjs-client-1.4.0.tgz", "integrity": "sha1-yfJWjhnI/YFztJl+o0IOC7MGx9U=", - "dev": true, + "dev": false, "requires": { "debug": "^3.2.5", "eventsource": "^1.0.7", From 6ba7ac55847316418e9566a6a2a79bb79f3dd830 Mon Sep 17 00:00:00 2001 From: 18500206848 Date: Sat, 17 Feb 2024 16:10:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/postzp/count/index.vue | 303 ---- .../manage/postzp/count/table/detail.vue | 248 --- .../manage/postzp/count/table/gather.vue | 198 --- src/views/manage/postzp/delayDialog.vue | 89 -- src/views/manage/postzp/index.vue | 568 ------- src/views/manage/postzp/wageView.vue | 177 --- src/views/manage/postzp/zpView.vue | 170 -- .../tenant/mission/Dialog/EmployNumber.vue | 34 - src/views/tenant/postzp/Dialog/Appraise.vue | 419 ----- src/views/tenant/postzp/Dialog/Contrast.vue | 188 --- .../tenant/postzp/Dialog/CopyMission.vue | 1412 ----------------- src/views/tenant/postzp/Dialog/Employ.vue | 1079 ------------- .../postzp/Dialog/EmployInformation.vue | 526 ------ .../tenant/postzp/Dialog/EmployNumber.vue | 607 ------- src/views/tenant/postzp/Dialog/Recommend.vue | 495 ------ src/views/tenant/postzp/Dialog/Skill.vue | 293 ---- src/views/tenant/postzp/Dialog/noEmployed.vue | 212 --- .../tenant/postzp/Table/ExpiredMission.vue | 360 ----- .../tenant/postzp/Table/FinishedMission.vue | 334 ---- .../tenant/postzp/Table/OngoingMission.vue | 354 ----- .../tenant/postzp/Table/WaitingMission.vue | 498 ------ src/views/tenant/postzp/Table/missionView.vue | 35 - src/views/tenant/postzp/Table/saveButton.vue | 38 - src/views/tenant/postzp/index.vue | 238 --- src/views/tenant/works/Dialog/Employ.vue | 34 - .../tenant/works/Dialog/EmployNumber.vue | 34 - .../workstation/workbench/index - 副本.vue | 417 ----- 27 files changed, 9360 deletions(-) delete mode 100644 src/views/manage/postzp/count/index.vue delete mode 100644 src/views/manage/postzp/count/table/detail.vue delete mode 100644 src/views/manage/postzp/count/table/gather.vue delete mode 100644 src/views/manage/postzp/delayDialog.vue delete mode 100644 src/views/manage/postzp/index.vue delete mode 100644 src/views/manage/postzp/wageView.vue delete mode 100644 src/views/manage/postzp/zpView.vue delete mode 100644 src/views/tenant/postzp/Dialog/Appraise.vue delete mode 100644 src/views/tenant/postzp/Dialog/Contrast.vue delete mode 100644 src/views/tenant/postzp/Dialog/CopyMission.vue delete mode 100644 src/views/tenant/postzp/Dialog/Employ.vue delete mode 100644 src/views/tenant/postzp/Dialog/EmployInformation.vue delete mode 100644 src/views/tenant/postzp/Dialog/EmployNumber.vue delete mode 100644 src/views/tenant/postzp/Dialog/Recommend.vue delete mode 100644 src/views/tenant/postzp/Dialog/Skill.vue delete mode 100644 src/views/tenant/postzp/Dialog/noEmployed.vue delete mode 100644 src/views/tenant/postzp/Table/ExpiredMission.vue delete mode 100644 src/views/tenant/postzp/Table/FinishedMission.vue delete mode 100644 src/views/tenant/postzp/Table/OngoingMission.vue delete mode 100644 src/views/tenant/postzp/Table/WaitingMission.vue delete mode 100644 src/views/tenant/postzp/Table/missionView.vue delete mode 100644 src/views/tenant/postzp/Table/saveButton.vue delete mode 100644 src/views/tenant/postzp/index.vue delete mode 100644 src/views/workstation/workbench/index - 副本.vue diff --git a/src/views/manage/postzp/count/index.vue b/src/views/manage/postzp/count/index.vue deleted file mode 100644 index 83e3a20..0000000 --- a/src/views/manage/postzp/count/index.vue +++ /dev/null @@ -1,303 +0,0 @@ - - - - - diff --git a/src/views/manage/postzp/count/table/detail.vue b/src/views/manage/postzp/count/table/detail.vue deleted file mode 100644 index 0a740c4..0000000 --- a/src/views/manage/postzp/count/table/detail.vue +++ /dev/null @@ -1,248 +0,0 @@ - - - - - diff --git a/src/views/manage/postzp/count/table/gather.vue b/src/views/manage/postzp/count/table/gather.vue deleted file mode 100644 index 86c6206..0000000 --- a/src/views/manage/postzp/count/table/gather.vue +++ /dev/null @@ -1,198 +0,0 @@ - - - - - diff --git a/src/views/manage/postzp/delayDialog.vue b/src/views/manage/postzp/delayDialog.vue deleted file mode 100644 index bfcd78d..0000000 --- a/src/views/manage/postzp/delayDialog.vue +++ /dev/null @@ -1,89 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/manage/postzp/index.vue b/src/views/manage/postzp/index.vue deleted file mode 100644 index 1d99f95..0000000 --- a/src/views/manage/postzp/index.vue +++ /dev/null @@ -1,568 +0,0 @@ - - - - - diff --git a/src/views/manage/postzp/wageView.vue b/src/views/manage/postzp/wageView.vue deleted file mode 100644 index fac27be..0000000 --- a/src/views/manage/postzp/wageView.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - - - diff --git a/src/views/manage/postzp/zpView.vue b/src/views/manage/postzp/zpView.vue deleted file mode 100644 index 9e4a6f2..0000000 --- a/src/views/manage/postzp/zpView.vue +++ /dev/null @@ -1,170 +0,0 @@ - - - - - diff --git a/src/views/tenant/mission/Dialog/EmployNumber.vue b/src/views/tenant/mission/Dialog/EmployNumber.vue index 8558871..1b0c372 100644 --- a/src/views/tenant/mission/Dialog/EmployNumber.vue +++ b/src/views/tenant/mission/Dialog/EmployNumber.vue @@ -297,40 +297,6 @@ export default { slot: true, width:110 }, - { - label: "最新保期", - prop: "period", - searchSpan: 5, - display: false, - slot:true, - width:190 - }, - { - label: "商保状态", - prop: "serviceStatus", - searchSpan: 5, - display: false, - type: 'select', - dicData: [ - { - label: '未生效', - value: 0 - }, - { - label: '生效中', - value: 1 - }, - { - label: '即将失效', - value: 2 - }, - { - label: '已失效', - value: 3 - }, - ], - slot:true, - }, { label: "工种", prop: "workTypes", diff --git a/src/views/tenant/postzp/Dialog/Appraise.vue b/src/views/tenant/postzp/Dialog/Appraise.vue deleted file mode 100644 index 620fd6e..0000000 --- a/src/views/tenant/postzp/Dialog/Appraise.vue +++ /dev/null @@ -1,419 +0,0 @@ - - - diff --git a/src/views/tenant/postzp/Dialog/Contrast.vue b/src/views/tenant/postzp/Dialog/Contrast.vue deleted file mode 100644 index 168a54c..0000000 --- a/src/views/tenant/postzp/Dialog/Contrast.vue +++ /dev/null @@ -1,188 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/tenant/postzp/Dialog/CopyMission.vue b/src/views/tenant/postzp/Dialog/CopyMission.vue deleted file mode 100644 index 87ac880..0000000 --- a/src/views/tenant/postzp/Dialog/CopyMission.vue +++ /dev/null @@ -1,1412 +0,0 @@ - - - - - diff --git a/src/views/tenant/postzp/Dialog/Employ.vue b/src/views/tenant/postzp/Dialog/Employ.vue deleted file mode 100644 index 7b02911..0000000 --- a/src/views/tenant/postzp/Dialog/Employ.vue +++ /dev/null @@ -1,1079 +0,0 @@ - - - - - diff --git a/src/views/tenant/postzp/Dialog/EmployInformation.vue b/src/views/tenant/postzp/Dialog/EmployInformation.vue deleted file mode 100644 index 3cbd02a..0000000 --- a/src/views/tenant/postzp/Dialog/EmployInformation.vue +++ /dev/null @@ -1,526 +0,0 @@ - - - - - diff --git a/src/views/tenant/postzp/Dialog/EmployNumber.vue b/src/views/tenant/postzp/Dialog/EmployNumber.vue deleted file mode 100644 index 16c9a3a..0000000 --- a/src/views/tenant/postzp/Dialog/EmployNumber.vue +++ /dev/null @@ -1,607 +0,0 @@ - - - - - diff --git a/src/views/tenant/postzp/Dialog/Recommend.vue b/src/views/tenant/postzp/Dialog/Recommend.vue deleted file mode 100644 index 78d2917..0000000 --- a/src/views/tenant/postzp/Dialog/Recommend.vue +++ /dev/null @@ -1,495 +0,0 @@ - - - diff --git a/src/views/tenant/postzp/Dialog/Skill.vue b/src/views/tenant/postzp/Dialog/Skill.vue deleted file mode 100644 index ee7c489..0000000 --- a/src/views/tenant/postzp/Dialog/Skill.vue +++ /dev/null @@ -1,293 +0,0 @@ - - - - diff --git a/src/views/tenant/postzp/Dialog/noEmployed.vue b/src/views/tenant/postzp/Dialog/noEmployed.vue deleted file mode 100644 index fbfd99c..0000000 --- a/src/views/tenant/postzp/Dialog/noEmployed.vue +++ /dev/null @@ -1,212 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/tenant/postzp/Table/ExpiredMission.vue b/src/views/tenant/postzp/Table/ExpiredMission.vue deleted file mode 100644 index ca64803..0000000 --- a/src/views/tenant/postzp/Table/ExpiredMission.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - - diff --git a/src/views/tenant/postzp/Table/FinishedMission.vue b/src/views/tenant/postzp/Table/FinishedMission.vue deleted file mode 100644 index 55483a0..0000000 --- a/src/views/tenant/postzp/Table/FinishedMission.vue +++ /dev/null @@ -1,334 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/tenant/postzp/Table/OngoingMission.vue b/src/views/tenant/postzp/Table/OngoingMission.vue deleted file mode 100644 index 9bd6538..0000000 --- a/src/views/tenant/postzp/Table/OngoingMission.vue +++ /dev/null @@ -1,354 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/tenant/postzp/Table/WaitingMission.vue b/src/views/tenant/postzp/Table/WaitingMission.vue deleted file mode 100644 index 3959303..0000000 --- a/src/views/tenant/postzp/Table/WaitingMission.vue +++ /dev/null @@ -1,498 +0,0 @@ - - - - - diff --git a/src/views/tenant/postzp/Table/missionView.vue b/src/views/tenant/postzp/Table/missionView.vue deleted file mode 100644 index a806e7e..0000000 --- a/src/views/tenant/postzp/Table/missionView.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/tenant/postzp/Table/saveButton.vue b/src/views/tenant/postzp/Table/saveButton.vue deleted file mode 100644 index 2eb981b..0000000 --- a/src/views/tenant/postzp/Table/saveButton.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/tenant/postzp/index.vue b/src/views/tenant/postzp/index.vue deleted file mode 100644 index 4f9d6a4..0000000 --- a/src/views/tenant/postzp/index.vue +++ /dev/null @@ -1,238 +0,0 @@ - - - - diff --git a/src/views/tenant/works/Dialog/Employ.vue b/src/views/tenant/works/Dialog/Employ.vue index 4c4423e..12a1c57 100644 --- a/src/views/tenant/works/Dialog/Employ.vue +++ b/src/views/tenant/works/Dialog/Employ.vue @@ -494,40 +494,6 @@ export default { slot: true, width:110 }, - { - label: "最新保期", - prop: "period", - searchSpan: 5, - display: false, - slot:true, - width:190 - }, - { - label: "商保状态", - prop: "serviceStatus", - searchSpan: 5, - display: false, - type: 'select', - dicData: [ - { - label: '未生效', - value: 0 - }, - { - label: '生效中', - value: 1 - }, - { - label: '即将失效', - value: 2 - }, - { - label: '已失效', - value: 3 - }, - ], - slot:true, - }, { label: "工种", prop: "workTypes", diff --git a/src/views/tenant/works/Dialog/EmployNumber.vue b/src/views/tenant/works/Dialog/EmployNumber.vue index 4defa21..81eb7e7 100644 --- a/src/views/tenant/works/Dialog/EmployNumber.vue +++ b/src/views/tenant/works/Dialog/EmployNumber.vue @@ -297,40 +297,6 @@ export default { slot: true, width:110 }, - { - label: "最新保期", - prop: "period", - searchSpan: 5, - display: false, - slot:true, - width:190 - }, - { - label: "商保状态", - prop: "serviceStatus", - searchSpan: 5, - display: false, - type: 'select', - dicData: [ - { - label: '未生效', - value: 0 - }, - { - label: '生效中', - value: 1 - }, - { - label: '即将失效', - value: 2 - }, - { - label: '已失效', - value: 3 - }, - ], - slot:true, - }, { label: "工种", prop: "workTypes", diff --git a/src/views/workstation/workbench/index - 副本.vue b/src/views/workstation/workbench/index - 副本.vue deleted file mode 100644 index 76ca88b..0000000 --- a/src/views/workstation/workbench/index - 副本.vue +++ /dev/null @@ -1,417 +0,0 @@ - - - - -