this.setState({ visible: false }, () => callback && callback())}/>
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/deductionListConfirmEmployeeDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/deductionListConfirmEmployeeDialog.js
index 66388df3..1f094b81 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/deductionListConfirmEmployeeDialog.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/deductionListConfirmEmployeeDialog.js
@@ -92,14 +92,8 @@ class DeductionListConfirmEmployeeDialog extends Component {
onClick={this.save}>{getLabel(111, "确认")},
]}
style={{
- width: 1150,
- height: 606.6,
- minHeight: 200,
- minWidth: 380,
- maxHeight: "90%",
- maxWidth: "90%",
- overflow: "hidden",
- transform: "translate(0px, 0px)"
+ width: 1150, height: 490, minHeight: 200, minWidth: 380, maxHeight: "90%", maxWidth: "90%",
+ overflow: "hidden", transform: "translate(0px, 0px)"
}}>
{getLabel(111, "批量编辑")}*/}
{/*{getLabel(81272, "导出全部")}*/}
{/*{getLabel(543715, "导出所选")}*/}
- {/*{getLabel(111, "扣除名单确认")}*/}
+ {getLabel(111, "扣除名单确认")}
);
const buttons = [
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
index 655ec57d..174530b2 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
@@ -209,20 +209,30 @@
}
//扣除名单确认
-.confirmationDialogContent {
- width: 100%;
- height: 100%;
- background: #f6f6f6;
- padding: 8px 16px;
+.confirmationDialog {
+ .title-right {
+ text-align: right;
- .tableBtns {
- display: grid;
- grid-template-columns: auto auto;
- justify-content: end;
- gap: 10px;
+ button {
+ margin-left: 10px;
+ }
}
- .wea-new-table {
- background: #FFF;
+ .confirmationDialogContent {
+ width: 100%;
+ height: 100%;
+ background: #f6f6f6;
+ padding: 8px 16px;
+
+ .tableBtns {
+ display: grid;
+ grid-template-columns: auto auto;
+ justify-content: end;
+ gap: 10px;
+ }
+
+ .wea-new-table {
+ background: #FFF;
+ }
}
}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
index 32c97639..5738f9eb 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
@@ -41,6 +41,10 @@
.baseSettingWrapper {
padding: 12px 12px 12px 20px;
+ .wea-form-item-wrapper {
+ display: inline-block !important;
+ }
+
.baseSettingLeft {
border: 1px solid #ebedf0;
padding: 0 !important;
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
index e0440379..a192c791 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
@@ -46,7 +46,7 @@ class LedgerSalaryItemBaseInfo extends Component {
};
handleDeleteEmplist = (item) => {
const { dataSource, onChangeSortableList } = this.props;
- onChangeSortableList(_.xorWith(dataSource, [item], _.isEqual));
+ onChangeSortableList(_.filter(dataSource, o => o.id !== item.id));
};
render() {
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.less b/pc4mobx/hrmSalary/pages/salaryItem/index.less
index cdefaef7..8a45ff7a 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.less
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.less
@@ -200,6 +200,7 @@
border: 1px solid #e5e5e5 !important;
padding: 4px 8px !important;
min-height: 70px !important;
+ word-wrap: break-word;
}
}
}