Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01

pc4mobx/hrmSalary/pages/salaryItem/columns.js

@@ -163,7 +163,7 @@ export const salarySetConditions = [
       checkboxValue: false,
       conditionType: "SELECT",
       domkey: ["salarySobIds"],
-      fieldcol: 18,
+      fieldcol: 14,
       label: "薪资账套",
       lanId: 538010,
       labelcol: 6,

pc4mobx/hrmSalary/pages/salaryItem/index.js

@@ -323,7 +323,7 @@ export default class SalaryItem extends React.Component {
                   })}
           >{getLabel(111, "同步到薪资账套")}</Button>,
           <Button type="primary" onClick={() => {
-            handleSlideSave(false);
+            handleSlideSave(true);
           }}>保存</Button>
         ];
       }

pc4mobx/hrmSalary/pages/salaryItem/index.less

@@ -105,6 +105,26 @@
 
 .salarySetDialog {
   .salarySetDialogContent {
+    background: #f6f6f6;
+
+    .wea-search-group {
+      padding: 16px;
+    }
+
+    .wea-content {
+      padding: 0;
+
+      .wea-form-cell-wrapper {
+        background: #FFF;
+        border: 1px solid #e5e5e5;
+        border-bottom: none;
+
+        .wea-form-cell {
+          border-bottom: 1px solid #e5e5e5;
+        }
+      }
+    }
+
     .wea-select, .ant-select, .ant-select-selection {
       width: 100%;
     }
@@ -125,7 +145,7 @@
       height: 30px;
       white-space: nowrap;
       min-width: 100px;
-      max-width: 345px;
+      max-width: 237px;
       width: 100%;
       display: inline-block;
       padding: 4px 17px 4px 4px;

pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js

@@ -80,7 +80,7 @@ class SyncToSalaryAccountSetDialog extends Component {
     return (
       <WeaDialog
         {...this.props} className="salarySetDialog" initLoadCss
-        style={{ width: 550 }}
+        style={{ width: 480 }}
         buttons={[<Button type="primary" onClick={this.save}
                           loading={this.state.loading}>{getLabel(537558, "确定")}</Button>]}
       >

pc4mobx/hrmSalary/stores/salaryItem.js

@@ -309,7 +309,7 @@ export class SalaryItemStore {
           if (!continueFlag) {
             this.editSlideVisible = false;
           }
-          this.initRequest();
+          ((!params.id && continueFlag) || !continueFlag) && this.initRequest();
           message.success("保存成功");
           resolve();
         } else {