release/2.17.1.2411.01

pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js

@@ -143,6 +143,7 @@ class CustomTransferDialog extends Component {
     const buttons = [
       <Button type="primary" loading={saveLoading} onClick={this.handleOk}
               disabled={_.isEmpty(rightDatas)}>{getLabel(111, "确 定")}</Button>,
+      ...btns,
       <Button type="ghost" onClick={this.props.onCancel}>{getLabel(111, "取 消")}</Button>];
     let rightActive = false, leftActive = false, rightAllActive = false;
     if (leftListSelectedKeys && leftListSelectedKeys.length > 0) rightActive = true;
@@ -201,7 +202,7 @@ class CustomTransferDialog extends Component {
         className="custom_browser_dialog" draggable={false} style={{
         width: 784, height: 460, minHeight: 200, minWidth: 380,
         maxHeight: "90%", maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
-      }} buttons={[...btns, ...buttons]}>{dom}</WeaDialog>
+      }} buttons={buttons}>{dom}</WeaDialog>
     );
   }
 }

pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js

@@ -253,6 +253,7 @@ class SalaryDetails extends Component {
   render() {
     const { loading, dataSource, transferDialog, tempDialog, tempPageList, templateId } = this.state;
     const { attendanceStore: { tableStore }, dateRange, showSearchAd, salaryDetailShowType } = this.props;
+    const { dataParams: { defaultSetting } } = transferDialog;
     return (<React.Fragment>
         <div className="query-div">
           {
@@ -295,8 +296,9 @@ class SalaryDetails extends Component {
           {/*/>*/}
           {/*默认显示列,薪资模板列表*/}
           <CustomTransferDialog {...transferDialog} onChange={this.savePageListSetting}
-                                btns={[<Button type="ghost"
-                                               onClick={this.resetColsSetting}>{getLabel(111, "重置")}</Button>]}
+                                btns={defaultSetting === "0" ?
+                                  [<Button type="primary"
+                                           onClick={this.resetColsSetting}>{getLabel(111, "恢复默认显示列")}</Button>] : []}
                                 onCancel={() => this.setState({
                                   transferDialog: {
                                     ...transferDialog, completeURL: "", visible: false, type: "default"