Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	packageRc/api/company/index.js
#	unpackage/dist/dev/mp-weixin/project.config.json
This commit is contained in:
wuzhimiao
2025-10-31 18:43:51 +08:00
137 changed files with 16985 additions and 2743 deletions

View File

@@ -2,17 +2,513 @@
import { post, get } from '../../utils/request.js'
// import { post, get } from '../../utils/request.js'
export function getPersonInfo(id) {
return get({
url: `personnel/personBaseInfo/${id}`,
// export function getPersonInfo(id) {
// return get({
// url: `personnel/personBaseInfo/${id}`,
// method: 'get'
// })
// }
import request from '@/utilsRc/request'
// 根据 userId 获取企业详情
export function companyDetails(userId) {
return request({
method: 'get',
url: `/company/unitBaseInfo/user/${userId}`,
})
}
// 企业-推荐人员信息
export function recommendedPerson(params) {
return request({
url: '/company/unitBaseInfo/recommend/person',
method: 'get',
params
})
}
// 人员邀请
export function invitePerson(params) {
return request({
url: '/company/unitBaseInfo/invite',
method: 'get',
params
})
}
// 获取企业招聘岗位列表
export function jobList(params) {
return request({
url: '/company/unitPostInfo/list',
method: 'get',
params
})
}
// 查找已投递、已推荐、已邀请的人员信息
export function listMatch(query) {
return request({
url: '/company/unitBaseInfo/relevance',
method: 'get',
params: query
})
}
// 添加企业基本信息
export function addJobBase(data) {
return request({
url: '/company/unitBaseInfo',
method: 'post',
data: data
})
}
// 查询部门下拉树结构
export function deptTreeSelect() {
return request({
url: '/system/center/user/deptTree',
method: 'get'
})
}
export function getPersonBase(id) {
return get({
url: `personnel/personBaseInfo/${id}`,
// 企业发布招聘岗位
export function addJob(data) {
return request({
url: '/company/unitPostInfo',
method: 'post',
data: data
})
}
// 获取招聘工种列表
export function jobTypeList(params) {
return request({
url: '/basicdata/workType/list',
method: 'get',
params
})
}
// 企业基本信息列表
export function jobBaseList(query) {
return request({
url: '/company/unitBaseInfo/list',
method: 'get',
params: query
})
}
// 获取企业招聘岗位信息详细信息
export function getJob(id) {
return request({
url: `/company/unitPostInfo/${id}`,
method: 'get'
})
}
}
// 修改企业招聘岗位信息
export function updateJob(data) {
return request({
url: '/company/unitPostInfo',
method: 'put',
data: data
})
}
// 修改企业基本信息
export function updateJobBase(data) {
return request({
url: '/company/unitBaseInfo',
method: 'put',
data: data
})
}
// 查询角色详细
export function getJobService(id) {
return request({
url: '/personnel/personBaseInfo/' + id,
method: 'get'
})
}
// 查询推荐人员、已推荐、已邀请 详情
export function getUnitBaseInfo(id) {
return request({
url: '/manage/personDemand/' + id,
method: 'get'
})
}
// 查询工种列表
export function listJobType(query) {
return request({
url: '/basicdata/workType/list',
method: 'get',
params: query
})
}
// 人员基本信息 - 列表
export function personInfoList(query) {
return request({
url: '/personnel/personBaseInfo/list',
method: 'get',
params: query
})
}
// 获取人员基本信息详情
export function getPersonInfo(id) {
return request({
url: `/personnel/personBaseInfo/${id}`,
method: 'get'
})
}
// 删除人员基本信息
export function delPersonInfo(ids) {
return request({
url: '/personnel/personBaseInfo/' + ids,
method: 'delete'
})
}
// 删除录入人员 公用 type = 1 失业中 2 就业困难 3 离校生 4 其他人员
export function delPersonUser(ids) {
return request({
url: `/personnel/personInputInfo/${ids}`,
method: 'delete',
})
}
// 新增人员基本信息
export function addPersonInfo(data) {
return request({
url: '/personnel/personBaseInfo',
method: 'post',
data: data
})
}
// 修改人员基本信息
export function updatePersonInfo(data) {
return request({
url: '/personnel/personBaseInfo',
method: 'put',
data
})
}
//社区人员审核
export function personInfoAudit(data) {
return request({
url: '/personnel/personBaseInfo/audit',
method: 'post',
data: data
})
}
//记录查看身份证
export function recordLookIdCard(params) {
return request({
url: '/personnel/personBaseInfo/recordLookIdCard',
method: 'get',
params
})
}
/* 失业人员 --------------------------------------------- start */
// 新增失业人员
export function addPersonUnemployed(data) {
return request({
url: '/person/unemployment',
method: 'post',
data
})
}
// 失业人员修改
export function updatePersonUnemployed(data) {
return request({
url: '/person/unemployment',
method: 'put',
data,
})
}
// 失业人员列表
export function unemployment(params) {
return request({
url: '/person/unemployment/list',
method: 'get',
params
})
}
// 失业人员详情
export function unemploymentDetails(id) {
return request({
url: `/person/unemployment/${id}`,
method: 'get',
})
}
// 失业人员删除
export function unemploymentDelete(id) {
return request({
url: `/person/unemployment/${id}`,
method: 'delete',
})
}
/* 失业人员 --------------------------------------------- end */
/* 就业困难人员 --------------------------------------------- start */
// 新增就业困难
export function addPersonDifficult(data) {
return request({
url: '/person/findingEmployment',
method: 'post',
data
})
}
// 修改就业困难
export function updatePersonDifficult(data) {
return request({
url: '/person/findingEmployment',
method: 'put',
data
})
}
// 就业困难列表
export function findingEmployment(params) {
return request({
url: '/person/findingEmployment/list',
method: 'get',
params
})
}
// 就业困难详情
export function findingEmploymentDetails(id) {
return request({
url: `/person/findingEmployment/${id}`,
method: 'get',
})
}
// 就业困难删除
export function findingEmploymentDelete(id) {
return request({
url: `/person/findingEmployment/${id}`,
method: 'delete',
})
}
/* 就业困难人员 --------------------------------------------- end */
/* 离校未就业高校生 --------------------------------------------- start */
// 新增离校未就业高校生
export function addLeaveSchool(data) {
return request({
url: '/person/leavingSchoolInfo',
method: 'post',
data
})
}
// 修改离校未就业高校生
export function updateLeaveSchool(data) {
return request({
url: '/person/leavingSchoolInfo',
method: 'put',
data,
})
}
// 高校未就业列表
export function leavingSchoolInfo(params) {
return request({
url: '/person/leavingSchoolInfo/list',
method: 'get',
params
})
}
// 高校未就业详情
export function leavingSchoolInfoDetails(id) {
return request({
url: `/person/leavingSchoolInfo/${id}`,
method: 'get',
})
}
// 高校未就业删除
export function leavingSchoolInfoDelete(id) {
return request({
url: `/person/leavingSchoolInfo/${id}`,
method: 'delete',
})
}
/* 离校未就业高校生 --------------------------------------------- end */
/* 其他人员 --------------------------------------------- start */
// 新增其他人员
export function addOther(data) {
return request({
url: '/person/other',
method: 'post',
data
})
}
// 其他人员修改
export function updateOther(data) {
return request({
url: '/person/other',
method: 'post',
data,
})
}
// 其他人员列表
export function other(params) {
return request({
url: '/person/other/list',
method: 'get',
params
})
}
// 其他人员详情
export function otherDetails(id) {
return request({
url: `/person/other/${id}`,
method: 'get',
})
}
// 其他人员删除
export function otherDelete(id) {
return request({
url: `/person/other/${id}`,
method: 'delete',
})
}
/* 其他人员 --------------------------------------------- end */
// 需求预警列表
export function personAlertList(params) {
return request({
url: '/manage/personDemand/warningList',
method: 'get',
params
})
}
export function personDealList(params) {
return request({
url: '/manage/personDemand/dealingList',
method: 'get',
params
})
}
// 服务追踪 服务类型/服务id
export function serviceTraceability({
demandType,
id
}) {
return request({
// url: `/system/personRequirementsRecords/serviceTraceability/${demandType}/${id}`,
url: `/timelime/timelime/fwzs/${id}`,
method: 'get',
})
}
// 需求办结
export function requirementCompletion(url, data) {
return request({
url,
method: 'post',
data
})
}
//岗位审核
export function jobAudit(data) {
return request({
url: '/company/unitPostInfo/audit',
method: 'post',
data: data
})
}
//社群 首页未完成数
// export function getPeopleCount() {
// return request({
// url: '/pc/index/getPeopleCount',
// method: 'get',
// })
// }
//社群 首页未完成数
export function getDemandUnfinished() {
return request({
url: '/pc/index/todo',
method: 'get',
})
}
// 删除企业招聘岗位信息
export function delJob(ids) {
return request({
url: '/company/unitPostInfo/' + ids,
method: 'delete'
})
}
// 所在社区列表
export function deptList(params) {
return request({
'url': `/system/center/user/deptList`,
'method': 'get',
params
})
}
// 所在社区列表
export function returnPerson(params) {
return request({
'url': `/personnel/personBaseInfo/returnPerson`,
'method': 'get',
params
})
}
// 根据人的身份证查询人的详细信息
export function getIdNumberInfo(params) {
return request({
'url': `/personnel/personBaseInfo/getIdNumberInfo`,
'method': 'get',
params
})
}

View File

@@ -0,0 +1,374 @@
<template>
<view>
<view class="popupAll">
<view class="tabList dispalyF" v-if="!allCheckShow">
<scroll-view scroll-x style="white-space: nowrap;width: calc(100% - 144rpx);margin-left: 32rpx">
<view class="rightView">
<view
@click="getTopActive(newCkeckData[0], index, item)"
:class="
index == newCkeckData[0].activeIndex
? 'popupItem-active tabItem rightView'
: 'popupItem tabItem rightView'
"
v-for="(item, index) in newCkeckData[0] && newCkeckData[0].data"
:key="index"
style="display: inline-block; margin-right: 15rpx;margin-bottom: 0"
>
{{ item.dictLabel }}
</view>
</view>
</scroll-view>
<view class="tabrightBtnOut" @click="allCheckShowChange">
<image
class="tabrightBtn"
src="https://rc.jinan.gov.cn/qcwjyH5/static/images/getMoreCheck.png"
mode=""
></image>
</view>
</view>
<view class="popupListAll" v-if="allCheckShow">
<view
class="popupList"
v-for="(item, index) in newCkeckData"
:key="index"
>
<view class="tabTitle">
{{ item.name }}
</view>
<view
class="dispalyF"
:style="[
{
position: 'sticky',
top: '-2rpx',
zIndex: 1,
flexWrap: 'wrap',
},
]"
>
<template>
<template v-for="(itm, idx) in item.data">
<view :key="idx" v-if="!itm.mode"
@click="getActive(itm, index, idx)"
:class="
idx == item.activeIndex
? 'popupItem-active'
: 'popupItem'
"
style="margin-right: 20rpx"
>
{{ itm.dictLabel }}
</view>
<!-- <view v-if="itm.mode == 'timerange'">
{{itm.start||'开始时间'}} - {{ item.end||'结束时间' }}
</view> -->
</template>
</template>
</view>
</view>
<!-- <view class="search_btn" @click="search">
查询
</view> -->
<view class="bottom-search">
<view class="search-left" @click="clearAll">
清空
</view>
<view class="search-right" @click="search">查询</view>
</view>
<view class="popupPic" @click="close">
<u-icon name="arrow-up"></u-icon>
</view>
</view>
<view class="gropo" v-if="allCheckShow"></view>
</view>
</view>
</template>
<script>
export default {
name: "popupList",
props: {
checkData: {
type: Array,
default: [],
},
},
data() {
return {
newCkeckData: this.checkData,
allCheckShow: false,
params: "",
fijItem: "",
outData: [],
nickName: ''
};
},
watch: {
checkData(newVal) {
this.newCkeckData = newVal;
},
allCheckShow(newVal) {
this.$parent.zctopShow = newVal;
},
},
mounted() {
if (uni.getStorageSync("userInfo")) {
let userInfo = JSON.parse(uni.getStorageSync("userInfo"));
this.nickName = userInfo.userName ? userInfo.userName : "";
}
},
methods: {
allCheckShowChange() {
this.allCheckShow = !this.allCheckShow;
},
search() {
this.allCheckShow = false;
let param = [];
this.$emit('popupSearch', this.newCkeckData)
},
clearAll(){
this.allCheckShow = false;
this.newCkeckData.forEach((item, index) => {
item.activeIndex=0
});
this.$emit('popupSearch', this.newCkeckData)
},
close() {
this.allCheckShow = false;
},
getActive(item, index, idx) {
if(item.checkLogin&&!this.nickName){
uni.showToast({
title: item.noLoginText,
icon: 'none'
})
return
}
this.newCkeckData[index].activeIndex = idx;
},
getTopActive(list, index, item) {
if(item.checkLogin&&!this.nickName){
uni.showToast({
title: item.noLoginText,
icon: 'none'
})
return
}
this.$set(this.newCkeckData[0], "activeIndex", index);
this.search();
},
},
};
</script>
<style lang="scss">
.dispalyF {
display: flex;
align-items: center;
}
.popupAll {
width: 100%;
position: relative;
z-index: 9;
}
.popupListAll {
background: #F2F4F7;
position: relative;
z-index: 99;
width: 100%;
padding-top: 8rpx;
}
.popupList {
background: #F2F4F7;
margin: 0 32rpx;
.tabTitle {
font-family: Source Han Sans;
font-size: 24rpx;
color: #282828;
margin: 16rpx 0;
}
.popupItem {
padding: 0 32rpx;
text-align: center;
background: #fff;
border-radius: 4rpx;
font-family: Source Han Sans;
font-size: 24rpx;
font-feature-settings: "kern" on;
color: #282828;
margin-right: 15rpx;
flex-shrink: 0;
margin-bottom: 20rpx;
line-height: 56rpx;
min-width: 144rpx;
border: 1rpx solid #CAD4E2;
box-sizing: border-box;
}
.popupItem-active {
padding: 0 32rpx;
text-align: center;
background: #1A62CE;
border-radius: 4rpx;
font-family: Source Han Sans;
font-size: 24rpx;
font-feature-settings: "kern" on;
color: #fff;
margin-right: 15rpx;
flex-shrink: 0;
margin-bottom: 20rpx;
line-height: 56rpx;
min-width: 144rpx;
border: 1rpx solid #1A62CE;
box-sizing: border-box;
}
}
.popupPic {
width: 100%;
padding-top: 16rpx;
padding-bottom: 28rpx;
display: flex;
align-items: center;
justify-content: center;
}
.gropo {
position: fixed;
left: 0rpx;
top: 0rpx;
width: 100vw;
height: 100vh;
opacity: 0.6;
background: rgba(0, 0, 0, 0.23);
}
.tabList {
padding: 32rpx 0;
position: relative;
overflow: hidden;
flex-wrap: nowrap;
width: 100%;
z-index: 9;
.tabItem {
line-height: 56rpx;
padding: 0 32rpx;
background: #fff;
border-radius: 4rpx;
font-family: Source Han Sans;
font-size: 24rpx;
font-feature-settings: "kern" on;
color: #282828;
margin-right: 15rpx;
flex-shrink: 0;
min-width: 144rpx;
box-sizing: border-box;
text-align: center;
}
.tabrightBtnOut {
position: absolute;
right: 0;
width: 87rpx;
height: 56rpx;
// background: linear-gradient(270deg, #2A51DF 0%, rgba(66, 110, 230, 0) 100%);
}
.tabrightBtn {
position: absolute;
right: 36rpx;
top: 50%;
transform: translateY(-50%);
width: 32rpx;
height: 32rpx;
z-index: 99;
}
.popupItem {
padding: 0 32rpx;
text-align: center;
background: #fff;
border-radius: 4rpx;
font-family: Source Han Sans;
font-size: 24rpx;
font-feature-settings: "kern" on;
color: #282828;
margin-right: 15rpx;
flex-shrink: 0;
margin-bottom: 20rpx;
line-height: 56rpx;
min-width: 144rpx;
border: 1rpx solid #CAD4E2;
box-sizing: border-box;
}
.popupItem-active {
padding: 0 32rpx;
text-align: center;
background: #1A62CE;
border-radius: 4rpx;
font-family: Source Han Sans;
font-size: 24rpx;
font-feature-settings: "kern" on;
color: #fff;
margin-right: 15rpx;
flex-shrink: 0;
margin-bottom: 20rpx;
line-height: 56rpx;
min-width: 144rpx;
border: 1rpx solid #1A62CE;
box-sizing: border-box;
}
}
.dispalyF {
display: flex;
align-items: center;
}
.rightView :last-child {
margin-right: 100rpx !important;
}
.bottom-search {
margin-top:56rpx;
display: flex;
justify-content: space-between;
align-items: center;
margin: 16rpx 32rpx 0;
.search-left {
font-family: Source Han Sans;
font-size: 28rpx;
font-weight: bold;
line-height: 70rpx;
background: #fff;
color: #3D3D3D;
border-radius: 4rpx;
height: 62rpx;
flex-grow: 1;
text-align: center;
}
.search-right {
margin-right: 30rpx;
width: 472rpx;
line-height: 64rpx;
border-radius: 4rpx;
background: linear-gradient(270deg, #53A0EA 10%, #1A62CE 100%);
font-family: Source Han Sans;
font-size: 28rpx;
font-weight: bold;
margin-left: 24rpx;
color: #ffffff;
display: flex;
align-items: center;
justify-content: center;
}
}
</style>

View File

@@ -0,0 +1,130 @@
<template>
<u-popup :show="showExitPopup" @close="closeExitPopup" closeOnClickOverlay>
<view class="exit_popup df_flex df__direction_column ">
<view class="popup-header">
<u-icon name="warning" size="60rpx" color="#E33C3C"></u-icon>
<view class="popup-title">退出登录</view>
</view>
<view class="df_flex df_justify_center name">{{nick || '--'}}</view>
<view class="popup-content">确定要退出当前账号吗</view>
<view class="df_flex">
<u-button class="custom_btn" text="退出登录" @tap="logOut"></u-button>
<u-button class="cancel_btn" text="取 消" @tap="closeExitPopup"></u-button>
</view>
</view>
</u-popup>
</template>
<script>
// import {
// mapGetters
// } from 'vuex'
export default {
name: "exitPopup",
// computed: {
// ...mapGetters(['showExitPopup', 'nick'])
// },
data() {
return {
showExitPopup: false,
nick: ''
}
},
onload() {
this.nick = this.$store.state.user.nick
this.showExitPopup = this.$store.state.user.showExitPopup
},
methods: {
closeExitPopup() {
this.$store.commit('SET_SHOWEXITPOPUP', false)
},
// 退出
logOut() {
this.$store.dispatch('LogOut').then((res) => {
this.closeExitPopup()
uni.navigateTo({
url: '/pages/login/login-one'
})
})
}
}
}
</script>
<style lang="scss" scoped>
.exit_popup {
padding: 48rpx 60rpx 60rpx 60rpx;
background: #ffffff;
border-radius: 24rpx;
box-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.12);
&>view {
width: 100%;
}
.popup-header {
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 32rpx;
.popup-title {
margin-top: 16rpx;
font-size: 36rpx;
font-weight: bold;
color: #333333;
}
}
.popup-content {
text-align: center;
font-size: 28rpx;
color: #666666;
margin-bottom: 48rpx;
line-height: 1.5;
display: flex;
justify-content: center;
align-items: center;
}
.name {
margin: 16rpx auto 32rpx auto;
font-size: 32rpx;
font-weight: 500;
color: #333333;
text-align: center;
display: flex;
justify-content: center;
align-items: center;
}
.custom_btn {
margin: 16rpx;
color: #ffffff;
border: none;
border-radius: 12rpx;
background: linear-gradient(135deg, #E33C3C 0%, #ff4757 100%);
box-shadow: 0 4rpx 12rpx rgba(227, 60, 60, 0.3);
transition: all 0.3s ease;
&:active {
transform: scale(0.95);
box-shadow: 0 2rpx 8rpx rgba(227, 60, 60, 0.4);
}
}
.cancel_btn {
margin: 16rpx;
color: #666666;
border: 2rpx solid #e5e5e5;
border-radius: 12rpx;
background-color: #ffffff;
transition: all 0.3s ease;
&:active {
transform: scale(0.95);
background-color: #f8f9fa;
}
}
}
</style>

View File

@@ -1,9 +1,10 @@
<!--
* @Date: 2025-10-16 15:15:47
* @LastEditors: shirlwang
* @LastEditTime: 2025-10-22 14:17:46
* @LastEditTime: 2025-10-31 14:56:32
-->
<template>
<view>
<!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
<scroll-view :scroll-y="true" class="container" style="background-image: url('../../../packageRc/static/pageBg.png');">
<view style="padding: 40rpx 28rpx;">
@@ -29,7 +30,7 @@
<image src="../../../packageRc/static/trace.png"/>
毕业生追踪
</view>
<view style="display: flex;justify-content: space-between;">
<view style="display: flex;justify-content: space-between;" @click="goPersonalList">
<view>点击查看</view>
<uni-icons color="#639AEB" type="arrow-right" size="16"></uni-icons>
</view>
@@ -108,6 +109,7 @@
</view>
</view>
</uni-popup>
</view>
</template>
<script setup>
@@ -125,6 +127,12 @@ let jobList1count = ref()
let returnReasonPopup = ref(null)
let returnReason = ref('')
let currentItemIndex = ref(-1)
function goPersonalList() {
console.log('goPersonalList')
uni.navigateTo({
url: '/packageRc/pages/personalList/personalList'
});
}
function back() {
uni.navigateBack({
delta: 1

File diff suppressed because it is too large Load Diff