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

新增服务费待定选项

Browse Source
cyl/dev
lc 3 years ago
parent 25da10510c
commit dc8cdf113e
6 changed files with 149 additions and 11 deletions
Show Stats Download Patch File Download Diff File

47
src/components/FirstJob/components/timepicker.vue
Unescape Escape View File

@ -149,6 +149,10 @@ export default {
8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17,
17, 18, 18, 17, 18, 18,
], ],
hourListTmp: [
8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17,
17, 18, 18,
],
year: new Date().getFullYear(), year: new Date().getFullYear(),
month: new Date().getMonth() + 1, month: new Date().getMonth() + 1,
day: new Date().getDate(), day: new Date().getDate(),
@ -181,8 +185,8 @@ export default {
let box = document.querySelector(".time-container"); let box = document.querySelector(".time-container");
box.style.opacity = 1; box.style.opacity = 1;
if (this.isShow) { if (this.isShow) {
this.initHours();
// console.log(this.selectHour); // console.log(this.selectHour);
this.$nextTick(() => { this.$nextTick(() => {
this.selectDate = new Date( this.selectDate = new Date(
new Date(this.datetime || new Date()).format("yyyy-MM-dd 00:00") new Date(this.datetime || new Date()).format("yyyy-MM-dd 00:00")
@ -198,7 +202,7 @@ export default {
? new Date(this.datetime || new Date()).getHours() ? new Date(this.datetime || new Date()).getHours()
: "8"; : "8";
let ind = let ind =
(this.selectHour - 8) * 2 + (this.selectMinute === "0" ? 0 : 1); (this.selectHour - 8 - (this.hourListTmp.length - this.hourList.length) / 2) * 2 + (this.selectMinute === "0" ? 0 : 1);
that.$emit( that.$emit(
"update:datetime", "update:datetime",
new Date( new Date(
@ -220,6 +224,41 @@ export default {
}, },
}, },
methods: { methods: {
initHours(timestr = '') {
var today = new Date();
var todayStr = `${today.getFullYear()}-${today.getMonth() < 10 ? ('0' + (today.getMonth() + 1)) : (today.getMonth() + 1)}-${today.getDate() < 10 ? ('0' + today.getDate()) : today.getDate()}`;
if(timestr != '' && timestr != todayStr) {
this.hourList = [
8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17,
17, 18, 18,
]
return;
}
if(this.datetime.split(" ")[0] == todayStr || timestr == todayStr) {
var currhour = today.getHours();
if(currhour > 17) {
this.hourList = [];
} else if(currhour <= 7) {
this.hourList = [
8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17,
17, 18, 18,
]
} else {
var arr = [];
currhour += 1;
for(var i = currhour; i != 19; ++i) {
arr.push(i);
arr.push(i);
}
this.hourList = arr;
}
} else {
this.hourList = [
8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17,
17, 18, 18,
]
}
},
getLangText(item) { getLangText(item) {
if (item) { if (item) {
if (this.langType == "en") { if (this.langType == "en") {
@ -397,7 +436,7 @@ export default {
this.year = new Date(time).getFullYear(); this.year = new Date(time).getFullYear();
this.month = new Date(time).getMonth() + 1; this.month = new Date(time).getMonth() + 1;
this.day = new Date(time).getDate(); this.day = new Date(time).getDate();
console.log(this.selectMinute); // console.log(this.selectMinute);
// console.log(this.year, "--------", this.month, "--------", this.day); // console.log(this.year, "--------", this.month, "--------", this.day);
this.$emit( this.$emit(
"update:datetime", "update:datetime",
@ -410,6 +449,8 @@ export default {
// let data12 = this.getabandonDate(new Date("2022-03-25").getTime()); // let data12 = this.getabandonDate(new Date("2022-03-25").getTime());
// console.dir(this.getabandonDate); // console.dir(this.getabandonDate);
// console.log(data12); // console.log(data12);
var selDate = new Date(time);
this.initHours(`${selDate.getFullYear()}-${selDate.getMonth() < 10 ? ('0' + (selDate.getMonth() + 1)) : (selDate.getMonth() + 1)}-${selDate.getDate() < 10 ? ('0' + selDate.getDate()) : selDate.getDate()}`);
}, },
getabandonDate(date) { getabandonDate(date) {
// 禁用日期的回调 // 禁用日期的回调

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

@ -289,9 +289,14 @@
> >
<span <span
@click="tabchange = 0" @click="tabchange = 0"
:class="tabchange !== 1 ? 'active' : ''" :class="tabchange === 0 ? 'active' : ''"
>财务结算</span >财务结算</span
> >
<span
@click="tabchange = 2"
:class="tabchange === 2 ? 'active' : ''"
>职位通告</span
>
</div> </div>
<!-- <div class="copy" @click="xiangdanVisible = true">通告</div>--> <!-- <div class="copy" @click="xiangdanVisible = true">通告</div>-->
<a-modal <a-modal
@ -676,7 +681,7 @@
</div> </div>
<!-- 财务结算 --> <!-- 财务结算 -->
<div v-else> <div v-else-if="tabchange == 0">
<div class="pay" id="tip"> <div class="pay" id="tip">
<div class="mb12 mt20 titlestyle">代理须知</div> <div class="mb12 mt20 titlestyle">代理须知</div>
<div class="showInfo" style="width: 640px"> <div class="showInfo" style="width: 640px">
@ -716,6 +721,16 @@
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </a-descriptions>
</div> </div>
<div v-else-if="tabchange === 2">
<div class="pay" id="tip">
<div class="mb12 mt20 titlestyle">职位通告</div>
<div class="showInfo" style="width: unset;color: #000 !important;">
<div class="copy" @click="copyText($event)">复制</div>
<!-- {{ jobDetail.jobDesp || "-" }}-->
<div class="copyInfo" style="border: none; padding: 0 0; width: unset;">{{ jobDetail.jobDesp || "-" }}</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
<div class="maincontentright"> <div class="maincontentright">
@ -1441,6 +1456,25 @@ export default {
color: #333; color: #333;
} }
} }
.copy {
width: 46px !important;
position: relative;
padding: 0px 8px !important;
float: right;
top: 6px;
/* right: 20px; */
bottom: 4px;
font-size: 14px !important;
border: 1px solid #ff4400 !important;
color: #ff4400 !important;
line-height: 22px;
text-align: center;
cursor: pointer;
&:hover {
color: #fff !important;
background-color: #ff4400 !important;
}
}
.jobinformationbox { .jobinformationbox {
h1 { h1 {
position: relative; position: relative;

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

@ -825,12 +825,59 @@ export default {
getDom() { getDom() {
console.log(1); console.log(1);
}, },
formatDateYMD(val) {
// model -> view，在更新 `<input>` 元素之前格式化值
if (val == null || val == "") {
return null;
}
if ((val != null || val == "") && typeof val == "string") {
if (val.indexOf("T")) {
val = val.replace("T", " "); //原来L端可能返回的时间格式有带T的格式，处理一下
}
val = val.replace("-", "/").replace("-", "/");
}
var value = new Date(val);
//console.log(val);
var fmt = "yyyy-MM-dd";
var o = {
"M+": value.getMonth() + 1, //月份
"d+": value.getDate(), //日
// "H+": value.getHours(), //小时
//"h+": val.getHours()%12 == 0 ? 12 : val.getHours()%12, //小时
// "m+": value.getMinutes(), //分
// "s+": value.getSeconds() //秒
//"S": val.getMilliseconds() //毫秒
//"q+": Math.floor((val.getMonth() + 3) / 3) //季度
};
if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (value.getFullYear() + "").substr(4 - RegExp.$1.length));
for (var k in o) {
if (new RegExp("(" + k + ")").test(fmt)) {
fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
}
}
return fmt;
},
getDateinfo() { getDateinfo() {
this.isShow = true; this.isShow = true;
if(isEmptyCheck(this.form.interviewTime)) {//设置默认值
//判断当前时间是不是在16:00之后，如果在16:00之后，默认显示次日09:00，如果在16:00之前，则显示下一个整点时间
var mydate = new Date();
var tomorrow = new Date();
tomorrow.setDate(tomorrow.getDate() + 1);
this.form.interviewTime = mydate.toTimeString() >= '16:00' ? (this.formatDateYMD(tomorrow.toLocaleDateString()) + " " + "09:00") : (this.formatDateYMD(mydate.toLocaleDateString()) + " " + `${mydate.getHours() + 1}:00`);
}
console.log(this.form.interviewTime); console.log(this.form.interviewTime);
}, },
getDateinfo1() { getDateinfo1() {
this.isShow1 = true; this.isShow1 = true;
if(isEmptyCheck(this.form.receptionTime)) {//设置默认值
//判断当前时间是不是在16:00之后，如果在16:00之后，默认显示次日09:00，如果在16:00之前，则显示下一个整点时间
var mydate = new Date();
var tomorrow = new Date();
tomorrow.setDate(tomorrow.getDate() + 1);
this.form.receptionTime = mydate.toTimeString() >= '16:00' ? (this.formatDateYMD(tomorrow.toLocaleDateString()) + " " + "09:00") : (this.formatDateYMD(mydate.toLocaleDateString()) + " " + `${mydate.getHours() + 1}:00`);
}
console.log(this.form.receptionTime); console.log(this.form.receptionTime);
}, },
verify() { verify() {

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

@ -1276,7 +1276,9 @@ export function disposeJobListData(jobList) {
if (isNotEmptyCheck(item.distance)) { if (isNotEmptyCheck(item.distance)) {
item["distanceKm"] = getDistanceName(item.distance); item["distanceKm"] = getDistanceName(item.distance);
} }
if (isNotEmptyCheck(item.jobDesp)) {
item["jobDesp"] = item['jobDesp'].replaceAll("*****", "");
}
//年龄 //年龄
// console.log(jobList); // console.log(jobList);
var ageStr = ""; var ageStr = "";
@ -1444,6 +1446,9 @@ export function disposeJobListData(jobList) {
if (isNotEmptyCheck(jobList.distance)) { if (isNotEmptyCheck(jobList.distance)) {
jobList["distanceKm"] = getDistanceName(jobList.distance); jobList["distanceKm"] = getDistanceName(jobList.distance);
} }
if (isNotEmptyCheck(jobList.jobDesp)) {
jobList["jobDesp"] = jobList['jobDesp'].replaceAll("*****", "");
}
//年龄 //年龄
var ageStr = ""; var ageStr = "";
if (isNotEmptyCheck(jobList.minAge) && isNotEmptyCheck(jobList.maxAge)) { if (isNotEmptyCheck(jobList.minAge) && isNotEmptyCheck(jobList.maxAge)) {

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

@ -4,12 +4,12 @@ import Cookies from "js-cookie";
// import Vue from "vue"; // import Vue from "vue";
// const baseURL = "http://1shoudan.com"; // 正式环境线上 // const baseURL = "http://1shoudan.com"; // 正式环境线上
// const baseURL = "http://idaotian.com"; // 正式环境线上 // const baseURL = "http://idaotian.com"; // 正式环境线上
const baseURL = "http://idagou.cn"; // 正式环境线上 // const baseURL = "http://idagou.cn"; // 正式环境线上
console.log(baseURL); // console.log(baseURL);
// const baseURL = "https://d.matripe.com.cn"; // 正式环境本地 // const baseURL = "https://d.matripe.com.cn"; // 正式环境本地
// const baseURL = "http://bl7.matripe.com.cn:8001"; // 测试环境本地 // const baseURL = "http://bl7.matripe.com.cn:8001"; // 测试环境本地
// 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$/); // 测试用
// console.log(data1.keys()); // console.log(data1.keys());
axios.defaults.withCredentials = true; //添加这行代码 axios.defaults.withCredentials = true; //添加这行代码

13
vue.config.js
Unescape Escape View File

@ -34,13 +34,24 @@ module.exports = {
// target: "http://localhost:8001/", // target: "http://localhost:8001/",
// target: "http://bl7.matripe.com.cn:8001", // target: "http://bl7.matripe.com.cn:8001",
// target: "http://1shoudan.renminshitang.com.cn", // target: "http://1shoudan.renminshitang.com.cn",
target: "https://d.matripe.com.cn", target: "https://idaotian.com",
ws: true, // proxy websockets ws: true, // proxy websockets
changeOrigin: true, // 确定是否跨域 changeOrigin: true, // 确定是否跨域
pathRewrite: { pathRewrite: {
"^/api_prod": "", "^/api_prod": "",
}, },
}, },
"/yishoudan": {
// target: "http://localhost:8001/",
// target: "http://bl7.matripe.com.cn:8001",
// target: "http://1shoudan.renminshitang.com.cn",
target: "https://idaotian.com",
ws: true, // proxy websockets
changeOrigin: true, // 确定是否跨域
pathRewrite: {
"^/yishoudan": "/yishoudan",
},
},
// '/api_prod': { // '/api_prod': {
// target: 'http://a.matripe.com.cn', // target: 'http://a.matripe.com.cn',
// ws: true, // proxy websockets // ws: true, // proxy websockets

Write Preview
Loading…
Cancel
Save