diff --git a/package-lock.json b/package-lock.json index 33e7b8a..9ec9ec3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -893,14 +893,19 @@ "dev": true }, "@smallwei/avue": { - "version": "2.11.2", - "resolved": "https://registry.npmmirror.com/@smallwei/avue/-/avue-2.11.2.tgz", - "integrity": "sha512-cvB9zC4nFAR+3r6Vzn9vl63X1AfmW7pdh5Ysa7gxFB5h5W70nHRTg/4Fe9fjcswQcyeGoCetnzt8u8AxCIzIXw==", + "version": "2.6.10", + "resolved": "https://registry.npm.taobao.org/@smallwei/avue/download/@smallwei/avue-2.6.10.tgz?cache=0&sync_timestamp=1600153861749&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40smallwei%2Favue%2Fdownload%2F%40smallwei%2Favue-2.6.10.tgz", + "integrity": "sha1-W39axDByg2FQ0m0pOceMR8fwRJI=", "requires": { + "async-validator": "^1.10.0", + "axios": "^0.18.0", "countup.js": "^1.9.3", - "dayjs": "^1.10.4", + "dayjs": "^1.7.8", + "deepmerge": "^3.1.0", + "element-ui": "^2.11.0", "nprogress": "^0.2.0", - "vue-cropper": "^0.5.8" + "vue": "^2.5.17", + "vuedraggable": "^2.17.0" } }, "@soda/friendly-errors-webpack-plugin": { @@ -1802,6 +1807,11 @@ "integrity": "sha1-3TeelPDbgxCwgpH51kwyCXZmF/0=", "dev": true }, + "async-validator": { + "version": "1.12.2", + "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.12.2.tgz?cache=0&sync_timestamp=1596625258256&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-1.12.2.tgz", + "integrity": "sha1-vq5nHnF00pOLe0tp0vt+cit/1yw=" + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz", @@ -3416,8 +3426,8 @@ }, "countup.js": { "version": "1.9.3", - "resolved": "https://registry.npmmirror.com/countup.js/-/countup.js-1.9.3.tgz", - "integrity": "sha512-UHf2P/mFKaESqdPq+UdBJm/1y8lYdlcDd0nTZHNC8cxWoJwZr1Eldm1PpWui446vDl5Pd8PtRYkr3q6K4+Qa5A==" + "resolved": "https://registry.npm.taobao.org/countup.js/download/countup.js-1.9.3.tgz", + "integrity": "sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0=" }, "crc-32": { "version": "1.2.0", @@ -3786,9 +3796,9 @@ } }, "dayjs": { - "version": "1.11.10", - "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz", - "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" + "version": "1.8.36", + "resolved": "https://registry.npm.taobao.org/dayjs/download/dayjs-1.8.36.tgz?cache=0&sync_timestamp=1600333444806&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdayjs%2Fdownload%2Fdayjs-1.8.36.tgz", + "integrity": "sha1-vjbiSEZ6+r+PWoa64N4M3O7M7VA=" }, "de-indent": { "version": "1.0.2", @@ -3851,6 +3861,11 @@ "dev": true, "optional": true }, + "deepmerge": { + "version": "3.3.0", + "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-3.3.0.tgz", + "integrity": "sha1-08R/1vOpPVF7FEJrBiihewEl9fc=" + }, "default-gateway": { "version": "5.0.5", "resolved": "http://r.cnpmjs.org/default-gateway/download/default-gateway-5.0.5.tgz", @@ -10510,6 +10525,11 @@ "is-plain-obj": "^1.0.0" } }, + "sortablejs": { + "version": "1.12.0", + "resolved": "https://registry.npm.taobao.org/sortablejs/download/sortablejs-1.12.0.tgz?cache=0&sync_timestamp=1600657347848&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsortablejs%2Fdownload%2Fsortablejs-1.12.0.tgz", + "integrity": "sha1-7m1+zjWYwq8P6xVZ2YWV5eo3y9Y=" + }, "source-list-map": { "version": "2.0.1", "resolved": "http://r.cnpmjs.org/source-list-map/download/source-list-map-2.0.1.tgz", @@ -11887,11 +11907,6 @@ "markdown-it": "^8.4.0" } }, - "vue-cropper": { - "version": "0.5.11", - "resolved": "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-0.5.11.tgz", - "integrity": "sha512-UeA3qL2BLCTGkOEAxEsxSNFO+qLYAn6YRHv4oS32cP9lMhF1vFmnAf/z+ZamtR0/Fh3sbZeZUCLVR2Ol2/dpTQ==" - }, "vue-eslint-parser": { "version": "2.0.3", "resolved": "http://r.cnpmjs.org/vue-eslint-parser/download/vue-eslint-parser-2.0.3.tgz", @@ -11990,6 +12005,14 @@ "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=", "dev": true }, + "vuedraggable": { + "version": "2.24.1", + "resolved": "https://registry.npm.taobao.org/vuedraggable/download/vuedraggable-2.24.1.tgz", + "integrity": "sha1-MEq9dkTd4FwfGZoie/npEH9WGXo=", + "requires": { + "sortablejs": "^1.10.1" + } + }, "vuex": { "version": "3.4.0", "resolved": "http://r.cnpmjs.org/vuex/download/vuex-3.4.0.tgz", diff --git a/package.json b/package.json index 1769643..a8e206e 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "test:e2e": "vue-cli-service test:e2e" }, "dependencies": { - "@smallwei/avue": "^2.11.1", + "@smallwei/avue": "2.6.10", "avue-plugin-ueditor": "^0.0.10", "axios": "^0.18.0", "babel-polyfill": "^6.26.0", diff --git a/src/api/tenant/label.js b/src/api/tenant/label.js new file mode 100644 index 0000000..da842db --- /dev/null +++ b/src/api/tenant/label.js @@ -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` +} diff --git a/src/api/tenant/policy.js b/src/api/tenant/policy.js index da842db..5a0aa9b 100644 --- a/src/api/tenant/policy.js +++ b/src/api/tenant/policy.js @@ -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` } diff --git a/src/lang/index.js b/src/lang/index.js index 6e3cd16..fa0743d 100644 --- a/src/lang/index.js +++ b/src/lang/index.js @@ -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({ diff --git a/src/views/manage/company/companyList.vue b/src/views/manage/company/companyList.vue index 0bc80e3..edb8be4 100644 --- a/src/views/manage/company/companyList.vue +++ b/src/views/manage/company/companyList.vue @@ -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, + // }, ], } ], diff --git a/src/views/tenant/main/label/Dialog/addGroups.vue b/src/views/tenant/main/label/Dialog/addGroups.vue index 47a4b12..00a9824 100644 --- a/src/views/tenant/main/label/Dialog/addGroups.vue +++ b/src/views/tenant/main/label/Dialog/addGroups.vue @@ -35,7 +35,7 @@