diff --git a/Api/Ewide.Core/Service/Emp/SysEmpService.cs b/Api/Ewide.Core/Service/Emp/SysEmpService.cs index 945a6b5..4a4992c 100644 --- a/Api/Ewide.Core/Service/Emp/SysEmpService.cs +++ b/Api/Ewide.Core/Service/Emp/SysEmpService.cs @@ -54,11 +54,12 @@ namespace Ewide.Core.Service var emps = await _sysEmpRep.Where(u => u.Id == sysEmpParam.Id).ToListAsync(); emps.ForEach(u => { - u.DeleteNow(); + u.Delete(); }); // 再新增新员工信息 var emp = sysEmpParam.Adapt(); + emp.OrgName = (await Db.GetRepository().DetachedEntities.FirstOrDefaultAsync(p => p.Id.Equals(emp.OrgId))).Name; await _sysEmpRep.InsertAsync(emp); // 更新附属机构职位信息 diff --git a/web-react/src/pages/system/user/form.jsx b/web-react/src/pages/system/user/form.jsx index a33b5ed..2b47441 100644 --- a/web-react/src/pages/system/user/form.jsx +++ b/web-react/src/pages/system/user/form.jsx @@ -40,57 +40,7 @@ export default class form extends Component { extIds: [], }, } - extColumns = [ - { - title: '附属机构', - dataIndex: 'orgId', - width: '45%', - render: (text, record, index) => ( - - - - ), - }, - { - title: '附属岗位', - dataIndex: 'posId', - width: '45%', - render: (text, record, index) => ( - - - - ), - }, - { - title: '操作', - key: 'action', - width: '70px', - render: (text, record) => ( - - ), - }, - ] + // 表单实例 form = React.createRef() @@ -193,7 +143,6 @@ export default class form extends Component { postData.id = this.record.id } //#region 从前段转换后端所需格式 - console.log(postData) //#endregion return postData } @@ -208,75 +157,7 @@ export default class form extends Component { const { data } = await api.sysPosList() return data } - onAddExtData() { - const { extIds } = this.state.sysEmpParam - - const record = { - key: extIds.length > 0 ? extIds[extIds.length - 1].key + 1 : 0, - orgId: undefined, - posId: undefined, - } - - this.setState( - { - sysEmpParam: { - extIds: [...extIds, record], - }, - }, - () => { - console.log(this.form.current.getFieldsValue()) - } - ) - } - onRemoveExtData(record) { - const ext = this.state.sysEmpParam.extIds, - remove = ext.find(p => p.key === record.key), - index = ext.indexOf(remove) - - ext.splice(index, 1) - console.log(ext) - - // this.form.current.setFieldsValue({ - // sysEmpParam: { - // extIds: {} - // } - // }) - - this.setState( - { - sysEmpParam: { - extIds: ext, - }, - }, - () => { - //console.log(this.form.current.getFieldsValue()) - } - ) - } //#endregion - renderExtInfoTable() { - //console.log(this.state.sysEmpParam.extIds) - return ( - record.key} - footer={() => ( - - )} - >
- ) - } render() { return ( @@ -298,28 +179,6 @@ export default class form extends Component { > - {/* {this.props.mode == 'add' && ( - <> - - - - - - - - )} */} @@ -410,10 +269,6 @@ export default class form extends Component { - {/*

附加信息

-
- {this.renderExtInfoTable()} -
*/} )