解决冲突

This commit is contained in:
zxy
2024-03-10 18:45:56 +08:00
8 changed files with 407 additions and 164 deletions

View File

@@ -95,3 +95,12 @@ export const download = (query) => {
return `jobslink-api/missions/mission/export-mission?companyName=${companyName}&missionNo=${missionNo}&missionTitle=${missionTitle}&type=${type}&stime=${stime}&etime=${etime}&status=${status}&Jobslink-Auth=${getToken()}`
*/
};
export const Auditing = (data) => {
return request({
url: "/api/jobslink-api/user/userrecruit/approval",
method: "post",
data,
});
};

View File

@@ -358,3 +358,10 @@ export const recruitStatus = [
{ value: 1, label: "未审核" },
{ value: 0, label: "通过" },
];
export const dataSourcesEnum = [
// { value: -1, label: "总集数据中心" },
{ value: 1, label: "总集数据中心" },
{ value: 2, label: "我的招工" },
{ value: 3, label: "社区发布" },
{ value: 4, label: "爬取" },
]

View File

@@ -61,6 +61,26 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="审核状态:">
<el-select v-model="query.reviewState">
<el-option
v-for="(item, index) in recruitStatus"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="数据来源:">
<el-select v-model="query.dataSources">
<el-option
v-for="(item, index) in dataSourcesEnum"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<div class="searchBtn">
<el-button
type="primary"
@@ -141,11 +161,12 @@ import {
complet,
getDetail,
download,
Auditing
} from "@/api/manage/mission";
import { mapGetters } from "vuex";
import missionView from "@/views/util/mission-view";
import zpView from "./zpView";
import { missionState, wageUnitCategoryState } from "@/common/dic";
import { missionState, wageUnitCategoryState, recruitStatus, dataSourcesEnum } from "@/common/dic";
import { calcDate } from "@/util/date";
import { Message } from "element-ui";
import lodash from "lodash";
@@ -163,6 +184,8 @@ export default {
name: "manage_mission",
data() {
return {
recruitStatus,
dataSourcesEnum,
view: {},
form: {},
selectionList: [],
@@ -310,11 +333,21 @@ export default {
display: false,
span: 24,
width: 80,
}, {
label: "数据来源",
prop: "dataSources",
dicData: dataSourcesEnum,
display: false,
span: 24,
width: 80,
},{
label: "审核状态",
prop: "reviewState",
dicData: recruitStatus,
display: false,
span: 24,
width: 80,
},
// {
// label:"备注",
// prop:"remarks"
// }
],
},
data: [],
@@ -436,6 +469,7 @@ export default {
this.$refs.delay.open(row.missionNo);
},
handleCheck() {
let self = this
if (this.ids.length < 1) {
message({
type: "warning",
@@ -446,7 +480,7 @@ export default {
let idList = [];
for (let i = 0; i < this.ids.length; i++) {
this.data.forEach((ele) => {
if (ele.status == 1 && ele.id == this.ids[i]) {
if (ele.id == this.ids[i]) {
idList.push(ele.id);
}
});
@@ -458,34 +492,57 @@ export default {
let h = this.$createElement;
this.$prompt(
h("p", { style: "color: #F56C6C" }, "一旦驳回无法进行后续操作"),
"您确定要驳回此任务吗?",
"请核对招聘信息后再进行审核通过",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
distinguishCancelAndClose: true,
confirmButtonText: "通 过",
cancelButtonText: "驳 回",
type: "warning",
center: true,
inputType: "textarea",
inputPlaceholder: "备注驳回原因",
beforeClose: function(action, instance, done) {
if(action === 'cancel') {
if (!instance.inputValue) {
return this.$message({
type: "info",
message: "请输入驳回原因!",
});
}
self.handelFetchAuditing(idList, 9, instance.inputValue, "成功驳回, 操作成功!").then(() => done())
} else if(action === 'confirm') {
self.handelFetchAuditing(idList, 0, instance.inputValue).then(() => done())
} else {
done()
}
}
}
)
.then(({ value }) => {
this.loading = true;
review(idList.join(","), value)
.then(() => {
this.loading = false;
this.onLoad(this.page, this.params);
this.$message({
type: "success",
message: "操作成功!",
});
})
.catch(() => {
this.loading = false;
});
})
.catch(() => {});
}
},
handelFetchAuditing(idList, reviewState, msg, message) {
return new Promise((resolve, reject) => {
let arr = idList.map((item) => ({
id: item,
reviewState: reviewState,
reviewMsg: msg || '',
jobType: 0,
}))
this.loading = true;
Auditing(arr).then(() => {
this.loading = false;
this.onLoad(this.page, this.params);
this.$message({
type: message ? "info" : "success",
message: message || "审核通过,操作成功!",
});
resolve()
}).catch(() => {
this.loading = false;
reject()
});
})
},
downRecords() {
if (this.query.time) {
this.query.stime = this.query.time[0];

View File

@@ -1,78 +1,98 @@
<template>
<basic-container>
<!--搜索栏-->
<!-- <el-form-->
<!-- size="small"-->
<!-- label-position="right"-->
<!-- style="padding-left: 10px; padding-right: 10px"-->
<!-- :inline="true"-->
<!-- >-->
<!-- <el-row :span="24">-->
<!-- <el-form-item label="社区街道名称:">-->
<!-- <el-input-->
<!-- v-model="query.companyName"-->
<!-- placeholder="社区街道名称"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="岗位编码:">-->
<!-- <el-input-->
<!-- v-model="query.missionNo"-->
<!-- placeholder="岗位编码"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="岗位标题:">-->
<!-- <el-input-->
<!-- v-model="query.jobName"-->
<!-- placeholder="岗位标题"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; <el-form-item>&ndash;&gt;-->
<!--&lt;!&ndash; <el-select v-model="query.type" placeholder="请选择搜索时间类型">&ndash;&gt;-->
<!--&lt;!&ndash; <el-option label="岗位开始日期" :value="0"></el-option>&ndash;&gt;-->
<!--&lt;!&ndash; <el-option label="岗位结束日期" :value="2"></el-option>&ndash;&gt;-->
<!--&lt;!&ndash; &lt;!&ndash; <el-option label="报名截止日期" :value="3"></el-option> &ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash; </el-select>&ndash;&gt;-->
<!--&lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- <el-form-item label="日期范围:">-->
<!-- <el-date-picker-->
<!-- v-model="query.time"-->
<!-- type="daterange"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; <tool-tip></tool-tip>&ndash;&gt;-->
<!-- <br>-->
<!-- <el-form-item label="岗位状态:">-->
<!-- <el-select v-model="query.reviewState">-->
<!-- <el-option-->
<!-- v-for="(item, index) in recruitStatus"-->
<!-- :key="index"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- ></el-option>-->
<el-form
size="small"
label-position="right"
style="padding-left: 10px; padding-right: 10px"
:inline="true"
>
<el-row :span="24">
<el-form-item label="社区街道名称:">
<el-input
v-model="query.companyName"
placeholder="社区街道名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="岗位编码:">
<el-input
v-model="query.missionNo"
placeholder="岗位编码"
clearable
></el-input>
</el-form-item>
<el-form-item label="岗位标题:">
<el-input
v-model="query.jobName"
placeholder="岗位标题"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item>-->
<!-- <el-select v-model="query.type" placeholder="请选择搜索时间类型">-->
<!-- <el-option label="岗位开始日期" :value="0"></el-option>-->
<!-- <el-option label="岗位结束日期" :value="2"></el-option>-->
<!-- &lt;!&ndash; <el-option label="报名截止日期" :value="3"></el-option> &ndash;&gt;-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <div class="searchBtn">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- size="small"-->
<!-- icon="el-icon-search"-->
<!-- @click="searchChange1"-->
<!-- > </el-button-->
<!-- >-->
<!-- <el-button size="small" icon="el-icon-delete" @click="searchReset1"-->
<!-- >清 空</el-button-->
<!-- >-->
<!-- </div>-->
<!-- </el-row>-->
<!-- </el-form>-->
<el-form-item label="日期范围:">
<el-date-picker
v-model="query.time"
type="daterange"
range-separator=""
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<!-- <tool-tip></tool-tip>-->
<br>
<el-form-item label="岗位状态:">
<el-select v-model="query.jobStatus">
<el-option
v-for="(item, index) in option.mStatusList"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="审核状态:">
<el-select v-model="query.reviewState">
<el-option
v-for="(item, index) in recruitStatus"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="数据来源:">
<el-select v-model="query.dataSources">
<el-option
v-for="(item, index) in dataSourcesEnum"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<div class="searchBtn">
<el-button
type="primary"
size="small"
icon="el-icon-search"
@click="searchChange1"
> </el-button
>
<el-button size="small" icon="el-icon-delete" @click="searchReset1"
> </el-button
>
</div>
</el-row>
</el-form>
<!--搜索-->
<avue-crud
:option="option"
@@ -94,6 +114,15 @@
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template slot="menuLeft">
<el-button
v-if="vaildData(permission.manage_mission_check, false)"
size="small"
@click.stop="handleCheck"
type="primary"
>审核</el-button
>
</template>
<template slot-scope="{ row }" slot="menu">
<el-button
type="text"
@@ -106,7 +135,7 @@
v-if="vaildData(permission.manage_mission_check, false) && row.reviewState === 1"
type="text"
size="small"
@click.stop="handleCheck(row)"
@click.stop="handleCheck"
>审核</el-button
>
</template>
@@ -114,30 +143,10 @@
<el-drawer title="详情" :visible.sync="viewDrawer" size="60%">
<post-view :model="view"></post-view>
</el-drawer>
<el-dialog
title="审核"
:visible.sync="centerDialogVisible"
width="30%"
append-to-body
center>
<span>请核对招聘信息后再进行审核通过</span>
<span slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false"> </el-button>
<el-button type="warning" @click="handelAuditing(0)">不通过</el-button>
<el-button type="primary" @click="handelAuditing(9)"> </el-button>
</span>
</el-dialog>
</basic-container>
</template>
<script>
import {
// getList,
// review,
complet,
// getDetail,
download,
} from "@/api/workstation/post";
import {
getList,
getDetail,
@@ -146,10 +155,11 @@ import {
import { mapGetters } from "vuex";
import postView from "@/views/util/post-view.vue";
import zpView from "./zpView.vue";
import { recruitStatus, wageUnitCategoryState} from "@/common/dic";
import {dataSourcesEnum, recruitStatus, wageUnitCategoryState} from "@/common/dic";
import { calcDate } from "@/util/date";
import { Message } from "element-ui";
import lodash from "lodash";
import {Auditing} from "@/api/manage/mission";
const message = lodash.throttle(
function (options) {
@@ -165,6 +175,7 @@ export default {
data() {
return {
recruitStatus,
dataSourcesEnum,
view: {},
form: {},
selectionList: [],
@@ -196,7 +207,7 @@ export default {
searchMenuSpan: 5,
menuWidth: 270,
border: true,
selection: false,
selection: true,
viewBtn: false,
addBtn: false,
editBtn: false,
@@ -302,8 +313,6 @@ export default {
],
},
data: [],
centerDialogVisible: false,
AuditingData: null,
};
},
computed: {
@@ -418,26 +427,80 @@ export default {
handleDelay(row) {
this.$refs.delay.open(row.missionNo);
},
async handelAuditing(type) {
const {id, reviewState, jobType} = this.AuditingData
let resData = await review({id, reviewState: type, jobType})
this.AuditingData = null
this.centerDialogVisible = false
if(resData.data.code === 200) {
this.$message({
type: "success",
message: "审核成功!",
handleCheck() {
let self = this
if (this.ids.length < 1) {
message({
type: "warning",
message: "请至少选择一条数据",
});
return;
}
let idList = [];
for (let i = 0; i < this.ids.length; i++) {
this.data.forEach((ele) => {
if (ele.id == this.ids[i]) {
idList.push(ele.id);
}
});
}
if (idList.length == 0) {
this.$message.error("只能驳回【招聘中】的任务");
} else {
message({
let h = this.$createElement;
this.$prompt(
h("p", {style: "color: #F56C6C"}, "一旦驳回无法进行后续操作"),
"请核对招聘信息后再进行审核通过",
{
distinguishCancelAndClose: true,
confirmButtonText: "通 过",
cancelButtonText: "驳 回",
type: "warning",
message: "审核失败",
});
center: true,
inputType: "textarea",
inputPlaceholder: "备注驳回原因",
beforeClose: function (action, instance, done) {
if (action === 'cancel') {
if (!instance.inputValue) {
return this.$message({
type: "info",
message: "请输入驳回原因!",
});
}
self.handelFetchAuditing(idList, 9, instance.inputValue, "成功驳回, 操作成功!").then(() => done())
} else if (action === 'confirm') {
self.handelFetchAuditing(idList, 0, instance.inputValue).then(() => done())
} else {
done()
}
}
}
)
}
},
handleCheck(row) {
this.centerDialogVisible = true
this.AuditingData = row
handelFetchAuditing(idList, reviewState, msg, message) {
return new Promise((resolve, reject) => {
let arr = idList.map((item) => ({
id: item,
reviewState: reviewState,
reviewMsg: msg || '',
jobType: 2,
}))
this.loading = true;
Auditing(arr).then(() => {
this.loading = false;
this.onLoad(this.page, this.params);
this.$message({
type: message ? "info" : "success",
message: message || "审核通过,操作成功!",
});
resolve()
}).catch(() => {
this.loading = false;
reject()
});
})
},
},
};

View File

@@ -36,7 +36,7 @@
<!-- &lt;!&ndash; <el-option label="报名截止日期" :value="3"></el-option> &ndash;&gt;-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="日期范围:">
<el-form-item label="岗位日期:">
<el-date-picker
v-model="query.time"
type="daterange"
@@ -59,6 +59,26 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="审核状态:">
<el-select v-model="query.reviewState">
<el-option
v-for="(item, index) in recruitStatus"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="数据来源:">
<el-select v-model="query.dataSources">
<el-option
v-for="(item, index) in dataSourcesEnum"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<div class="searchBtn">
<el-button
type="primary"
@@ -103,11 +123,11 @@
>审核</el-button
>
</template>
<template slot="menuRight">
<!-- <template slot="menuRight">
<el-button size="small" @click.stop="downRecords" type="primary"
>导出</el-button
>
</template>
</template> -->
<template slot-scope="{ row }" slot="menu">
<el-button
type="text"
@@ -142,17 +162,17 @@
import {
getList,
review,
complet,
getDetail,
download,
} from "@/api/workstation/post";
import { mapGetters } from "vuex";
import postView from "@/views/util/post-view";
import zpView from "./zpView";
import { companyPostState, wageUnitCategoryState } from "@/common/dic";
import {companyPostState, dataSourcesEnum, recruitStatus, wageUnitCategoryState} from "@/common/dic";
import { calcDate } from "@/util/date";
import { Message } from "element-ui";
import lodash from "lodash";
import {Auditing} from "@/api/manage/mission";
const message = lodash.throttle(
function (options) {
@@ -167,6 +187,8 @@ export default {
name: "manage_mission",
data() {
return {
recruitStatus,
dataSourcesEnum,
view: {},
form: {},
selectionList: [],
@@ -316,6 +338,20 @@ export default {
display: false,
span: 24,
width: 80,
},{
label: "数据来源",
prop: "dataSources",
dicData: dataSourcesEnum,
display: false,
span: 24,
width: 80,
},{
label: "审核状态",
prop: "reviewState",
dicData: recruitStatus,
display: false,
span: 24,
width: 80,
},
// {
// label:"备注",
@@ -445,6 +481,7 @@ export default {
this.$refs.delay.open(row.missionNo);
},
handleCheck() {
let self = this
if (this.ids.length < 1) {
message({
type: "warning",
@@ -455,7 +492,7 @@ export default {
let idList = [];
for (let i = 0; i < this.ids.length; i++) {
this.data.forEach((ele) => {
if (ele.jobStatus == 1 && ele.id == this.ids[i]) {
if (ele.id == this.ids[i]) {
idList.push(ele.id);
}
});
@@ -467,34 +504,57 @@ export default {
let h = this.$createElement;
this.$prompt(
h("p", { style: "color: #F56C6C" }, "一旦驳回无法进行后续操作"),
"您确定要驳回此任务吗?",
"请核对招聘信息后再进行审核通过",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
distinguishCancelAndClose: true,
confirmButtonText: "通 过",
cancelButtonText: "驳 回",
type: "warning",
center: true,
inputType: "textarea",
inputPlaceholder: "备注驳回原因",
beforeClose: function(action, instance, done) {
if(action === 'cancel') {
if (!instance.inputValue) {
return this.$message({
type: "info",
message: "请输入驳回原因!",
});
}
self.handelFetchAuditing(idList, 9, instance.inputValue, "成功驳回, 操作成功!").then(() => done())
} else if(action === 'confirm') {
self.handelFetchAuditing(idList, 0, instance.inputValue).then(() => done())
} else {
done()
}
}
}
)
.then(({ value }) => {
this.loading = true;
review(idList.join(","), value)
.then(() => {
this.loading = false;
this.onLoad(this.page, this.params);
this.$message({
type: "success",
message: "操作成功!",
});
})
.catch(() => {
this.loading = false;
});
})
.catch(() => {});
}
},
handelFetchAuditing(idList, reviewState, msg, message) {
return new Promise((resolve, reject) => {
let arr = idList.map((item) => ({
id: item,
reviewState: reviewState,
reviewMsg: msg || '',
jobType: 1,
}))
this.loading = true;
Auditing(arr).then(() => {
this.loading = false;
this.onLoad(this.page, this.params);
this.$message({
type: message ? "info" : "success",
message: message || "审核通过,操作成功!",
});
resolve()
}).catch(() => {
this.loading = false;
reject()
});
})
},
downRecords() {
if (this.query.time) {
this.query.stime = this.query.time[0];

View File

@@ -182,6 +182,28 @@
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="审核状态" name="5" disabled="true">
<template slot="title">
<div class="avue-group__header">
<div class="avue-group__title">审核信息</div>
</div>
</template>
<el-row>
<el-col span="24">
<el-form-item label="审核状态:">{{
recruit[model.reviewState]
}}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col span="24">
<el-form-item label="审核备注:">{{
model.reviewMsg || '无'
}}</el-form-item>
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
</el-form>
</div>
@@ -195,6 +217,7 @@ import {
wageUnitCategoryState,
educationState,
genderState,
recruitStatus
} from "@/common/dic";
function getDic(arr) {
@@ -210,10 +233,11 @@ export default {
props: { model: Object },
data() {
return {
activeNames: ["1", "2", "3", "4"],
activeNames: ["1", "2", "3", "4", "5"],
wageUnitCategory: getDic(wageUnitCategoryState),
education: getDic(educationState),
gender: getDic(genderState),
recruit: getDic(recruitStatus),
};
},
mounted() { },

View File

@@ -182,6 +182,28 @@
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="审核状态" name="5" disabled="true">
<template slot="title">
<div class="avue-group__header">
<div class="avue-group__title">审核信息</div>
</div>
</template>
<el-row>
<el-col span="24">
<el-form-item label="审核状态:">{{
recruit[model.reviewState]
}}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col span="24">
<el-form-item label="审核备注:">{{
model.reviewMsg || '无'
}}</el-form-item>
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
</el-form>
</div>
@@ -194,7 +216,7 @@ import { dateFormat } from "@/util/date";
import {
wageUnitCategoryState,
educationState,
genderState,
genderState, recruitStatus,
} from "@/common/dic";
function getDic(arr) {
@@ -210,10 +232,11 @@ export default {
props: { model: Object },
data() {
return {
activeNames: ["1", "2", "3", "4"],
activeNames: ["1", "2", "3", "4", "5"],
wageUnitCategory: getDic(wageUnitCategoryState),
education: getDic(educationState),
gender: getDic(genderState),
recruit: getDic(recruitStatus),
};
},
mounted() { },