修复版本bug

This commit is contained in:
dengxin
2024-02-20 22:25:58 +08:00
parent 1cf0e980f5
commit ecd03d7876
12 changed files with 445 additions and 310 deletions

106
src/api/tenant/label.js Normal file
View File

@@ -0,0 +1,106 @@
import request from '@/router/axios';
/*获取人才列表*/
export const getList =
(current, size, params, groupId) => {
return request({
url: '/api/jobslink-api/label/list',
method: 'get',
params: {...params, current, size, groupId}
})
}
/*新增人才*/
export const add =
(row) => {
return request(
{url: '/api/jobslink-api/label/save', method: 'post', data: row})
}
/*编辑人才*/
export const update =
(row) => {
return request({
url: '/api/jobslink-api/label/tenant/update',
method: 'post',
data: row
})
}
/*删除人才*/
export const remove =
(ids) => {
return request({
url: '/api/jobslink-api/label/remove',
method: 'post',
params: {ids}
})
}
/*人才详情*/
export const detail =
(id) => {
return request({
url: '/api/jobslink-api/label/detail',
method: 'get',
params: {id}
})
}
/*获取分组*/
export const getDept =
() => {
return request({
url: '/api/jobslink-api/label/group/listAll',
method: 'get',
params: {}
})
}
/*新建分组*/
export const addDept =
(row) => {
return request({
url: '/api/jobslink-api/label/group/save',
method: 'post',
data: row
})
}
/*编辑分组*/
export const updateDept =
(row) => {
return request({
url: '/api/jobslink-api/label/group/update',
method: 'post',
data: row
})
}
/*删除分组*/
export const removeDept =
(ids) => {
return request({
url: '/api/jobslink-api/label/group/remove',
method: 'post',
params: {ids}
})
}
/*转移分组*/
export const transferDept =
(groupIds, ids) => {
return request({
url: '/api/jobslink-api/label/updateAllGroup',
method: 'post',
params: {groupIds, ids}
})
}
/*导入人才库*/
export const upload = () => {
return `/api/jobslink-api/label/group/import?isCovered=1`
}

View File

