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/mz666/bocai_supplyChain_pc

Browse Source
cyl/dev
zsk 1 year ago
parent 3ac6b4fe72 eb740db87c
commit da0d688f1c
9 changed files with 111 additions and 74 deletions
Show Stats Download Patch File Download Diff File

4
src/App.vue
Unescape Escape View File

@ -68,5 +68,7 @@ body {
overflow: revert !important;
background-color: #f0f0f0 !important;
}
.ant-select-dropdown-menu{
max-height: 338px !important;
}
</style>

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

@ -21,7 +21,7 @@
<div class="maincontent w g_flex_row_between">
<div class="m-money-obj g_mb_20 g_p_20 g_flex_row_between" style="background-color: #fff; border-radius: 6px; width: 800px; margin: 0 auto 20px" v-if="false">
<div class="g_flex_row_start">
<div style="font-size: 16px; font-weight: 600; margin-right: 4px">代理佣金</div>
<div style="font-size: 14px; font-weight: 600; margin-right: 4px">代理佣金</div>
<div class="g_flex_column_center" @click="isSee = !isSee" style="cursor: pointer">
<i class="iconfont icon-zhengyan11" style="font-size: 22px; color: #ff4400; line-height: 0.1" v-if="isSee"></i>
<i class="iconfont icon-biyan11" style="font-size: 22px; color: #ff4400; line-height: 0.1; margin-top: -4px" v-if="!isSee"></i>
@ -86,7 +86,7 @@
<div class="g_flex_row_between g_mt_12">
<div style="display: flex; align-items: center; height: 26px; margin-top: 8px">
<div class="jobpricehour" v-html="getSalaryClassifyValue(jobDetail.salaryClassify, jobDetail.salaryClassifyValue)"></div>
<span style="font-size: 16px">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
<span style="font-size: 14px">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
<div class="jobpricemonth">
<span>{{ jobDetail.minMonthlyPay / 100 }}</span
>-<span>{{ jobDetail.maxMonthlyPay / 100 }}</span
@ -393,7 +393,7 @@
</div>
</div>
<div class="maincontentright">
<div class="card-top g_flex_row_between" style="padding-left: 16px; padding-right: 16px; font-size: 16px; background-color: #1890ff; height: 40px; border-top-left-radius: 6px; border-top-right-radius: 6px">
<div class="card-top g_flex_row_between" style="padding-left: 16px; padding-right: 16px; font-size: 14px; background-color: #1890ff; height: 40px; border-top-left-radius: 6px; border-top-right-radius: 6px">
<div class="g_flex_column_center">
<i style="color: #fff; font-weight: 600">代理佣金</i>
</div>
@ -1326,7 +1326,7 @@ export default {
}
.jobinfo {
margin-top: 12px;
font-size: 16px;
font-size: 14px;
font-weight: 400;
text-align: left;
color: #999;
@ -1362,7 +1362,7 @@ export default {
}
.jobpricemonth {
// margin-top: 16px;
font-size: 16px;
font-size: 14px;
font-weight: 400;
text-align: left;
color: #666;
@ -1371,7 +1371,7 @@ export default {
}
.jobpricehour {
// margin-top: 16px;
font-size: 16px;
font-size: 14px;
font-weight: normal;
text-align: left;
color: #ff4400;
@ -1435,13 +1435,13 @@ export default {
}
}
.sub-bottombox {
font-size: 16px;
font-size: 14px;
.bottombox1 {
width: 116px;
height: 32px;
line-height: 30px;
font-size: 16px;
font-size: 14px;
// border: 1px solid rgba(77, 87, 94, 0.3);
border-radius: 4px;
border: 1px solid #1890ff;
@ -1504,7 +1504,7 @@ export default {
line-height: 30px;
div {
// font-weight: normal;
font-size: 16px;
font-size: 14px;
span:first-of-type {
font-size: 20px;
@ -1526,7 +1526,7 @@ export default {
color: #ff4400;
font-size: 18px;
span:last-child {
font-size: 16px;
font-size: 14px;
}
}
}
@ -1567,6 +1567,7 @@ export default {
span {
margin-bottom: -1px;
height: 30px;
line-height: 27px;
padding: 1px 12px 0 12px;
margin-right: 6px;
background-color: #fafafa;
@ -1574,7 +1575,7 @@ export default {
border-bottom: none;
cursor: pointer;
border-radius: 4px 4px 0 0;
font-size: 16px;
font-size: 14px;
color: #333;
}
.active {
@ -1593,7 +1594,7 @@ export default {
div:last-child {
width: 640px;
padding: 12px 16px;
font-size: 16px;
font-size: 14px;
border: 1px solid #ededed;
color: #333;
}
@ -1676,7 +1677,7 @@ export default {
width: 600px;
> div {
> div:first-child {
font-size: 16px;
font-size: 14px;
color: #333;
font-weight: 600;
}
@ -1687,7 +1688,7 @@ export default {
display: flex;
width: 640px;
flex-direction: column;
font-size: 16px;
font-size: 14px;
border-radius: 6px;
border: 1px solid #ededed;
> li {
@ -1817,7 +1818,7 @@ export default {
}
}
p:last-of-type {
font-size: 16px;
font-size: 14px;
text-align: left;
color: #788085;
line-height: 22px;
@ -1871,7 +1872,7 @@ export default {
font-weight: normal;
background-color: #fff;
padding: 8px 0;
font-size: 16px;
font-size: 14px;
color: #666;
letter-spacing: 1px;
// padding: 8px 0px;
@ -1882,7 +1883,7 @@ export default {
white-space: break-spaces;
text-align: left;
// padding-left: 8px;
font-size: 16px;
font-size: 14px;
color: #333;
}
.boubleLevel > .ant-descriptions-view > table > tbody > .ant-descriptions-row:last-child > .ant-descriptions-item-content {
@ -1917,7 +1918,7 @@ export default {
font-size: 40px;
}
> p {
font-size: 16px;
font-size: 14px;
text-align: center;
color: #1890ff;
}

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

@ -822,7 +822,7 @@
<svg class="svg_icon ml4" style="font-size: 46px; margin-top: -2px" aria-hidden="true">
<use xlink:href="#icon-bocai2" />
</svg>
｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜
｜Copyright © 2015-2025 Bocai. All Rights Reserved.｜
</span>
<a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号-25A</a>
</div>
@ -884,6 +884,7 @@
<recordModal :show.sync="recordShow" :jobDetail="currentInfo"></recordModal>
<div class="top-obj g_flex_c"
ref="backToTop"
style="width: 40px;height: 40px;background-color: #fff;border-radius: 50%;position: fixed;bottom: 100px;right: calc(50vw - 470px);cursor: pointer;"
@click="totop"
v-if="!isspinning"
@ -1262,30 +1263,39 @@ export default {
methods: {
// ... 其他方法
handleScroll() {
const scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
const windowHeight = document.documentElement.clientHeight;
const scrollHeight = document.documentElement.scrollHeight;
if (scrollTop + windowHeight >= scrollHeight - 100 && !this.isFetching && !this.isStop) { // 100 是一个阈值，可以根据需要调整
this.isFetching = true;
setTimeout(() => {
this.speed = 1;
this.loadMoreData();
}, 300);
}
},
loadMoreData() {
this.formvalue.pageNum += 1; // 增加页码
if (this.signType != 0) {
this.getJobList({isScroll:1}).then(() => {
this.isFetching = false;
});
} else {
this.getJobList({isScroll:1}).then(() => {
this.isFetching = false;
});
}
},
const scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
const windowHeight = document.documentElement.clientHeight;
const scrollHeight = document.documentElement.scrollHeight;
const threshold = windowHeight * 0.4;
if (scrollTop + windowHeight >= scrollHeight - 100 && !this.isFetching && !this.isStop) { // 100 是一个阈值，可以根据需要调整
this.isFetching = true;
setTimeout(() => {
this.speed = 1;
this.loadMoreData();
}, 300);
}
if (scrollTop >= threshold) {
this.$refs.backToTop.style.opacity = 1;
this.$refs.backToTop.style.pointerEvents = 'auto';
} else {
this.$refs.backToTop.style.opacity = 0;
this.$refs.backToTop.style.pointerEvents = 'none';
}
},
loadMoreData() {
this.formvalue.pageNum += 1; // 增加页码
if (this.signType != 0) {
this.getJobList({isScroll:1}).then(() => {
this.isFetching = false;
});
} else {
this.getJobList({isScroll:1}).then(() => {
this.isFetching = false;
});
}
},
removePageInfo() {
sessionStorage.removeItem("PAGE_TYPE");
},
@ -3760,4 +3770,25 @@ p {
.stoggle{
transform: rotate(90deg);
}
.top-obj {
width: 40px;
height: 40px;
background-color: #fff;
border-radius: 50%;
position: fixed;
bottom: 100px;
right: calc(50vw - 470px);
cursor: pointer;
transition: opacity 0.3s ease;
opacity: 0;
pointer-events: none;
}
.top-obj:hover {
background-color: #1890ffdd;
}
.top-obj:active {
background-color: #1890ffdd;
}
</style>

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

@ -24,8 +24,8 @@
</a-breadcrumb-item>
</a-breadcrumb>
<div class="content">
<a-form-model ref="ruleForm" :model="form" :colon="true" :rules="rules">
<a-form-model-item ref="proxy" label="报名人" prop :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px; margin-bottom: 18px">
<a-form-model ref="ruleForm" :model="form" :colon="true" :rules="rules" size="small">
<a-form-model-item ref="proxy" label="报名人" prop :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px; margin-bottom: 0px">
<!-- <a-input
:value="
proxyinfo.userName !== '' &&
@ -70,7 +70,7 @@
<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: 0px">
<!-- <a-input :value="firminfo.aliasName" :disabled="true" /> -->
<div class="pzbox" style="width: 100%">
<span>{{ storeName || "-" }}</span>
@ -100,7 +100,7 @@
<i class="iconfont icon-rili" slot="suffix" @click="getDateinfo"></i>
</a-input>
</a-form-model-item>
<a-form-model-item style="margin-top: 12px" class="time-input" ref="receptionTime" label="接待时间" prop="receptionTime" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
<a-form-model-item style="margin-top: 0px" class="time-input" ref="receptionTime" label="接待时间" prop="receptionTime" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
<timepicker :isShow.sync="isShow1" :datetime.sync="form.receptionTime" :prev="true"></timepicker>
<a-input class="pt1" v-model="form.receptionTime" placeholder="请选择接待时间" @input="verify1" allowClear @click="getDateinfo1">
<i class="iconfont icon-rili" slot="suffix" @click="getDateinfo1"></i>
@ -172,7 +172,7 @@
</a-form-model-item>
</a-col>
</a-row>
<a-form-model-item ref="tel" label="电话" prop="tel" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="margin-bottom: 18px">
<a-form-model-item ref="tel" label="电话" prop="tel" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="margin-bottom: 14px">
<a-input v-model="form.tel" placeholder="请输入电话号" :max-length="11" />
</a-form-model-item>
<a-form-model-item ref="peoplecard" label="家庭住址" prop="peoplecard" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
@ -183,7 +183,7 @@
<a-select-option :value="apply.id">{{ apply.id }}</a-select-option>
</a-select>
</a-form-model-item>-->
<a-form-model-item ref="policy" label="财务结算" prop="policy" class="policyContainer" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
<a-form-model-item ref="policy" label="财务结算" prop="policy" style="margin-bottom: 14px;" class="policyContainer" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
<div class="policy" style="min-height: 30px !important">{{ form.policy }}</div>
<!-- <div style class="mb20 mt12">
<a-radio-group v-model="currentPolicy" class="fss policyRadios" @change="policyChange($event)">
@ -1336,7 +1336,7 @@ export default {
.ant-col {
.ant-form-item {
margin-top: 0;
margin-bottom: 16px !important;
margin-bottom: 6px !important;
}
}
@ -1453,6 +1453,7 @@ export default {
/deep/ .ant-form-item {
// margin-bottom: 0;
margin-top: -8px;
margin-bottom: 10px;
.ant-col-5 {
width: 20%;
@ -1860,7 +1861,7 @@ export default {
// }
// }
/deep/ .time-input {
margin-bottom: 16px;
margin-bottom: 6px;
.ant-input {
font-size: 20px !important;

2
src/components/main/index.vue
Unescape Escape View File

@ -119,7 +119,7 @@
Powered by
<svg class="svg_icon ml4" style="font-size:46px;margin-top:-2px" aria-hidden="true">
<use xlink:href="#icon-bocai2" />
</svg>｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜
</svg>｜Copyright © 2015-2025 Bocai. All Rights Reserved.｜
</span>
<a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号-25A</a>
</div>

34
src/components/userinfo/usercenter/components/mybill.vue
Unescape Escape View File

@ -5,32 +5,32 @@
<div class="contenttitle">
<ul @click="resetpag">
<li @click="pagination.status = -1" :class="{ townsmanactive: pagination.status === -1 }">
全部
<span>{{ billNumber.num }}</span>
全部{{ billNumber.num }}
<!-- <span>{{ billNumber.num }}</span> -->
</li>
<li @click="pagination.status = 10" :class="{ townsmanactive: pagination.status === 10 }">
待审核
<span>{{ billNumber.num10 }}</span>
待审核{{ billNumber.num10 }}
<!-- <span>{{ billNumber.num10 }}</span> -->
</li>
<li @click="pagination.status = 20" :class="{ townsmanactive: pagination.status === 20 }">
待接待
<span>{{ billNumber.num20 }}</span>
待接待{{ billNumber.num20 }}
<!-- <span>{{ billNumber.num20 }}</span> -->
</li>
<li @click="pagination.status = 25" :class="{ townsmanactive: pagination.status === 25 }">
待面试
<span>{{ billNumber.num25 }}</span>
待面试{{ billNumber.num25 }}
<!-- <span>{{ billNumber.num25 }}</span> -->
</li>
<li @click="pagination.status = 30" :class="{ townsmanactive: pagination.status === 30 }">
待入职
<span>{{ billNumber.num30 }}</span>
待入职{{ billNumber.num30 }}
<!-- <span>{{ billNumber.num30 }}</span> -->
</li>
<li @click="pagination.status = 40" :class="{ townsmanactive: pagination.status === 40 }">
在职中
<span>{{ billNumber.num40 }}</span>
在职中{{ billNumber.num40 }}
<!-- <span>{{ billNumber.num40 }}</span> -->
</li>
<li @click="pagination.status = 999" :class="{ townsmanactive: pagination.status === 999 }">
已完成
<span>{{ billNumber.num999 }}</span>
已完成{{ billNumber.num999 }}
<!-- <span>{{ billNumber.num999 }}</span> -->
</li>
<!-- <li
@click="pagination.status = 50"
@ -1115,7 +1115,7 @@ export default {
}
}
.ant-input {
width: 348px;
width: 380px;
// width: 300px;
position: relative;
height: 32px;
@ -1179,7 +1179,7 @@ export default {
padding-left: 0;
justify-content: center;
// margin-left: 20px;
width: 180px;
width: 249px;
border-color: #ccc;
// border-radius: 4px;
// border: none;
@ -1201,7 +1201,7 @@ export default {
.pagechange {
button {
width: 66px;
height: 24px;
height: 32px;
border: 1px solid rgba(77, 87, 94, 0.3);
border-radius: 4px;
font-size: 14px;

6
src/views/main.vue
Unescape Escape View File

@ -399,7 +399,7 @@
<!-- footer部分 -->
<footer v-if="isfootershow" :class="loginPage ? 'footer_abs' : ''"
:style="{
'background-color': pagrTitle == 'detail' || pagrTitle == 'mybill' || pagrTitle == 'boundtel' || pagrTitle == 'recordbill' ? '#f0f0f0' : '#ffffff',
'background-color': pagrTitle == 'detail' || pagrTitle == 'mybill' || pagrTitle == 'boundtel' || pagrTitle == 'recordbill' ? '#f0f0f0' : (pagrTitle == 'login' ? 'transparent' : '#ffffff'),
'padding-top': '20px',
'margin-top': 0
}"
@ -422,7 +422,7 @@
<svg class="svg_icon ml4" style="font-size: 46px; margin-top: -2px" aria-hidden="true">
<use xlink:href="#icon-bocai2" />
</svg>
｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜
｜Copyright © 2015-2025 Bocai. All Rights Reserved.｜
</span>
<a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号-25A</a>
</div>
@ -639,6 +639,8 @@ export default {
that.pagrTitle = 'boundtel'
}else if(that.$route.name == 'recordbill'){
that.pagrTitle = 'recordbill'
}else if(that.$route.name == 'login'){
that.pagrTitle = 'login'
}else{
that.pagrTitle = ''
}

2
src/views/merchantBack.vue
Unescape Escape View File

@ -98,7 +98,7 @@
Powered by
<svg class="svg_icon ml4" style="font-size:46px;margin-top:-2px" aria-hidden="true">
<use xlink:href="#icon-bocai2" />
</svg>｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜
</svg>｜Copyright © 2015-2025 Bocai. All Rights Reserved.｜
</span>
<a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号</a>
</a-layout-footer>

2
src/views/userinfo.vue
Unescape Escape View File

@ -149,7 +149,7 @@
Powered by
<svg class="svg_icon ml4" style="font-size:46px;margin-top:-2px" aria-hidden="true">
<use xlink:href="#icon-bocai2" />
</svg>｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜
</svg>｜Copyright © 2015-2025 Bocai. All Rights Reserved.｜
</span>
<a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号</a>
</div>

Write Preview
Loading…
Cancel
Save