diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue index f048d07..16b6245 100644 --- a/src/components/FirstJob/detail.vue +++ b/src/components/FirstJob/detail.vue @@ -137,7 +137,8 @@ -
+
+
@@ -409,9 +410,9 @@ - + 服务费 - {{jobDetail.servetype}} + {{ jobDetail.servetype }} 服务费详情 @@ -435,7 +436,7 @@

项目方

- +

{{ agency.agencyName || "-" }} @@ -839,6 +840,10 @@ export default { if (data.status === 200) { console.log(data); this.jobDetail = disposeJobListData(data.data.record); + this.jobDetail = { + ...this.jobDetail, + ...data.data, + }; this.jobDetail.jobDesp = data.data.record.jobDesp.replaceAll("*****", ""); this.customServiceUrl = data.data.customServiceUrl; this.jobPoses = data.data.jobPoses; @@ -852,29 +857,28 @@ export default { this.positionInfo.containerName = "mapContainer"; this.positionInfo.name = this.positionInfo.aliasName; this.jobDetail.district = disposeJobListData(data.data.store).district; - }else{ - this.positionInfo = data.data.record; + } else { + this.positionInfo = data.data.record; this.store = data.data.record; this.positionInfo.desc = this.positionInfo.storeAddr; this.positionInfo.containerName = "mapContainer"; this.positionInfo.name = this.positionInfo.storeName; this.positionInfo.lat = this.positionInfo.storeLat; this.positionInfo.lng = this.positionInfo.storeLng; - this.jobDetail.district = this.positionInfo.storeDistrict - } + this.jobDetail.district = this.positionInfo.storeDistrict; + } if (data.data.onSiteUsers) { this.onSiteUsersInfo = data.data.onSiteUsers.map((item) => `${item.aliasName} ${item.tel}`).join(", "); } - // console.log(this.jobDetail.jobRequestLabelNames) - // if(this.jobDetail.jobRequestLabelNames){ - // this.jobDetail.jobRequestLabelNames = this.jobDetail.jobRequestLabelNames.split(',') - // } - - // if(this.jobDetail.jobSpecialLabelNames){ - // this.jobDetail.jobSpecialLabelNames = this.jobDetail.jobSpecialLabelNames.split(',') - // } + // console.log(this.jobDetail.jobRequestLabelNames) + // if(this.jobDetail.jobRequestLabelNames){ + // this.jobDetail.jobRequestLabelNames = this.jobDetail.jobRequestLabelNames.split(',') + // } + // if(this.jobDetail.jobSpecialLabelNames){ + // this.jobDetail.jobSpecialLabelNames = this.jobDetail.jobSpecialLabelNames.split(',') + // } this.skeletonshow = false; console.log(this.jobDetail); @@ -894,30 +898,29 @@ export default { // console.log(this.storeImage); let storeImage = []; let storeVideo = []; - if(data.data.storeImage){ - - data.data.storeImage.forEach((item) => { - console.log(item.url); - - if (regs.test(item.url.toLowerCase())) { - storeImage.push(item.url); - } else { - storeVideo.push(item.url); - } - }); - } - - if(data.data.images){ - data.data.images.forEach((item) => { - console.log(item.url); - - if (regs.test(item.url.toLowerCase())) { - storeImage.push(item.url); - } else { - storeVideo.push(item.url); - } - }); - } + if (data.data.storeImage) { + data.data.storeImage.forEach((item) => { + console.log(item.url); + + if (regs.test(item.url.toLowerCase())) { + storeImage.push(item.url); + } else { + storeVideo.push(item.url); + } + }); + } + + if (data.data.images) { + data.data.images.forEach((item) => { + console.log(item.url); + + if (regs.test(item.url.toLowerCase())) { + storeImage.push(item.url); + } else { + storeVideo.push(item.url); + } + }); + } this.storeImage = [...storeImage, ...storeVideo]; console.log("this.storeImage", this.storeImage); @@ -1031,7 +1034,7 @@ export default { * * */ - showImage(idx) { + showImage(idx, type) { var that = this; console.log(that.storeImage); if (this.from == "vocational") { @@ -1046,6 +1049,9 @@ export default { that.imgList.push(item); } }); + if (type == "logo") { + that.imgList.unshift(that.jobDetail.logo || that.jobDetail.store.logo); + } } this.$viewerApi({ diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue index a7dfbaa..d69dec3 100644 --- a/src/components/FirstJob/recordBill.vue +++ b/src/components/FirstJob/recordBill.vue @@ -63,11 +63,11 @@ --> - 修改 + 修改

- + @@ -265,9 +265,9 @@ import { nationlist } from "../../utils/datalist"; // import recordbill from "@/components/FirstJob/components/recordbill.vue"; 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 { 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 qs from "qs"; // import axios from "axios"; @@ -280,7 +280,7 @@ export default { name: "recordBill", // 局部注册的组件 components: { - recordBillTable, + recordBillTable, // recordbill, timepicker, }, @@ -289,10 +289,10 @@ export default { // 组件状态值 data() { return { - isModalVisible:false, - selectedJobId:"", - storeName:"", - + isModalVisible: false, + selectedJobId: "", + storeName: "", + agencyName: "-", jobClassify: "", fileList2: [], @@ -459,16 +459,15 @@ export default { this.getProxyInfo(this.proxyinfo.id); this.getJob(this.firminfo); - - if(this.jobClassify == 1){ - this.getPolicyByJobId(this.firminfo.id).then(() => { - this.getJobDetail(this.firminfo.id); - }); - }else{ - this.getPolicyByJobIdDaotian(this.firminfo.id).then(() => { - this.getJobDetail(this.firminfo.id); - }); - } + if (this.jobClassify == 1) { + this.getPolicyByJobId(this.firminfo.id).then(() => { + this.getJobDetail(this.firminfo.id); + }); + } else { + this.getPolicyByJobIdDaotian(this.firminfo.id).then(() => { + this.getJobDetail(this.firminfo.id); + }); + } // this.getPolicyByJobId(this.firminfo.id || "").then(() => { // this.getJobDetail(this.firminfo.id || ""); @@ -484,30 +483,28 @@ export default { }, // 组件方法 methods: { - openModal() { + openModal() { this.isModalVisible = true; // 可在此处加载或更新表格数据 }, - getSelectedJobId(val){ - console.log(val); - this.selectedJobId = val; - this.jobClassify = val.jobClassify; - this.firminfo.id = val.jobId; - this.getJobDetail(val.jobId); - if(this.jobClassify == 1){ - this.getPolicyByJobId(val.jobId).then(() => { - this.getJobDetail(val.jobId); - }); - }else{ - this.getPolicyByJobIdDaotian(val.jobId).then(() => { - this.getJobDetail(val.jobId); - }); - } - - }, - - + getSelectedJobId(val) { + console.log(val); + this.selectedJobId = val; + this.jobClassify = val.jobClassify; + this.firminfo.id = val.jobId; + this.getJobDetail(val.jobId); + if (this.jobClassify == 1) { + this.getPolicyByJobId(val.jobId).then(() => { + this.getJobDetail(val.jobId); + }); + } else { + this.getPolicyByJobIdDaotian(val.jobId).then(() => { + this.getJobDetail(val.jobId); + }); + } + }, + async getJob(value) { try { const { data } = await getStoreJobApi(value.id); @@ -570,12 +567,12 @@ export default { console.log(data); if (data.status === 200) { this.agencyName = data.data.agency.agencyName; - this.firminfo = disposeJobListData(data.data.record); - if (this.jobClassify == 1) { - this.storeName = data.data.store.aliasName; - }else{ - this.storeName = data.data.record.storeName; - } + this.firminfo = disposeJobListData(data.data.record); + if (this.jobClassify == 1) { + this.storeName = data.data.store.aliasName; + } else { + this.storeName = data.data.record.storeName; + } this.form.policyNum = data.data.record.policyNum; console.log(this.form.policyNum); if (this.form.policyNum == "" && this.form.policy != "") { @@ -643,7 +640,7 @@ export default { return getPolicyByJobIdApiDaotian(value).then(({ data }) => { console.log(data); 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; return; } - + // console.log(dataObj); // return; - let dataObj = {}; - let data = {}; - if(this.jobClassify == 2){ - - console.log(this.form); - this.form["interviewTimeStr"] = that.form.interviewTime; - this.form["receptionTimeStr"] = that.form.receptionTime; - this.form["jobId"] = this.firminfo.id - this.form["customJobId"] = this.firminfo.id - this.form["applyUserId"] = this.proxyinfo.id - this.form["agencyUserId"] =this.proxyinfo.id - - dataObj = qs.stringify({ - ...this.form, - storeJobId: this.firminfo.id, - policyIdx: this.currentPolicy, - // policy: '', - }); - data = await recordBillApiDaotian(dataObj); - }else{ - dataObj = qs.stringify({ - ...this.form, - storeJobId: this.firminfo.id, - policyIdx: this.currentPolicy, - // policy: '', - }); + let dataObj = {}; + let data = {}; + if (this.jobClassify == 2) { + console.log(this.form); + this.form["interviewTimeStr"] = that.form.interviewTime; + this.form["receptionTimeStr"] = that.form.receptionTime; + this.form["jobId"] = this.firminfo.id; + this.form["customJobId"] = this.firminfo.id; + this.form["applyUserId"] = this.proxyinfo.id; + this.form["agencyUserId"] = this.proxyinfo.id; + + dataObj = qs.stringify({ + ...this.form, + storeJobId: this.firminfo.id, + policyIdx: this.currentPolicy, + // policy: '', + }); + data = await recordBillApiDaotian(dataObj); + } else { + dataObj = qs.stringify({ + ...this.form, + storeJobId: this.firminfo.id, + policyIdx: this.currentPolicy, + // policy: '', + }); - data = await recordBillApi(dataObj); - } - if (data.status === 200) { + data = await recordBillApi(dataObj); + } + console.log("data handleOk", data); + if (data.data.status === 200) { setTimeout(() => { this.confirmLoading = false; this.$router.push("/recordsuccess"); }, 1000); } else { - this.$message.error(data.msg); + this.$message.error(data.data.msg); } this.confirmLoading = false; @@ -1176,7 +1173,7 @@ export default { // this.$message.warning("请先选择企业"); // } }, - + toList() { this.$router.push({ path: `/list`,