@@ -3,7 +3,7 @@ import request from '@/router/axios';
export const getList =
(current, size, params, groupId) => {
return request({
url: '/api/jobslink-api/label/list',
url: '/api/jobslink-api/policy/list',
method: 'get',
params: {...params, current, size, groupId}
})
@@ -13,14 +13,14 @@ export const getList =
export const add =
(row) => {
return request(
{url: '/api/jobslink-api/label/save', method: 'post', data: row})
{url: '/api/jobslink-api/policy/save', method: 'post', data: row})
}
/*编辑人才*/
export const update =
(row) => {
return request({
url: '/api/jobslink-api/label/tenant/update',
url: '/api/jobslink-api/policy/tenant/update',
method: 'post',
data: row
})
@@ -30,7 +30,7 @@ export const update =
export const remove =
(ids) => {
return request({
url: '/api/jobslink-api/label/remove',
url: '/api/jobslink-api/policy/remove',
method: 'post',
params: {ids}
})
@@ -40,7 +40,7 @@ export const remove =
export const detail =
(id) => {
return request({
url: '/api/jobslink-api/label/detail',
url: '/api/jobslink-api/policy/detail',
method: 'get',
params: {id}
})
@@ -51,7 +51,7 @@ export const detail =
export const getDept =
() => {
return request({
url: '/api/jobslink-api/label/group/listAll',
url: '/api/jobslink-api/policy/group/listAll',
method: 'get',
params: {}
})
@@ -61,7 +61,7 @@ export const getDept =
export const addDept =
(row) => {
return request({
url: '/api/jobslink-api/label/group/save',
url: '/api/jobslink-api/policy/group/save',
method: 'post',
data: row
})
@@ -72,7 +72,7 @@ export const addDept =
export const updateDept =
(row) => {
return request({
url: '/api/jobslink-api/label/group/update',
url: '/api/jobslink-api/policy/group/update',
method: 'post',
data: row
})
@@ -83,7 +83,7 @@ export const updateDept =
export const removeDept =
(ids) => {
return request({
url: '/api/jobslink-api/label/group/remove',
url: '/api/jobslink-api/policy/group/remove',
method: 'post',
params: {ids}
})
@@ -94,7 +94,7 @@ export const removeDept =
export const transferDept =
(groupIds, ids) => {
return request({
url: '/api/jobslink-api/label/updateAllGroup',
url: '/api/jobslink-api/policy/updateAllGroup',
method: 'post',
params: {groupIds, ids}
})
@@ -102,5 +102,5 @@ export const transferDept =
/*导入人才库*/
export const upload = () => {
return `/api/jobslink-api/label/group/import?isCovered=1`
return `/api/jobslink-api/policy/group/import?isCovered=1`
}

View File

@@ -2,8 +2,8 @@ import Vue from 'vue'
import VueI18n from 'vue-i18n'
import elementEnLocale from 'element-ui/lib/locale/lang/en' // element-ui lang
import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN'// element-ui lang
import avueZhLocale from "@smallwei/avue/lib/locale/lang/zh";
import avueEnLocale from "@smallwei/avue/lib/locale/lang/en";
// import avueZhLocale from "@smallwei/avue/lib/locale/lang/zh";
// import avueEnLocale from "@smallwei/avue/lib/locale/lang/en";
import enLocale from './en'
import zhLocale from './zh'
import { getStore } from '@/util/store'
@@ -14,13 +14,13 @@ const messages = {
...enLocale,
...elementEnLocale,
...Avue.locale.en,
...avueEnLocale
// ...avueEnLocale
},
zh: {
...zhLocale,
...elementZhLocale,
...Avue.locale.zh,
...avueZhLocale,
// ...avueZhLocale,
}
}
const i18n = new VueI18n({

View File

@@ -321,7 +321,7 @@ export default {
type: "tree",
label: "所属市场",
prop: "stationId",
span: 12,
span: 20,
display: false,
search: true,
searchSpan: 4,
@@ -346,9 +346,9 @@ export default {
label: "商保状态",
prop: "insuranceOn",
type: "select",
search: true,
searchslot:false,
searchSpan: 4,
// search: true,
// searchslot:false,
// searchSpan: 4,
dicData: [
{
label: "停用",
@@ -405,10 +405,10 @@ export default {
label: "保证金",
prop: "trialOn",
type: "select",
search: true,
searchslot:false,
searchLabelWidth: 66,
searchSpan: 5,
// search: true,
// searchslot:false,
// searchLabelWidth: 66,
// searchSpan: 5,
dicData: [
{
label: "已缴",
@@ -475,6 +475,7 @@ export default {
{
type: "tree",
label: "所属市场",
span: 20,
size: "small",
prop: "stationId",
rules: [
@@ -496,6 +497,7 @@ export default {
{
type: "select",
label: "所属行业",
span: 20,
size: "small",
prop: "tradeId",
rules: [
@@ -519,27 +521,27 @@ export default {
return result;
},
},
{
type: "input",
label: "统一信用代码",
span: 12,
display: true,
editDisabled: true,
size: "small",
prop: "companyTid",
rules: [
{
required: true,
whitespace: true,
message: "请输入统一信用代码",
},
],
placeholder: "18位统一社会信用代码",
},
// {
// type: "input",
// label: "统一信用代码",
// span: 12,
// display: true,
// editDisabled: true,
// size: "small",
// prop: "companyTid",
// rules: [
// {
// required: true,
// whitespace: true,
// message: "请输入统一信用代码",
// },
// ],
// placeholder: "18位统一社会信用代码",
// },
{
type: "input",
label: "企业名称",
span: 12,
span: 20,
display: true,
size: "small",
prop: "companyName",
@@ -553,8 +555,8 @@ export default {
},
{
type: "input",
label: "人姓名",
span: 12,
label: "联系人姓名",
span: 20,
display: true,
size: "small",
prop: "masterName",
@@ -562,38 +564,38 @@ export default {
{
required: true,
whitespace: true,
message: "请输入人姓名",
},
],
},
{
type: "input",
label: "法人身份证号",
span: 12,
display: true,
size: "small",
prop: "masterIdentity",
rules: [
{
required: true,
whitespace: true,
message: "请输入法人身份证号",
},
{
validator: (rule, value, callback) => {
if (check18IdCardNo(value)) {
callback();
} else {
callback(new Error("身份证格式不正确"));
}
},
message: "请输入联系人姓名",
},
],
},
// {
// type: "input",
// label: "法人身份证号",
// span: 12,
// display: true,
// size: "small",
// prop: "masterIdentity",
// rules: [
// {
// required: true,
// whitespace: true,
// message: "请输入法人身份证号",
// },
// {
// validator: (rule, value, callback) => {
// if (check18IdCardNo(value)) {
// callback();
// } else {
// callback(new Error("身份证格式不正确"));
// }
// },
// },
// ],
// },
{
type: "input",
label: "所在地区",
span: 12,
span: 20,
display: true,
prop: "cityId",
formslot: true,
@@ -607,7 +609,7 @@ export default {
{
type: "input",
label: "详细地址",
span: 12,
span: 20,
display: true,
size: "small",
prop: "companyAddress",
@@ -620,220 +622,220 @@ export default {
],
},
// 图片上传
{
type: "upload",
label: "法人身份证(人像)",
span: 12,
showFileList: false,
listType: "picture-img",
multiple: false,
propsHttp: {
res: "data",
url: "link",
},
canvasOption: {},
headers: [],
data: [],
accept,
size: "small",
prop: "identityUrl4Id",
action: putFile,
viewDisplay: false,
rules: [
{
required: true,
message: "请上传法人身份证(人像)",
},
],
// tip:'上传图片大小限制2M以内',
},
{
type: "upload",
label: "法人身份证(国徽)",
span: 12,
showFileList: false,
listType: "picture-img",
multiple: false,
propsHttp: {
res: "data",
url: "link",
},
canvasOption: {},
headers: [],
data: [],
accept,
size: "small",
prop: "identityUrl5Id",
action: putFile,
viewDisplay: false,
rules: [
{
required: true,
message: "请上传法人身份证(国徽)",
},
],
// tip:'上传图片大小限制2M以内',
},
{
type: "upload",
label: "营业执照",
span: 12,
showFileList: false,
listType: "picture-img",
multiple: false,
propsHttp: {
res: "data",
url: "link",
},
accept,
canvasOption: {},
headers: [],
data: [],
size: "small",
prop: "authUrlId",
action: putFile,
viewDisplay: false,
rules: [
{
required: true,
message: "请上传营业执照照片",
},
],
// tip:'上传图片大小限制2M以内',
},
// {
// type: "upload",
// label: "法人身份证(人像)",
// span: 12,
// showFileList: false,
// listType: "picture-img",
// multiple: false,
// propsHttp: {
// res: "data",
// url: "link",
// },
// canvasOption: {},
// headers: [],
// data: [],
// accept,
// size: "small",
// prop: "identityUrl4Id",
// action: putFile,
// viewDisplay: false,
// rules: [
// {
// required: true,
// message: "请上传法人身份证(人像)",
// },
// ],
// // tip:'上传图片大小限制2M以内',
// },
// {
// type: "upload",
// label: "法人身份证(国徽)",
// span: 12,
// showFileList: false,
// listType: "picture-img",
// multiple: false,
// propsHttp: {
// res: "data",
// url: "link",
// },
// canvasOption: {},
// headers: [],
// data: [],
// accept,
// size: "small",
// prop: "identityUrl5Id",
// action: putFile,
// viewDisplay: false,
// rules: [
// {
// required: true,
// message: "请上传法人身份证(国徽)",
// },
// ],
// // tip:'上传图片大小限制2M以内',
// },
// {
// type: "upload",
// label: "营业执照",
// span: 12,
// showFileList: false,
// listType: "picture-img",
// multiple: false,
// propsHttp: {
// res: "data",
// url: "link",
// },
// accept,
// canvasOption: {},
// headers: [],
// data: [],
// size: "small",
// prop: "authUrlId",
// action: putFile,
// viewDisplay: false,
// rules: [
// {
// required: true,
// message: "请上传营业执照照片",
// },
// ],
// // tip:'上传图片大小限制2M以内',
// },
{
type: "upload",
label: "电子签章申请表",
span: 12,
showFileList: false,
listType: "picture-img",
multiple: false,
propsHttp: {
res: "data",
url: "link",
},
accept,
canvasOption: {},
headers: [],
data: [],
size: "small",
prop: "signSrcUrl",
action: putFile,
viewDisplay: false,
rules: [
{
required: true,
message: "请上传电子签章申请表",
},
],
// tip:'上传图片大小限制2M以内',
},
{
type: "upload",
label: "授权委托书",
span: 24,
showFileList: false,
listType: "picture-img",
multiple: false,
propsHttp: {
res: "data",
url: "link",
},
canvasOption: {},
headers: [],
data: [],
accept,
size: "small",
prop: "letterOfAttorneyUrl",
action: putFile,
viewDisplay: false,
rules: [
{
required: true,
message: "请上传授权委托书",
},
],
// tip:'上传图片大小限制2M以内',
},
{
label: "招聘简章",
formslot:true,
span:24,
prop:'motoleyUrl',
rules: [
{
required: true,
message: "请上传招聘简章",
},
],
viewDisplay: false,
},
// 图片预览
{
label: "法人身份证(人像)",
span: 12,
prop: "identityUrl4IdImg",
formslot: true,
editDisplay: false,
addDisplay: false,
viewDisplay: true,
},
{
label: "法人身份证(国徽)",
span: 12,
prop: "identityUrl5IdImg",
formslot: true,
editDisplay: false,
addDisplay: false,
viewDisplay: true,
},
{
label: "营业执照照片",
span: 12,
prop: "authUrlIdImg",
formslot: true,
editDisplay: false,
addDisplay: false,
viewDisplay: true,
},
{
label: "电子签章申请表",
span: 12,
prop: "signSrcUrl",
formslot: true,
editDisplay: false,
addDisplay: false,
viewDisplay: true,
},
{
label: "授权委托书",
span: 12,
prop: "letterOfAttorneyUrl",
formslot: true,
editDisplay: false,
addDisplay: false,
viewDisplay: true,
},
{
label: "招聘简章",
span: 24,
prop: "motoleyUrlImg",
formslot: true,
editDisplay: false,
addDisplay: false,
viewDisplay: true,
},
{
label: "操作记录",
prop: "record",
labelPosition: "top",
span: 24,
formslot: true,
editDisplay: false,
addDisplay: false,
viewDisplay: true,
},
// {
// type: "upload",
// label: "电子签章申请表",
// span: 12,
// showFileList: false,
// listType: "picture-img",
// multiple: false,
// propsHttp: {
// res: "data",
// url: "link",
// },
// accept,
// canvasOption: {},
// headers: [],
// data: [],
// size: "small",
// prop: "signSrcUrl",
// action: putFile,
// viewDisplay: false,
// rules: [
// {
// required: true,
// message: "请上传电子签章申请表",
// },
// ],
// // tip:'上传图片大小限制2M以内',
// },
// {
// type: "upload",
// label: "授权委托书",
// span: 24,
// showFileList: false,
// listType: "picture-img",
// multiple: false,
// propsHttp: {
// res: "data",
// url: "link",
// },
// canvasOption: {},
// headers: [],
// data: [],
// accept,
// size: "small",
// prop: "letterOfAttorneyUrl",
// action: putFile,
// viewDisplay: false,
// rules: [
// {
// required: true,
// message: "请上传授权委托书",
// },
// ],
// // tip:'上传图片大小限制2M以内',
// },
// {
// label: "招聘简章",
// formslot:true,
// span:24,
// prop:'motoleyUrl',
// rules: [
// {
// required: true,
// message: "请上传招聘简章",
// },
// ],
// viewDisplay: false,
// },
// // 图片预览
// {
// label: "法人身份证(人像)",
// span: 12,
// prop: "identityUrl4IdImg",
// formslot: true,
// editDisplay: false,
// addDisplay: false,
// viewDisplay: true,
// },
// {
// label: "法人身份证(国徽)",
// span: 12,
// prop: "identityUrl5IdImg",
// formslot: true,
// editDisplay: false,
// addDisplay: false,
// viewDisplay: true,
// },
// {
// label: "营业执照照片",
// span: 12,
// prop: "authUrlIdImg",
// formslot: true,
// editDisplay: false,
// addDisplay: false,
// viewDisplay: true,
// },
// {
// label: "电子签章申请表",
// span: 12,
// prop: "signSrcUrl",
// formslot: true,
// editDisplay: false,
// addDisplay: false,
// viewDisplay: true,
// },
// {
// label: "授权委托书",
// span: 12,
// prop: "letterOfAttorneyUrl",
// formslot: true,
// editDisplay: false,
// addDisplay: false,
// viewDisplay: true,
// },
// {
// label: "招聘简章",
// span: 24,
// prop: "motoleyUrlImg",
// formslot: true,
// editDisplay: false,
// addDisplay: false,
// viewDisplay: true,
// },
// {
// label: "操作记录",
// prop: "record",
// labelPosition: "top",
// span: 24,
// formslot: true,
// editDisplay: false,
// addDisplay: false,
// viewDisplay: true,
// },
],
}
],

View File

@@ -35,7 +35,7 @@
</template>
<script>
import { addDept, updateDept } from "@/api/tenant/policy";
import { addDept, updateDept } from "@/api/tenant/label";
export default {
data() {
return {

View File

@@ -19,7 +19,7 @@
</template>
<script>
import { transferDept } from "@/api/tenant/policy";
import { transferDept } from "@/api/tenant/label";
export default {
props: {
ids: String,

View File

@@ -110,8 +110,9 @@
删除</el-button>
</template>
<template slot="name" slot-scope="{row}">
<span v-if="row.status == 1">{{ row.name }}</span>
<span v-else>{{ row.name }}<span style="color: red;">未实名</span></span>
<span>{{ row.name }}</span>
<!-- <span v-if="row.status == 1">{{ row.name }}</span> -->
<!-- <span v-else>{{ row.name }}<span style="color: red;">未实名</span></span> -->
</template>
<!--/自定义按钮-->
@@ -153,7 +154,7 @@ import {
getDept,
removeDept,
upload,
} from "@/api/tenant/policy";
} from "@/api/tenant/label";
import { getWorkTypes } from "@/api/tenant/common";
import { mapGetters } from "vuex";
import addGroups from "./Dialog/addGroups";
@@ -242,7 +243,7 @@ export default {
permissionList() {
return {
addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
viewBtn: false,
viewBtn: true,
delBtn: this.vaildData(
this.permission.tenant_talents_groupdelete,
false
@@ -297,6 +298,7 @@ export default {
columnBtn: false,
searchBtn: true,
searchShow: true,
viewBtn: true,
searchMenuSpan: 6,
border: true,
index: true,

View File

@@ -243,7 +243,7 @@ export default {
permissionList() {
return {
addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
viewBtn: false,
viewBtn: true,
delBtn: this.vaildData(
this.permission.tenant_talents_groupdelete,
false
@@ -301,6 +301,7 @@ export default {
searchMenuSpan: 6,
border: true,
index: true,
viewBtn: true,
indexLabel: "序号",
selection: true,
dialogType: "dialog",

View File

@@ -232,7 +232,7 @@ export default {
permissionList() {
return {
addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
viewBtn: false,
viewBtn: true,
delBtn: this.vaildData(
this.permission.tenant_talents_groupdelete,
false
@@ -287,6 +287,7 @@ export default {
columnBtn: false,
searchBtn: true,
searchShow: true,
viewBtn: true,
searchMenuSpan: 6,
border: true,
index: true,