diff --git a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js index a13fe88e..b51b5a63 100644 --- a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js +++ b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js @@ -52,8 +52,8 @@ class PersonalScopeModal extends Component { } if (!_.isEmpty(nextProps.record)) { this.setState({ - targetType: nextProps.record.targetTypeName, - targetTypeIds: nextProps.record.target, + targetType: nextProps.record.targetType, + targetTypeIds: String(nextProps.record.targetId), targetTypeIdsNames: nextProps.record.targetName, status: nextProps.record.status, statusAll: "" @@ -150,6 +150,7 @@ class PersonalScopeModal extends Component { }).catch(() => this.setState({ loading: true })); }; renderBrowser = () => { + const { record } = this.props; const { targetType, targetTypeIds, targetTypeIdsNames } = this.state; let browserType = {}; switch (targetType) { @@ -177,9 +178,9 @@ class PersonalScopeModal extends Component { return { this.setState({ targetTypeIds, targetTypeIdsNames }); @@ -188,7 +189,7 @@ class PersonalScopeModal extends Component { }; handleReset = () => { this.setState({ - targetType: "EMPLOYEE", + targetType: !_.isEmpty(this.props.record) ? this.props.record.targetType : "EMPLOYEE", targetTypeIds: "", status: "", statusAll: "" @@ -196,7 +197,7 @@ class PersonalScopeModal extends Component { }; render() { - const { onCancel, title, visible } = this.props; + const { onCancel, title, visible, record } = this.props; const { employeeStatus, targetTypeList, targetType, status, statusAll, loading } = this.state; const buttons = [ , @@ -224,6 +225,7 @@ class PersonalScopeModal extends Component {
this.setState({ targetType })} diff --git a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js index 21a55e0d..5faaf8a9 100644 --- a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js +++ b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js @@ -60,7 +60,7 @@ class PersonalScopeTable extends Component { return { ...item, render: (text, record) => { - if (record.targetTypeName === "SQL" && item.dataIndex === "targetName") { + if (item.dataIndex === "targetName") { return this.props.onEditScope(record)}>{text}; } return {text}; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less index ba7c1af7..96d0463d 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less @@ -249,7 +249,7 @@ padding: 0; background: transparent; border: none; - font-size: 20px; + font-size: 20px!important; line-height: 20px; } diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js index 92d65289..0b71af53 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js @@ -340,9 +340,7 @@ class LedgerAssociatedPersonnel extends Component { onCancel={() => this.setState({ personalAddModal: { - ...personalAddModal, - visible: false, - includeType: "" + ...personalAddModal, record: {}, includeType: "", visible: false } }) } diff --git a/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js b/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js index 93dbc6d3..59ad23fa 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js @@ -21,7 +21,8 @@ export default class AddTaxAgentModal extends React.Component { selectedKey: "EMPLOYEE", checkboxValue: "", checkAll: "0", - ids: "" + ids: "", + idsName: "" }; } @@ -35,7 +36,8 @@ export default class AddTaxAgentModal extends React.Component { selectedKey: nextProps.scopeRecord.targetType, checkboxValue: nextProps.scopeRecord.status, checkAll: bool ? "1" : "0", - ids: nextProps.scopeRecord.target + ids: nextProps.scopeRecord.targetType === "SQL" ? nextProps.scopeRecord.target : String(nextProps.scopeRecord.targetId), + idsName: nextProps.scopeRecord.targetName }); } else { this.handleReset(); @@ -91,10 +93,11 @@ export default class AddTaxAgentModal extends React.Component { // 重置 handleReset = () => { this.setState({ - selectedKey: !_.isEmpty(this.props.scopeRecord) ? "SQL" : "EMPLOYEE", + selectedKey: !_.isEmpty(this.props.scopeRecord) ? this.props.scopeRecord.targetType : "EMPLOYEE", checkboxValue: "", checkAll: "0", - ids: "" + ids: "", + idsName: "" }); }; @@ -148,11 +151,12 @@ export default class AddTaxAgentModal extends React.Component { type={17} viewAttr={3} value={this.state.ids} + replaceDatas={[{ id: this.state.ids, name: this.state.idsName }]} title={"人员选择"} - isSingle={false} + isSingle={!_.isEmpty(scopeRecord)} inputStyle={{ width: 200 }} onChange={(ids, names, datas) => { - this.setState({ ids }); + this.setState({ ids, idsName: names }); }} /> @@ -166,11 +170,12 @@ export default class AddTaxAgentModal extends React.Component { type={57} viewAttr={3} title="部门选择" - isSingle={false} + isSingle={!_.isEmpty(scopeRecord)} inputStyle={{ width: 200 }} value={this.state.ids} + replaceDatas={[{ id: this.state.ids, name: this.state.idsName }]} onChange={(ids, names, datas) => { - this.setState({ ids }); + this.setState({ ids, idsName: names }); }} /> @@ -184,11 +189,12 @@ export default class AddTaxAgentModal extends React.Component { type={164} viewAttr={3} title={"分部选择"} - isSingle={false} + isSingle={!_.isEmpty(scopeRecord)} inputStyle={{ width: 200 }} value={this.state.ids} + replaceDatas={[{ id: this.state.ids, name: this.state.idsName }]} onChange={(ids, names, datas) => { - this.setState({ ids }); + this.setState({ ids, idsName: names }); }} /> @@ -202,11 +208,12 @@ export default class AddTaxAgentModal extends React.Component { type={278} viewAttr={3} title={"岗位选择"} - isSingle={false} + isSingle={!_.isEmpty(scopeRecord)} value={this.state.ids} + replaceDatas={[{ id: this.state.ids, name: this.state.idsName }]} inputStyle={{ width: 200 }} onChange={(ids, names, datas) => { - this.setState({ ids }); + this.setState({ ids, idsName: names }); }} /> diff --git a/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js b/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js index 4f842810..78168514 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js @@ -73,7 +73,8 @@ export default class SlideTaxagentUser extends React.Component { closeModal = () => { this.setState({ addTaxagentModalVisible: false, - externalPersonModalVisible: false + externalPersonModalVisible: false, + scopeRecord: {} }, () => { this.addTaxRef && this.addTaxRef.handleReset(); }); @@ -233,7 +234,7 @@ export default class SlideTaxagentUser extends React.Component { columns={_.map(taxAgentColumns, o => { return { ...o, render: (text, record) => { - if (record.targetType === "SQL" && o.dataIndex === "targetName") { + if (o.dataIndex === "targetName") { return { const key = includeType === "2" ? "externalPersonModalVisible" : "addTaxagentModalVisible"; this.setState({ [key]: true, scopeRecord: record });