From 66711a02ea53bc020fd70c53f414efa919c8bd6b Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Mon, 18 Apr 2022 09:26:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=8A=A5=E5=90=8D=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/api/job.js | 6 +
src/components/FirstJob/detail.vue | 212 +++++++++++++--------
src/components/FirstJob/recordBill.vue | 14 ++
.../userinfo/usercenter/components/mybill.vue | 25 ++-
src/utils/commonUtil.js | 47 +++--
src/utils/request.js | 4 +-
6 files changed, 201 insertions(+), 107 deletions(-)
diff --git a/src/api/job.js b/src/api/job.js
index 30eeb9d..9306100 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -70,3 +70,9 @@ export function getStoreJobApi(data) {
url: `/yishoudan/store/job/getJobNameByStoreId?storeId=${data}`,
});
}
+// 根据岗位id获取政策
+export function getPolicyByJobIdApi(data) {
+ return request({
+ url: `/yishoudan/store/job/getPolicyByStoreJobId?storeJobId=${data}`,
+ });
+}
diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index 2e05f21..ce06591 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -271,17 +271,22 @@
-
+
+
温馨提示
+
+ {{ jobDetail.sweetTips || "-" }}
+
+
-
岗位薪资
+
薪资待遇
-
+
+
+ 薪资明细
+ {{ jobDetail.salaryDetail || "-" }}
-
-
+
+ 发薪说明
+ {{ jobDetail.payDay || "-" }}
+
+
+ 补充说明
+ {{
+ jobDetail.salaryDesp || "-"
+ }}
+
+
-
岗位要求
+
面试要求
- 文化程度
- {{ jobDetail.education }}
+ 文化学历
+ {{ jobDetail.education || "-" }}
- 身份证
- {{ jobDetail.idCard }}
+ 面试资料
+ {{ jobDetail.idCard || "-" }}
-
+
体检要求
- {{ jobDetail.healthRequire }}
+ {{ jobDetail.healthRequire || "-" }}
其它要求
- {{ jobDetail.otherRequire }}
+ {{ jobDetail.otherRequire || "-" }}
@@ -397,23 +409,37 @@
>
工作内容
- {{ jobDetail.workContent }}
+ {{ jobDetail.workContent || "-" }}
班次时间
- {{ jobDetail.workClasses }}
+ {{ jobDetail.workClasses || "-" }}
+ 工作衣
+ {{ jobDetail.workClothes || "-" }}
+
+
+ 过安检
+ {{ jobDetail.securityCheck || "-" }}
+
+
+ 员工保险
+ {{ jobDetail.employeeInsurance || "-" }}
+
+
- 其他说明
- {{ jobDetail.otherDesp }}
+ 补充说明
+ {{
+ jobDetail.otherDesp || "-"
+ }}
@@ -426,26 +452,28 @@
-
吃饭{{ jobDetail.workingLunch }}
+ >{{ jobDetail.workingLunch || "-" }}
- -
+
-
-
+
-
补充说明{{ jobDetail.workingLunchDesp }}
+ >{{
+ jobDetail.workingLunchDesp || "-"
+ }}
@@ -453,40 +481,43 @@
住宿
-
- 住宿{{ jobDetail.dormitory }}
+ 住宿{{ jobDetail.dormitory || "-" }}
-
- 入住条件{{ jobDetail.dormPermise }}
+ 宿舍设施{{ jobDetail.dormitoryFacilities || "-" }}
- -
+
-
-
+
-
- 水电{{ jobDetail.waterAndElec }}
+ 水电费{{ jobDetail.waterAndElec || "-" }}
- -
+
-
补充说明{{ jobDetail.dormitoryDesp }}
+ >{{
+ jobDetail.dormitoryDesp || "-"
+ }}
@@ -541,40 +572,48 @@
@@ -705,6 +744,7 @@ export default {
const { data } = await getJobDetailApi(this.id);
console.log(data);
if (data.status === 200) {
+ console.log(data);
this.jobDetail = disposeJobListData(data.data.storeJob);
this.skeletonshow = false;
this.jobDetail.district = disposeJobListData(
@@ -1167,7 +1207,7 @@ export default {
h1 {
font-size: 18px;
- margin-bottom: 20px;
+ // margin-bottom: 20px;
.infotitle {
margin-top: -2px;
border-bottom: 1px solid #eeefef;
@@ -1194,6 +1234,13 @@ export default {
}
}
}
+ #tip {
+ div:last-child {
+ padding: 12px 16px;
+ font-size: 16px;
+ border: 1px solid #e8e8e8;
+ }
+ }
.jobinformationbox {
.navigation {
width: 55px !important;
@@ -1225,6 +1272,7 @@ export default {
}
}
}
+
.baseInfoContent {
width: 840px;
> div {
@@ -1233,6 +1281,7 @@ export default {
font-weight: normal;
}
}
+
.condition {
.conditiontable {
display: flex;
@@ -1385,6 +1434,7 @@ export default {
}
.leftDesc.ant-descriptions-bordered .ant-descriptions-item-content {
+ white-space: break-spaces;
text-align: left;
font-size: 16px;
color: #878787;
@@ -1395,10 +1445,10 @@ export default {
> tbody
> .ant-descriptions-row:last-child
> .ant-descriptions-item-content {
- padding: 0 !important;
+ // padding: 0 !important;
.noborder {
.ant-descriptions-view {
- border: 0 !important;
+ // border: 0 !important;
}
}
}
diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue
index 9133400..5c092e4 100644
--- a/src/components/FirstJob/recordBill.vue
+++ b/src/components/FirstJob/recordBill.vue
@@ -453,6 +453,7 @@ import {
getProxyInfoApi,
getStoreAliasApi,
getStoreJobApi,
+ getPolicyByJobIdApi,
} from "@/api/job";
import request from "@/utils/request";
// import axios from "axios";
@@ -615,6 +616,7 @@ export default {
}
this.getProxyInfo(this.proxyinfo.id);
this.getJob(this.firminfo);
+ this.getPolicyByJobId(this.firminfo.id);
console.log(this.proxyinfo);
// sessionStorage.setItem("CURRENT_FIRM", JSON.stringify(userinfo));
console.log(this.firminfo);
@@ -637,6 +639,17 @@ export default {
console.log(error);
}
},
+ async getPolicyByJobId(value) {
+ try {
+ const { data } = await getPolicyByJobIdApi(value);
+ console.log(data);
+ if (data.status === 200) {
+ this.form.policy = data.data;
+ }
+ } catch (error) {
+ console.log(error);
+ }
+ },
onClose() {
this.form = {
// 录单数据
@@ -972,6 +985,7 @@ export default {
console.log(value);
// this.storeJobList = [];
// if(!isEmptyCheck(this.form.qiyeId)){
+ this.getPolicyByJobId(value.id);
this.form.storeJobId = value.id;
this.jobnameStatus = "";
this.firminfo.jobName = value.jobName;
diff --git a/src/components/userinfo/usercenter/components/mybill.vue b/src/components/userinfo/usercenter/components/mybill.vue
index 6825ec4..7d295c5 100644
--- a/src/components/userinfo/usercenter/components/mybill.vue
+++ b/src/components/userinfo/usercenter/components/mybill.vue
@@ -130,7 +130,9 @@
{{ item.statusTag }}{{ statusTimeInfo }}: {{ statusShowTime }}
+ >{{ item.statusTimeInfo }}: {{ item.statusShowTime }}
@@ -270,7 +272,7 @@ export default {
},
async getBill() {
console.log("click");
- let that = this;
+ // let that = this;
console.log(this.pagination.status);
try {
this.isspinning = true;
@@ -282,7 +284,6 @@ export default {
console.log(this.billList);
setTimeout(() => {
this.billList.forEach((item, index) => {
- // let updateTime = ;
let differenceTime =
new Date().getTime() - new Date(item.updateTime).getTime();
var D = Math.floor(differenceTime / (24 * 60 * 60 * 1000));
@@ -360,19 +361,23 @@ export default {
item.isunfold = false;
}
item.controlUnfold = true;
+ // setTimeout(() => {
if (item.status == 10 || item.status == 20 || item.status == 30) {
- that.statusTimeInfo = "面试时间";
- that.statusShowTime = item.interviewTime;
+ item.statusTimeInfo = "面试时间";
+ item.statusShowTime = item.interviewTime;
} else if (item.status == 40 || item.status == 50) {
- that.statusTimeInfo = "入职时间";
- that.statusShowTime = item.entryTime;
+ item.statusTimeInfo = "入职时间";
+ item.statusShowTime = item.entryTime;
} else {
- that.statusTimeInfo = "离职时间";
- that.statusShowTime = item.leaveTime;
+ item.statusTimeInfo = "离职时间";
+ item.statusShowTime = item.leaveTime;
}
+ // console.log(item.statusShowTime);
+ // console.log(item.statusTimeInfo);
+ // }, 100);
// console.log("controlUnfold", item.controlUnfold);
// console.log("isunfold", item.isunfold);
- console.log(item);
+ // console.log(item);
});
}, 100);
diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js
index 70a9bf0..c3586f6 100644
--- a/src/utils/commonUtil.js
+++ b/src/utils/commonUtil.js
@@ -1344,14 +1344,18 @@ export function disposeJobListData(jobList) {
item.jobSpecialLabelNames = jobSpecialLabelNames;
}
// 年龄限制
- if (item["gender"] === 1) {
- item["gender"] = "丨男";
- } else if (item["gender"] === 2) {
- item["gender"] = "丨女";
- } else if (item["gender"] === 3) {
- item["gender"] = "丨男女不限";
+ if (
+ Boolean(item.minAgeWoman) === true &&
+ Boolean(item.minAgeMan) === false
+ ) {
+ item.gender = "丨女";
+ } else if (
+ Boolean(item.minAgeWoman) === false &&
+ Boolean(item.minAgeMan) === true
+ ) {
+ item.gender = "丨男";
} else {
- item["gender"] = "丨男女不限";
+ item.gender = "丨男女不限";
}
});
} else {
@@ -1468,15 +1472,30 @@ export function disposeJobListData(jobList) {
jobList.jobSpecialLabelNames = jobSpecialLabelNames;
}
// 年龄限制
- if (jobList["gender"] === 1) {
- jobList["gender"] = "丨男";
- } else if (jobList["gender"] === 2) {
- jobList["gender"] = "丨女";
- } else if (jobList["gender"] === 3) {
- jobList["gender"] = "丨男女不限";
+ console.log(jobList);
+ // console.log(jobList["gender"]);
+ if (
+ Boolean(jobList.minAgeWoman) === true &&
+ Boolean(jobList.minAgeMan) === false
+ ) {
+ jobList.gender = "丨女";
+ } else if (
+ Boolean(jobList.minAgeWoman) === false &&
+ Boolean(jobList.minAgeMan) === true
+ ) {
+ jobList.gender = "丨男";
} else {
- jobList["gender"] = "丨男女不限";
+ jobList.gender = "丨男女不限";
}
+ // if (jobList["gender"] === 1) {
+ // jobList["gender"] = "丨男";
+ // } else if (jobList["gender"] === 2) {
+ // jobList["gender"] = "丨女";
+ // } else if (jobList["gender"] === 3) {
+ // jobList["gender"] = "丨男女不限";
+ // } else {
+ // jobList["gender"] = "丨男女不限";
+ // }
}
}
diff --git a/src/utils/request.js b/src/utils/request.js
index 264b0f1..b61ed50 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -12,8 +12,8 @@ console.log(baseURL);
axios.defaults.withCredentials = true; //添加这行代码
// console.log(axios);
const service = axios.create({
- baseURL: "/api_prod", // url = base url + request url
- // baseURL: baseURL, // baseURL: "/api", // url = base url + request url
+ // baseURL: "/api_prod", // url = base url + request url
+ baseURL: baseURL, // baseURL: "/api", // url = base url + request url
withCredentials: true, // send cookies when cross-domain requests
timeout: 10000, // request timeout
crossDomain: true,