mz666
/
bocai_supplyChain_pc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/daotian_pc

Browse Source 
* 'master' of http://101.37.147.115:3000/bocaigroup/daotian_pc:
  同步

# Conflicts:
#	src/components/FirstJob/recordBill.vue
cyl/dev
zsk 2 years ago
parent d359925522 cd7b91652c
commit b7f8d87d45
6 changed files with 2916 additions and 2788 deletions
Show Stats Download Patch File Download Diff File

26
src/components/FirstJob/detail.vue
Unescape Escape View File

@ -332,14 +332,14 @@
<span slot="label" class>面试时间</span> <span slot="label" class>面试时间</span>
<span>{{ jobDetail.interviewDuration || "-" }}</span> <span>{{ jobDetail.interviewDuration || "-" }}</span>
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item class="test1"> <!-- <a-descriptions-item class="test1">
<span slot="label" class>面试地点</span> <span slot="label" class>面试地点</span>
<span>{{ jobPoses.interview.posContent || "-" }}</span> <span>{{ jobPoses.interview.posContent || "-" }}</span>
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item class="test1"> <a-descriptions-item class="test1">
<span slot="label" class>宿舍地址</span> <span slot="label" class>宿舍地址</span>
<span>{{ jobPoses.room.posContent ? jobPoses.room.posContent : "-" }}</span> <span>{{ jobPoses.room.posContent ? jobPoses.room.posContent : "-" }}</span>
</a-descriptions-item> </a-descriptions-item> -->
<a-descriptions-item class="test1"> <a-descriptions-item class="test1">
<span slot="label" class>面试说明</span> <span slot="label" class>面试说明</span>
<span>{{ jobDetail.interviewDesp || "-" }}</span> <span>{{ jobDetail.interviewDesp || "-" }}</span>
@ -409,7 +409,7 @@
</h1> </h1>
<img style="width: 60px; height: 60px; border-radius: 50%" class="mt24" :src="managerInfo.avatar || 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/service.jpg'" alt /> <img style="width: 60px; height: 60px; border-radius: 50%" class="mt24" :src="managerInfo.avatar || 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/service.jpg'" alt />
<div style="color: #333; font-weight: 600"> <div style="color: #333; font-weight: 600">
<p class="f16" style="margin-top: 10px;margin-bottom:0"> <p class="f16" style="margin-top: 10px; margin-bottom: 0">
{{ managerInfo.name }} {{ managerInfo.name }}
<i class="iconfont icon-dianhua1 ml4 f14" style="line-height: 24px; color: #ff4400"></i> <i class="iconfont icon-dianhua1 ml4 f14" style="line-height: 24px; color: #ff4400"></i>
</p> </p>
@ -506,8 +506,8 @@ export default {
jobDetail: {}, // 职位相关信息 jobDetail: {}, // 职位相关信息
storeImage: [], storeImage: [],
storeInfo: {}, storeInfo: {},
id: this.$route.query.id, id: "",
currentPageNum: this.$route.query.page, currentPageNum: this.$route.query.page || "",
visible: false, // 录单模态框的展示 visible: false, // 录单模态框的展示
xiangdanVisible: false, // 详单的弹出 xiangdanVisible: false, // 详单的弹出
confirmLoading: false, // 录单提交的loading效果 confirmLoading: false, // 录单提交的loading效果
@ -723,7 +723,16 @@ export default {
beforeCreate() {}, beforeCreate() {},
created() { created() {
// console.log(this.$router.matcher.match()); // console.log(this.$router.matcher.match());
if (sessionStorage.getItem("PAGE_TYPE")) {
this.id = JSON.parse(sessionStorage.getItem("PAGE_TYPE")).id;
this.currentPageNum = JSON.parse(sessionStorage.getItem("PAGE_TYPE")).pageNum;
console.log("PAGE_TYPE", JSON.parse(sessionStorage.getItem("PAGE_TYPE")));
}
if (this.$route.query.id) {
this.id = this.$route.query.id;
}
console.log("this.id ", this.id);
console.log("this.$route", this.$route); // 获取传过来的params数据 console.log("this.$route", this.$route); // 获取传过来的params数据
if (this.$route.query.type) { if (this.$route.query.type) {
this.from = this.$route.query.type; this.from = this.$route.query.type;
@ -789,6 +798,7 @@ export default {
// 组件方法 // 组件方法
methods: { methods: {
async getJobDetail() { async getJobDetail() {
console.log("this.id", this.id);
try { try {
const { data } = await getJobDetailApi(this.id); const { data } = await getJobDetailApi(this.id);
console.log("data", data); console.log("data", data);
@ -992,9 +1002,9 @@ export default {
// 跳转到列表页 // 跳转到列表页
this.$router.push({ this.$router.push({
path: this.from == "vocational" ? "/list?type=vocational" : "/list?", path: this.from == "vocational" ? "/list?type=vocational" : "/list?",
query: { // query: {
pagenum: this.currentPageNum, // pagenum: this.currentPageNum || "",
}, // },
}); });
}, },
handlePreview(file) { handlePreview(file) {

22
src/components/FirstJob/detailYicai.vue
Unescape Escape View File

@ -131,7 +131,7 @@
</template> </template>
<script> <script>
import { getJobDetailYicaiApi } from "../../api/job"; import { getJobDetailYicaiApi } from "../../api/job";
import { disposeJobListData, getSalaryClassifyValue, isNotEmptyCheck,setReturnFee } from "../../utils/commonUtil"; import { disposeJobListData, getSalaryClassifyValue, isNotEmptyCheck, setReturnFee } from "../../utils/commonUtil";
import recommend from "../../components/FirstJob/components/recommend.vue"; import recommend from "../../components/FirstJob/components/recommend.vue";
import { nationlist } from "../../utils/datalist"; import { nationlist } from "../../utils/datalist";
import { getUserManagerApi } from "../../api/userinfo"; import { getUserManagerApi } from "../../api/userinfo";
@ -184,7 +184,7 @@ export default {
// 组件状态值 // 组件状态值
data() { data() {
return { return {
retrunFee:"", retrunFee: "",
previewVisible: false, previewVisible: false,
previewImage: "", previewImage: "",
relationList: [], relationList: [],
@ -241,6 +241,12 @@ export default {
beforeCreate() {}, beforeCreate() {},
created() { created() {
// console.log(this.$router.matcher.match()); // console.log(this.$router.matcher.match());
if (sessionStorage.getItem("PAGE_TYPE")) {
this.id = JSON.parse(sessionStorage.getItem("PAGE_TYPE")).id;
this.currentPageNum = JSON.parse(sessionStorage.getItem("PAGE_TYPE")).pageNum;
console.log("PAGE_TYPE", JSON.parse(sessionStorage.getItem("PAGE_TYPE")));
}
this.getJobDetail(); this.getJobDetail();
console.log(this.$route); // 获取传过来的params数据 console.log(this.$route); // 获取传过来的params数据
this.getUserManager(); this.getUserManager();
@ -306,13 +312,13 @@ export default {
console.log(data.data); console.log(data.data);
console.log(disposeJobListData(data.data)); console.log(disposeJobListData(data.data));
this.jobDetail = disposeJobListData(data.data); this.jobDetail = disposeJobListData(data.data);
this.jobDetail.jobInfo = data.data.jobInfo.replaceAll('*****','') this.jobDetail.jobInfo = data.data.jobInfo.replaceAll("*****", "");
this.jobDetail.maxMonthlyPayStr = this.jobDetail.maxMonthlyPay / 100 this.jobDetail.maxMonthlyPayStr = this.jobDetail.maxMonthlyPay / 100;
this.jobDetail.minMonthlyPayStr = this.jobDetail.minMonthlyPay / 100 this.jobDetail.minMonthlyPayStr = this.jobDetail.minMonthlyPay / 100;
this.store = data.data; this.store = data.data;
this.jobDetail.district = disposeJobListData(data.data).district; this.jobDetail.district = disposeJobListData(data.data).district;
this.retrunFee = setReturnFee(data.data.returnFee, data.data.returnFeeType); this.retrunFee = setReturnFee(data.data.returnFee, data.data.returnFeeType);
var districtStr = ""; var districtStr = "";
if (isNotEmptyCheck(this.store.storeDistrict)) { if (isNotEmptyCheck(this.store.storeDistrict)) {
@ -510,7 +516,7 @@ export default {
name: "JobList", name: "JobList",
params: { params: {
pagenum: this.currentPageNum, pagenum: this.currentPageNum,
signType: 1 signType: 1,
}, },
}); });
}, },
@ -1408,6 +1414,6 @@ export default {
color: #fff; color: #fff;
font-size: 44px; font-size: 44px;
line-height: 1.3; line-height: 1.3;
padding: 10px; padding: 10px;
} }
</style> </style>

56
src/components/FirstJob/joblist.vue
Unescape Escape View File

@ -501,7 +501,7 @@
> >
<!-- v-if="signType == ''" --> <!-- v-if="signType == ''" -->
<router-link target="_blank" :to="signType == '' ? '/detail?id=' + item.id + '&page=' + formvalue.pageNum : '/detailYicai?id=' + item.id + '&page=' + formvalue.pageNum" rel="opener"> <span @click="toDetail(item)" style="cursor: pointer">
<div class="subsetleft" @click="totop"> <div class="subsetleft" @click="totop">
<div class="imgbox"> <div class="imgbox">
<img v-if="item.logo.length !== 0" :src="item.logo" /> <img v-if="item.logo.length !== 0" :src="item.logo" />
@ -558,7 +558,7 @@
</div> </div>
</div> </div>
</div> </div>
</router-link> </span>
<div class="subsetright"> <div class="subsetright">
<div class="topContainer"> <div class="topContainer">
<div class="updateTime" style="display: none"> <div class="updateTime" style="display: none">
@ -576,17 +576,18 @@
<span v-if="item.jobDesp" :class="'copyInfo' + index">{{ item.jobDesp }}</span <span v-if="item.jobDesp" :class="'copyInfo' + index">{{ item.jobDesp }}</span
><span v-else>暂无详单</span> ><span v-else>暂无详单</span>
</template>--> </template>-->
<router-link target="_blank" :to="signType == '' ? '/detail?id=' + item.id + '&page=' + formvalue.pageNum : '/detailYicai?id=' + item.id + '&page=' + formvalue.pageNum" rel="opener"> <a>
<button <button
type="primary" type="primary"
class="jobDesp br4" class="jobDesp br4"
:style="{ :style="{
background: item.recruitment == '1' ? '#fff' : '#f5f5f5', background: item.recruitment == '1' ? '#fff' : '#f5f5f5',
}" }"
@click="toDetail(item)"
> >
更多 更多
</button> </button>
</router-link> </a>
<!-- </a-popover> --> <!-- </a-popover> -->
<button class="apply br4" @click="torecord(item)" v-if="item.recruitment == '1'">报名</button> <button class="apply br4" @click="torecord(item)" v-if="item.recruitment == '1'">报名</button>
<button class="norecruitment" v-else>暂时停招</button> <button class="norecruitment" v-else>暂时停招</button>
@ -1181,6 +1182,9 @@ export default {
}, },
deep: true, deep: true,
}, },
"formvalue.pageNum"(val) {
sessionStorage.removeItem("PAGE_TYPE");
},
}, },
// 组件 // 组件
@ -1191,8 +1195,13 @@ export default {
created() { created() {
// console.log(this.proxyinfo); // console.log(this.proxyinfo);
console.log(this.$route); console.log(this.$route);
this.currentPage = this.$route.query.pagenum;
this.signType = this.$route.query.signType ? this.$route.query.signType : ""; window.addEventListener("beforeunload", (e) => this.removePageInfo());
if (sessionStorage.getItem("PAGE_TYPE")) {
let info = JSON.parse(sessionStorage.getItem("PAGE_TYPE"));
this.signType = info.signType ? info.signType : "";
this.currentPage = info.pageNum ? info.pageNum : 1;
}
if (this.$route.query.type) { if (this.$route.query.type) {
if (this.$route.query.type == "vocational") { if (this.$route.query.type == "vocational") {
this.isVocational = true; this.isVocational = true;
@ -1242,8 +1251,19 @@ export default {
this.loginValue = localStorage.getItem("LOGIN_DATA") !== null ? JSON.parse(localStorage.getItem("LOGIN_DATA")) : { tel: "" }; this.loginValue = localStorage.getItem("LOGIN_DATA") !== null ? JSON.parse(localStorage.getItem("LOGIN_DATA")) : { tel: "" };
console.log(this.loginValue); console.log(this.loginValue);
}, },
beforeDestroy() {
console.log("beforeDestroy");
// sessionStorage.removeItem("PAGE_TYPE")
},
destroyed() {
window.removeEventListener("beforeunload", (e) => this.removePageInfo(e));
},
// 组件方法 // 组件方法
methods: { methods: {
removePageInfo() {
sessionStorage.removeItem("PAGE_TYPE");
},
// 处理筛选框的定位 // 处理筛选框的定位
// filterbox() { // filterbox() {
// return () => { // return () => {
@ -1844,6 +1864,8 @@ export default {
// 跳转到路由新页面的方法 // 跳转到路由新页面的方法
// console.log(item); // console.log(item);
// let userinfo = JSON.stringify(item); // let userinfo = JSON.stringify(item);
sessionStorage.setItem("PAGE_TYPE", JSON.stringify({ id: item.id, pageNum: this.formvalue.pageNum, signType: this.signType }));
if (this.signType == "") { if (this.signType == "") {
this.$router.push({ name: "recordbill", params: item }); this.$router.push({ name: "recordbill", params: item });
sessionStorage.setItem("CURRENT_FIRM", JSON.stringify(item)); sessionStorage.setItem("CURRENT_FIRM", JSON.stringify(item));
@ -2041,14 +2063,20 @@ export default {
this.formvalue.provinceName = ""; this.formvalue.provinceName = "";
this.getJobList(); this.getJobList();
}, },
// todetail(item) { /**
// const routeURL = this.$router.resolve({ * 前往详情页
// name: "Detail", */
// query: item.id, toDetail(item) {
// }); // :to="signType == '' ? '/detail?id=' + item.id + '&page=' + formvalue.pageNum : '/detailYicai?id=' + item.id + '&page=' + formvalue.pageNum"
// window.open(routeURL.href, "_blank"); sessionStorage.setItem("PAGE_TYPE", JSON.stringify({ id: item.id, pageNum: this.formvalue.pageNum, signType: this.signType }));
// console.log(item);
// }, const routeURL = this.$router.resolve({
name: this.signType == "" ? "Detail" : "DetailYicai",
// query: item.id,
});
window.open(routeURL.href, "_blank");
console.log(item);
},
hideFilterContent() { hideFilterContent() {
setTimeout(() => { setTimeout(() => {
let fileterContent = document.querySelector(".filter-content"); let fileterContent = document.querySelector(".filter-content");

2870
src/components/FirstJob/recordBill.vue
View File

File diff suppressed because it is too large Load Diff

2709
src/components/FirstJob/recordBillYicai.vue
View File

File diff suppressed because it is too large Load Diff

7
src/utils/request.js
Unescape Escape View File

@ -6,10 +6,10 @@ import qs from "qs";
// import Vue from "vue"; // import Vue from "vue";
// const baseURL = "http://1shoudan.com"; // 正式环境线上 废弃 // const baseURL = "http://1shoudan.com"; // 正式环境线上 废弃
const baseURL = "//idaotian.com"; // 正式环境线上 const baseURL = "//idaotian.com"; // 正式环境线上
// const baseURL = "//idagou.cn"; // 正式环境线上 // const baseURL = "//test.renminshitang.com.cn/daotian/api_dev"; // 测试环境本地
// const baseURL = "//idagou.cn"; // 正式环境线上 废弃
// console.log(baseURL); // console.log(baseURL);
// const baseURL = "https://d.matripe.com.cn"; // 正式环境本地 // const baseURL = "https://d.matripe.com.cn"; // 正式环境本地
// const baseURL = "//test.renminshitang.com.cn/daotian/api_dev"; // 测试环境本地
// const baseURL = "http://1shoudan.renminshitang.com.cn"; // 测试环境线上 // const baseURL = "http://1shoudan.renminshitang.com.cn"; // 测试环境线上
// const baseURL = "http://localhost:8001"; // const baseURL = "http://localhost:8001";
// const data1 = require.context("./", false, /\.js$/); // 测试用 // const data1 = require.context("./", false, /\.js$/); // 测试用
@ -39,6 +39,9 @@ service.interceptors.request.use(
if (localStorage.getItem("LOGIN_DATA")) { if (localStorage.getItem("LOGIN_DATA")) {
req.headers.Authorization = "Bearer " + JSON.parse(localStorage.getItem("LOGIN_DATA")).token; req.headers.Authorization = "Bearer " + JSON.parse(localStorage.getItem("LOGIN_DATA")).token;
req.headers.appId = "daotianpc";
req.headers["g-open-env"]= 'WEB-PAGE',
console.log('getToken++++++++++++++++++++++++++++++++++++++++++++++++++++'); console.log('getToken++++++++++++++++++++++++++++++++++++++++++++++++++++');
} }
// application/json // application/json

Write Preview
Loading…
Cancel
Save