diff --git a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js index d8824c8b..a053cfa7 100644 --- a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js +++ b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js @@ -95,7 +95,7 @@ class PersonalScopeTable extends Component { render() { const { dataSource, columns, pageInfo, loading, selectedRowKeys } = this.state; - const { onChangeSelectKey } = this.props; + const { onChangeSelectKey, showOperateBtn } = this.props; const pagination = { ...pageInfo, showTotal: total => `共 ${total} 条`, @@ -128,7 +128,7 @@ class PersonalScopeTable extends Component { return ( { const { ledgerStore } = this.props; const { copyForm: form } = ledgerStore; - postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" }) + postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" }) .then(({ status, data }) => { if (status) { const conditions = _.map(copyConditions, it => { diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less index 5ed5c65c..3680c269 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less @@ -147,6 +147,10 @@ display: flex; align-items: center; + .wea-ignore-node i { + display: none; + } + .wea-sortable-grid-item { display: inline-block; border: none; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRule.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRule.js index 1a19b304..3cdb2983 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRule.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRule.js @@ -61,10 +61,11 @@ class LedgerAccountApprRule extends Component { } renderForm = (form, conditions) => { - const { saveSalarySobId, editId } = this.props; + const { saveSalarySobId, editId, record } = this.props; const { approvalItemGroup } = this.state; const { isFormInit } = form; const formParams = form.getFormParams(); + const showOperateBtn = editId ? record.opts.includes("admin") : true; let group = []; isFormInit && conditions && conditions.map(c => { let items = []; @@ -76,8 +77,8 @@ class LedgerAccountApprRule extends Component { wrapperCol={{ span: `${fields.fieldcol}` }} error={form.getError(fields)} tipPosition="bottom" > - + ), hide: fields.hide }); @@ -89,6 +90,7 @@ class LedgerAccountApprRule extends Component { tipPosition="bottom" > this.setState({ approvalItemGroup: _.map(approvalItemGroup, o => ({ ...o, diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountSalaryItemsSet.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountSalaryItemsSet.js index 1f53c37b..7a4ee3cc 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountSalaryItemsSet.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountSalaryItemsSet.js @@ -55,26 +55,29 @@ class LedgerAccountSalaryItemsSet extends Component { render() { const { editDialog, salaryItemDialog } = this.state; - const { datas } = this.props; + const { datas, showOperateBtn = true } = this.props; return (
- this.setState({ - editDialog: { visible: true, title: getLabel(111, "添加分类") } - })}/> - + { + showOperateBtn && this.setState({ + editDialog: { visible: true, title: getLabel(111, "添加分类") } + })}/> + }
({ ...o, filter: !showOperateBtn }))} onChange={list => this.props.onChange(list)} renderNodeItem={(item) => { return
{item.groupName} - + { + showOperateBtn && + this.setState({ editDialog: { visible: true, groupName: item.groupName, groupId: item.id, title: getLabel(111, "分类名称编辑") @@ -82,14 +85,17 @@ class LedgerAccountSalaryItemsSet extends Component { })}/> this.handleDeleteClick(item)}/> + } - this.handleAddSalaryItems(item)}/> + { + showOperateBtn && this.handleAddSalaryItems(item)}/> + }
{ !_.isEmpty(item.approvalItems) ? ({ ...o, filter: !showOperateBtn }))} onChange={(items) => this.props.onChange( _.map(datas, child => { if (child.id === item.id) { @@ -102,7 +108,10 @@ class LedgerAccountSalaryItemsSet extends Component { return
{filed.salaryItemName}
- this.handleDeleteClick(item, filed)}/> + { + showOperateBtn && + this.handleDeleteClick(item, filed)}/> + }
; }} diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js index d0651065..dea5364c 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js @@ -106,7 +106,7 @@ class LedgerBaseSetting extends Component { }); }; getTaxAgentSelectListAsAdmin = () => { - postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" }) + postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" }) .then(({ status, data }) => { if (status) { this.setState({ diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js index cef3b2e6..e0440379 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js @@ -51,17 +51,17 @@ class LedgerSalaryItemBaseInfo extends Component { render() { const { dataSource, onChangeSortableList, onPreview, editId, record } = this.props; + const admin = editId ? record.opts.includes("admin") : true; const { empFieldListOptions } = this.state; const options = _.map(empFieldListOptions, o => ({ ...o, disabled: _.map(dataSource, g => g.fieldId).includes(o.key) })); if (_.isEmpty(dataSource) || _.isEmpty(options)) return null; - const admin = editId ? record.opts.includes("admin") : true; return ( }>
({ ...o, filter: !admin }))} draggableType="icon" onChange={onChangeSortableList} renderNodeItem={(item) => { diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js index c7dd907d..ff15f166 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js @@ -182,6 +182,7 @@ class LedgerSalaryItemNormal extends Component { > childItem.uuid === uuid).items} salarySobId={editId || saveSalarySobId} selectedRowKeys={field.selectedRowKeys || []} diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 4f126ef9..76808a84 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -231,7 +231,7 @@ class LedgerSalaryItemTable extends Component { render() { const { salaryItemPayload, editFormulModal, originRecord } = this.state; - const { onHandleItemhide } = this.props; + const { onHandleItemhide, showOperateBtn } = this.props; const { tableData, dataSource, onDropCategoryItem, onChangeSelectedRowKeys, selectedRowKeys, onMoveTo @@ -315,16 +315,16 @@ class LedgerSalaryItemTable extends Component { record.id || record.key} - rowSelection={rowSelection} + rowSelection={showOperateBtn ? rowSelection : null} dataSource={tableData} - columns={columns} + columns={showOperateBtn ? columns : _.filter(columns, o => (o.dataIndex !== "operate" && o.dataIndex !== "itemHide"))} onRow={(record, index) => ({ index, moveRow: record })} pagination={false} onDrop={onDropCategoryItem} - draggable={dataSource.length === tableData.length} + draggable={dataSource.length === tableData.length && showOperateBtn} /> { perDisabled: !_.includes(_.map(itemList, o => o.paymentScopeSign), "per"), perValidNum: !_.isEmpty(_.filter(itemList, i => i.paymentScopeSign === "per")) ? _.filter(itemList, i => i.paymentScopeSign === "per")[0].validNum : 2, comDisabled: !_.includes(_.map(itemList, o => o.paymentScopeSign), "com"), - comValidNum: !_.isEmpty(_.filter(itemList, i => i.paymentScopeSign === "com")) ? _.filter(itemList, i => i.paymentScopeSign === "com")[0].validNum : 2, + comValidNum: !_.isEmpty(_.filter(itemList, i => i.paymentScopeSign === "com")) ? _.filter(itemList, i => i.paymentScopeSign === "com")[0].validNum : 2 }); }); return endList.push(data); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js index 077d7bfc..0fcf5898 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js @@ -63,7 +63,7 @@ class Index extends Component { }; } else if (getKey(o) === "paymentType" || getKey(o) === "sharedType") { return { - ...o, label: getLabel(o.lanId, o.label), + ...o, label: getLabel(o.lanId, o.label), viewAttr: showOperateBtn ? o.viewAttr : 1, options: _.map(o.options, k => ({ ...k, showname: getLabel(k.lanId, k.showname) })) }; }