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

同步

Browse Source
cyl/dev
wangxia 2 years ago
parent 873619e557
commit f39d4116b3
2 changed files with 122 additions and 119 deletions
Show Stats Download Patch File Download Diff File

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

@ -137,7 +137,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="swiperBox"> <div class="swiperBox" style="display: flex; justify-content: start">
<img :src="jobDetail.logo || jobDetail.store.logo" alt v-if="jobDetail.logo || jobDetail.store.logo" @click="showImage(0, 'logo')" style="cursor: pointer; width: 80px; height: 45px" />
<div id="swiper"> <div id="swiper">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<div class="swiper-slide" v-for="(item, index) in [...storeImage]" :key="index"> <div class="swiper-slide" v-for="(item, index) in [...storeImage]" :key="index">
@ -409,9 +410,9 @@
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </a-descriptions>
<a-descriptions bordered size="small" :column="1" class="leftDesc mt20" style="width: 900px" v-else-if="jobClassify == 2"> <a-descriptions bordered size="small" :column="1" class="leftDesc mt20" style="width: 900px" v-else-if="jobClassify == 2">
<a-descriptions-item class="test1"> <a-descriptions-item class="test1">
<span slot="label" class>服务费</span> <span slot="label" class>服务费</span>
<span>{{jobDetail.servetype}}</span> <span>{{ jobDetail.servetype }}</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>
@ -435,7 +436,7 @@
<h1 class="bottombox" style> <h1 class="bottombox" style>
<i>项目方</i> <i>项目方</i>
</h1> </h1>
<img style="width: 60px; height: 60px; border-radius: 50%;display: block;margin: 24px auto 0;" :src="agency.logo || 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/service.jpg'" alt /> <img style="width: 60px; height: 60px; border-radius: 50%; display: block; margin: 24px auto 0" :src="agency.logo || 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/service.jpg'" alt />
<div style="color: #333"> <div style="color: #333">
<p class="f14" style="margin-top: 10px; margin-bottom: 0"> <p class="f14" style="margin-top: 10px; margin-bottom: 0">
{{ agency.agencyName || "-" }} {{ agency.agencyName || "-" }}
@ -839,6 +840,10 @@ export default {
if (data.status === 200) { if (data.status === 200) {
console.log(data); console.log(data);
this.jobDetail = disposeJobListData(data.data.record); this.jobDetail = disposeJobListData(data.data.record);
this.jobDetail = {
...this.jobDetail,
...data.data,
};
this.jobDetail.jobDesp = data.data.record.jobDesp.replaceAll("*****", ""); this.jobDetail.jobDesp = data.data.record.jobDesp.replaceAll("*****", "");
this.customServiceUrl = data.data.customServiceUrl; this.customServiceUrl = data.data.customServiceUrl;
this.jobPoses = data.data.jobPoses; this.jobPoses = data.data.jobPoses;
@ -852,29 +857,28 @@ export default {
this.positionInfo.containerName = "mapContainer"; this.positionInfo.containerName = "mapContainer";
this.positionInfo.name = this.positionInfo.aliasName; this.positionInfo.name = this.positionInfo.aliasName;
this.jobDetail.district = disposeJobListData(data.data.store).district; this.jobDetail.district = disposeJobListData(data.data.store).district;
}else{ } else {
this.positionInfo = data.data.record; this.positionInfo = data.data.record;
this.store = data.data.record; this.store = data.data.record;
this.positionInfo.desc = this.positionInfo.storeAddr; this.positionInfo.desc = this.positionInfo.storeAddr;
this.positionInfo.containerName = "mapContainer"; this.positionInfo.containerName = "mapContainer";
this.positionInfo.name = this.positionInfo.storeName; this.positionInfo.name = this.positionInfo.storeName;
this.positionInfo.lat = this.positionInfo.storeLat; this.positionInfo.lat = this.positionInfo.storeLat;
this.positionInfo.lng = this.positionInfo.storeLng; this.positionInfo.lng = this.positionInfo.storeLng;
this.jobDetail.district = this.positionInfo.storeDistrict this.jobDetail.district = this.positionInfo.storeDistrict;
} }
if (data.data.onSiteUsers) { if (data.data.onSiteUsers) {
this.onSiteUsersInfo = data.data.onSiteUsers.map((item) => `${item.aliasName} ${item.tel}`).join(", "); this.onSiteUsersInfo = data.data.onSiteUsers.map((item) => `${item.aliasName} ${item.tel}`).join(", ");
} }
// console.log(this.jobDetail.jobRequestLabelNames) // console.log(this.jobDetail.jobRequestLabelNames)
// if(this.jobDetail.jobRequestLabelNames){ // if(this.jobDetail.jobRequestLabelNames){
// this.jobDetail.jobRequestLabelNames = this.jobDetail.jobRequestLabelNames.split(',') // this.jobDetail.jobRequestLabelNames = this.jobDetail.jobRequestLabelNames.split(',')
// } // }
// if(this.jobDetail.jobSpecialLabelNames){
// this.jobDetail.jobSpecialLabelNames = this.jobDetail.jobSpecialLabelNames.split(',')
// }
// if(this.jobDetail.jobSpecialLabelNames){
// this.jobDetail.jobSpecialLabelNames = this.jobDetail.jobSpecialLabelNames.split(',')
// }
this.skeletonshow = false; this.skeletonshow = false;
console.log(this.jobDetail); console.log(this.jobDetail);
@ -894,30 +898,29 @@ export default {
// console.log(this.storeImage); // console.log(this.storeImage);
let storeImage = []; let storeImage = [];
let storeVideo = []; let storeVideo = [];
if(data.data.storeImage){ if (data.data.storeImage) {
data.data.storeImage.forEach((item) => {
data.data.storeImage.forEach((item) => { console.log(item.url);
console.log(item.url);
if (regs.test(item.url.toLowerCase())) {
if (regs.test(item.url.toLowerCase())) { storeImage.push(item.url);
storeImage.push(item.url); } else {
} else { storeVideo.push(item.url);
storeVideo.push(item.url); }
} });
}); }
}
if (data.data.images) {
if(data.data.images){ data.data.images.forEach((item) => {
data.data.images.forEach((item) => { console.log(item.url);
console.log(item.url);
if (regs.test(item.url.toLowerCase())) {
if (regs.test(item.url.toLowerCase())) { storeImage.push(item.url);
storeImage.push(item.url); } else {
} else { storeVideo.push(item.url);
storeVideo.push(item.url); }
} });
}); }
}
this.storeImage = [...storeImage, ...storeVideo]; this.storeImage = [...storeImage, ...storeVideo];
console.log("this.storeImage", this.storeImage); console.log("this.storeImage", this.storeImage);
@ -1031,7 +1034,7 @@ export default {
* *
* *
*/ */
showImage(idx) { showImage(idx, type) {
var that = this; var that = this;
console.log(that.storeImage); console.log(that.storeImage);
if (this.from == "vocational") { if (this.from == "vocational") {
@ -1046,6 +1049,9 @@ export default {
that.imgList.push(item); that.imgList.push(item);
} }
}); });
if (type == "logo") {
that.imgList.unshift(that.jobDetail.logo || that.jobDetail.store.logo);
}
} }
this.$viewerApi({ this.$viewerApi({

153
src/components/FirstJob/recordBill.vue
Unescape Escape View File

@ -63,11 +63,11 @@
</a-select> --> </a-select> -->
<!-- v-if="isMaster && jobnameStatus !== 'jobname'" --> <!-- v-if="isMaster && jobnameStatus !== 'jobname'" -->
<span @click="openModal" :style="{ color: '#ff4400', marginLeft: '10px', cursor: 'pointer'}">修改</span> <span @click="openModal" :style="{ color: '#ff4400', marginLeft: '10px', cursor: 'pointer' }">修改</span>
</div> </div>
</a-form-model-item> </a-form-model-item>
<recordBillTable :isModalVisible.sync="isModalVisible" @getSelectedJobId="getSelectedJobId"></recordBillTable> <recordBillTable :isModalVisible.sync="isModalVisible" @getSelectedJobId="getSelectedJobId"></recordBillTable>
<a-form-model-item ref="username" label="报名企业" prop="username" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px; margin-bottom: 18px"> <a-form-model-item ref="username" label="报名企业" prop="username" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px; margin-bottom: 18px">
<!-- <a-input :value="firminfo.aliasName" :disabled="true" /> --> <!-- <a-input :value="firminfo.aliasName" :disabled="true" /> -->
@ -265,9 +265,9 @@
import { nationlist } from "../../utils/datalist"; import { nationlist } from "../../utils/datalist";
// import recordbill from "@/components/FirstJob/components/recordbill.vue"; // import recordbill from "@/components/FirstJob/components/recordbill.vue";
import moment from "moment"; import moment from "moment";
import { isEmptyCheck, getAgeFromBirthday,disposeJobListData } from "../../utils/commonUtil"; import { isEmptyCheck, getAgeFromBirthday, disposeJobListData } from "../../utils/commonUtil";
import timepicker from "./components/timepicker.vue"; import timepicker from "./components/timepicker.vue";
import { recordBillApi,recordBillApiDaotian, getProxyInfoApi, getStoreAliasApi, getStoreJobApi, getPolicyByJobIdApi,getPolicyByJobIdApiDaotian, getPolicyListByJobIdApi, getJobDetailApi } from "@/api/job"; import { recordBillApi, recordBillApiDaotian, getProxyInfoApi, getStoreAliasApi, getStoreJobApi, getPolicyByJobIdApi, getPolicyByJobIdApiDaotian, getPolicyListByJobIdApi, getJobDetailApi } from "@/api/job";
import request from "@/utils/request"; import request from "@/utils/request";
import qs from "qs"; import qs from "qs";
// import axios from "axios"; // import axios from "axios";
@ -280,7 +280,7 @@ export default {
name: "recordBill", name: "recordBill",
// 局部注册的组件 // 局部注册的组件
components: { components: {
recordBillTable, recordBillTable,
// recordbill, // recordbill,
timepicker, timepicker,
}, },
@ -289,10 +289,10 @@ export default {
// 组件状态值 // 组件状态值
data() { data() {
return { return {
isModalVisible:false, isModalVisible: false,
selectedJobId:"", selectedJobId: "",
storeName:"", storeName: "",
agencyName: "-", agencyName: "-",
jobClassify: "", jobClassify: "",
fileList2: [], fileList2: [],
@ -459,16 +459,15 @@ export default {
this.getProxyInfo(this.proxyinfo.id); this.getProxyInfo(this.proxyinfo.id);
this.getJob(this.firminfo); this.getJob(this.firminfo);
if (this.jobClassify == 1) {
if(this.jobClassify == 1){ this.getPolicyByJobId(this.firminfo.id).then(() => {
this.getPolicyByJobId(this.firminfo.id).then(() => { this.getJobDetail(this.firminfo.id);
this.getJobDetail(this.firminfo.id); });
}); } else {
}else{ this.getPolicyByJobIdDaotian(this.firminfo.id).then(() => {
this.getPolicyByJobIdDaotian(this.firminfo.id).then(() => { this.getJobDetail(this.firminfo.id);
this.getJobDetail(this.firminfo.id); });
}); }
}
// this.getPolicyByJobId(this.firminfo.id || "").then(() => { // this.getPolicyByJobId(this.firminfo.id || "").then(() => {
// this.getJobDetail(this.firminfo.id || ""); // this.getJobDetail(this.firminfo.id || "");
@ -484,30 +483,28 @@ export default {
}, },
// 组件方法 // 组件方法
methods: { methods: {
openModal() { openModal() {
this.isModalVisible = true; this.isModalVisible = true;
// 可在此处加载或更新表格数据 // 可在此处加载或更新表格数据
}, },
getSelectedJobId(val){ getSelectedJobId(val) {
console.log(val); console.log(val);
this.selectedJobId = val; this.selectedJobId = val;
this.jobClassify = val.jobClassify; this.jobClassify = val.jobClassify;
this.firminfo.id = val.jobId; this.firminfo.id = val.jobId;
this.getJobDetail(val.jobId); this.getJobDetail(val.jobId);
if(this.jobClassify == 1){ if (this.jobClassify == 1) {
this.getPolicyByJobId(val.jobId).then(() => { this.getPolicyByJobId(val.jobId).then(() => {
this.getJobDetail(val.jobId); this.getJobDetail(val.jobId);
}); });
}else{ } else {
this.getPolicyByJobIdDaotian(val.jobId).then(() => { this.getPolicyByJobIdDaotian(val.jobId).then(() => {
this.getJobDetail(val.jobId); this.getJobDetail(val.jobId);
}); });
} }
},
},
async getJob(value) { async getJob(value) {
try { try {
const { data } = await getStoreJobApi(value.id); const { data } = await getStoreJobApi(value.id);
@ -570,12 +567,12 @@ export default {
console.log(data); console.log(data);
if (data.status === 200) { if (data.status === 200) {
this.agencyName = data.data.agency.agencyName; this.agencyName = data.data.agency.agencyName;
this.firminfo = disposeJobListData(data.data.record); this.firminfo = disposeJobListData(data.data.record);
if (this.jobClassify == 1) { if (this.jobClassify == 1) {
this.storeName = data.data.store.aliasName; this.storeName = data.data.store.aliasName;
}else{ } else {
this.storeName = data.data.record.storeName; this.storeName = data.data.record.storeName;
} }
this.form.policyNum = data.data.record.policyNum; this.form.policyNum = data.data.record.policyNum;
console.log(this.form.policyNum); console.log(this.form.policyNum);
if (this.form.policyNum == "" && this.form.policy != "") { if (this.form.policyNum == "" && this.form.policy != "") {
@ -643,7 +640,7 @@ export default {
return getPolicyByJobIdApiDaotian(value).then(({ data }) => { return getPolicyByJobIdApiDaotian(value).then(({ data }) => {
console.log(data); console.log(data);
if (data.status === 200) { if (data.status === 200) {
this.form.policy ="员工薪资：\n" + data.data.salaryDetail + '\n\n' + '代理政策：\n' + data.data.agencyReturnFeeDesp; this.form.policy = "员工薪资：\n" + data.data.salaryDetail + "\n\n" + "代理政策：\n" + data.data.agencyReturnFeeDesp;
} }
}); });
}, },
@ -700,46 +697,46 @@ export default {
this.confirmLoading = false; this.confirmLoading = false;
return; return;
} }
// console.log(dataObj); // console.log(dataObj);
// return; // return;
let dataObj = {}; let dataObj = {};
let data = {}; let data = {};
if(this.jobClassify == 2){ if (this.jobClassify == 2) {
console.log(this.form);
console.log(this.form); this.form["interviewTimeStr"] = that.form.interviewTime;
this.form["interviewTimeStr"] = that.form.interviewTime; this.form["receptionTimeStr"] = that.form.receptionTime;
this.form["receptionTimeStr"] = that.form.receptionTime; this.form["jobId"] = this.firminfo.id;
this.form["jobId"] = this.firminfo.id this.form["customJobId"] = this.firminfo.id;
this.form["customJobId"] = this.firminfo.id this.form["applyUserId"] = this.proxyinfo.id;
this.form["applyUserId"] = this.proxyinfo.id this.form["agencyUserId"] = this.proxyinfo.id;
this.form["agencyUserId"] =this.proxyinfo.id
dataObj = qs.stringify({
dataObj = qs.stringify({ ...this.form,
...this.form, storeJobId: this.firminfo.id,
storeJobId: this.firminfo.id, policyIdx: this.currentPolicy,
policyIdx: this.currentPolicy, // policy: '',
// policy: '', });
}); data = await recordBillApiDaotian(dataObj);
data = await recordBillApiDaotian(dataObj); } else {
}else{ dataObj = qs.stringify({
dataObj = qs.stringify({ ...this.form,
...this.form, storeJobId: this.firminfo.id,
storeJobId: this.firminfo.id, policyIdx: this.currentPolicy,
policyIdx: this.currentPolicy, // policy: '',
// policy: '', });
});
data = await recordBillApi(dataObj); data = await recordBillApi(dataObj);
} }
if (data.status === 200) { console.log("data handleOk", data);
if (data.data.status === 200) {
setTimeout(() => { setTimeout(() => {
this.confirmLoading = false; this.confirmLoading = false;
this.$router.push("/recordsuccess"); this.$router.push("/recordsuccess");
}, 1000); }, 1000);
} else { } else {
this.$message.error(data.msg); this.$message.error(data.data.msg);
} }
this.confirmLoading = false; this.confirmLoading = false;
@ -1176,7 +1173,7 @@ export default {
// this.$message.warning("请先选择企业"); // this.$message.warning("请先选择企业");
// } // }
}, },
toList() { toList() {
this.$router.push({ this.$router.push({
path: `/list`, path: `/list`,

Write Preview
Loading…
Cancel
Save