From ca16194e99c582b117efa22108c8233b07fef6aa Mon Sep 17 00:00:00 2001 From: QuAoLi Date: Thu, 12 May 2022 14:10:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BA=BA=E5=91=98=E9=A1=B9=E7=9B=AE=E5=85=B3?= =?UTF-8?q?=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/person/personOrg.js | 10 +++++++++- src/views/person/PersonList.vue | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/api/person/personOrg.js b/src/api/person/personOrg.js index d887449..5c78c44 100644 --- a/src/api/person/personOrg.js +++ b/src/api/person/personOrg.js @@ -2,7 +2,8 @@ import request from '@/utils/request' const personOrgApi = { listByOrgId: 'person/org/listByOrgId', - addPersonOrg: 'person/org/addPersonOrg' + addPersonOrg: 'person/org/addPersonOrg', + removePersonOrg: 'person/org/removePersonOrg' } export function listPersonByOrgId(params) { @@ -19,3 +20,10 @@ export function addPersonOrg(params) { data: params }) } +export function removePersonOrg(params) { + return request({ + url: personOrgApi.removePersonOrg, + method: 'post', + params: params + }) +} diff --git a/src/views/person/PersonList.vue b/src/views/person/PersonList.vue index fa88f6f..889b70b 100644 --- a/src/views/person/PersonList.vue +++ b/src/views/person/PersonList.vue @@ -101,6 +101,14 @@ 删除 + + @@ -122,6 +130,7 @@ import { orgList } from '@/api/org/org' import { listToTree } from '@/utils/util' import { personPage, personDel, personQuit, personTransferOrg, personSetAdmin, personResetPwd, personExport, personImport } from '@/api/person/person' +import { removePersonOrg } from '@/api/person/personOrg' import PersonForm from './PersonForm' import PersonDetail from './PersonDetail' import OrgTree from '../org/OrgTree' @@ -283,6 +292,21 @@ export default { this.$message.error('删除错误:' + err.msg) }) }, + /** + * 移除项目 + */ + personRemove (record) { + removePersonOrg({ personId: record.id, orgId: this.orgId }).then((res) => { + if (res.code === 200) { + this.$message.success('移除成功') + this.$refs.table.refresh() + } else { + this.$message.error('移除失败:' + res.msg) + } + }).catch((err) => { + this.$message.error('移除错误:' + err.msg) + }) + }, /** * 添加证书 */ From dce5343985474d331651dc63c9b4b6b5d9aa1d2d Mon Sep 17 00:00:00 2001 From: QuAoLi Date: Thu, 12 May 2022 14:25:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=80=E5=9C=A8=E9=A1=B9=E7=9B=AE=E7=BB=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/person/PersonDetail.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/views/person/PersonDetail.vue b/src/views/person/PersonDetail.vue index 5ca7394..a0ab67e 100644 --- a/src/views/person/PersonDetail.vue +++ b/src/views/person/PersonDetail.vue @@ -178,6 +178,20 @@ + + + + + + + + + 身份证信息 @@ -334,7 +348,8 @@ workType: parseInt(data.workType), degreeId: data.degreeId, orgId: data.orgId, - orgName: data.orgName + orgName: data.orgName, + projectTeam: data.projectTeam } ) // 动态赋值年龄和性别 From f22e9da55bcaec0c20da0de729fca325d67b37f5 Mon Sep 17 00:00:00 2001 From: QuAoLi Date: Thu, 12 May 2022 15:13:56 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E2=BD=A4=E6=88=B7?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=90=8E=E2=BE=83=E5=8A=A8=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/person/PersonDetail.vue | 19 ++++++++++--------- src/views/person/PersonRegister.vue | 12 +++++++----- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/views/person/PersonDetail.vue b/src/views/person/PersonDetail.vue index a0ab67e..cde7ccd 100644 --- a/src/views/person/PersonDetail.vue +++ b/src/views/person/PersonDetail.vue @@ -323,12 +323,14 @@ const data = res.data // 默认选中的多选框 - const type = data.type.split(',') - const typeIntArr = []// 保存转换后的整型字符串 - type.forEach(item => { - typeIntArr.push(+item) - }) - this.form.getFieldDecorator('type', { valuePropName: 'checked', initialValue: typeIntArr }) + if (data.type) { + const type = data.type.split(',') + const typeIntArr = []// 保存转换后的整型字符串 + type.forEach(item => { + typeIntArr.push(+item) + }) + this.form.getFieldDecorator('type', { valuePropName: 'checked', initialValue: typeIntArr }) + } this.idPhotoFace = this.getImgPath(data.idPhotoFace) this.idPhotoBack = this.getImgPath(data.idPhotoBack) @@ -344,8 +346,8 @@ // age: data.age, // sex: data.sex, phone: data.phone, - jobs: parseInt(data.jobs), - workType: parseInt(data.workType), + jobs: data.jobs ? parseInt(data.jobs) : null, + workType: data.workType ? parseInt(data.workType) : null, degreeId: data.degreeId, orgId: data.orgId, orgName: data.orgName, @@ -423,7 +425,6 @@ if (monthNow < monthBirth || (monthNow === monthBirth && dayNow < dayBirth)) { age-- } - console.log(age) // 得到年龄 this.form.setFieldsValue({ age }) }, diff --git a/src/views/person/PersonRegister.vue b/src/views/person/PersonRegister.vue index 9483b9c..08cd2a2 100644 --- a/src/views/person/PersonRegister.vue +++ b/src/views/person/PersonRegister.vue @@ -7,7 +7,6 @@

单位邀请码:{{ invitationCode }}

-

邀请链接: www.anquanpeixun.com

@@ -27,11 +26,14 @@ - 编辑 + + + 详情 - + + @@ -39,12 +41,12 @@