Merge branch 'release/2.15.2.2409.01' into feature/2.15.1.2407.01-权限

pc4mobx/hrmSalary/pages/reportView/components/condition.js

@@ -91,36 +91,36 @@ export const condition = [
         labelcol: 6,
         viewAttr: 2
       },
-      // {
-      //   browserConditionParam: {
-      //     completeParams: {},
-      //     conditionDataParams: {},
-      //     dataParams: {},
-      //     destDataParams: {},
-      //     hasAddBtn: false,
-      //     hasAdvanceSerach: true,
-      //     idSeparator: ",",
-      //     isAutoComplete: 1,
-      //     isDetail: 0,
-      //     isMultCheckbox: false,
-      //     isSingle: false,
-      //     linkUrl: "",
-      //     pageSize: 10,
-      //     quickSearchName: "",
-      //     replaceDatas: [],
-      //     title: getLabel(111, "岗位"),
-      //     type: "278",
-      //     viewAttr: 2
-      //   },
-      //   colSpan: 2,
-      //   conditionType: "BROWSER",
-      //   domkey: ["position"],
-      //   fieldcol: 18,
-      //   isQuickSearch: false,
-      //   label: getLabel(111, "岗位"),
-      //   labelcol: 6,
-      //   viewAttr: 2
-      // },
+      {
+        browserConditionParam: {
+          completeParams: {},
+          conditionDataParams: {},
+          dataParams: {},
+          destDataParams: {},
+          hasAddBtn: false,
+          hasAdvanceSerach: true,
+          idSeparator: ",",
+          isAutoComplete: 1,
+          isDetail: 0,
+          isMultCheckbox: false,
+          isSingle: false,
+          linkUrl: "",
+          pageSize: 10,
+          quickSearchName: "",
+          replaceDatas: [],
+          title: getLabel(111, "岗位"),
+          type: "278",
+          viewAttr: 2
+        },
+        colSpan: 2,
+        conditionType: "BROWSER",
+        domkey: ["position"],
+        fieldcol: 18,
+        isQuickSearch: false,
+        label: getLabel(111, "岗位"),
+        labelcol: 6,
+        viewAttr: 2
+      },
       {
         browserConditionParam: {
           completeParams: {},

pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js

@@ -152,7 +152,7 @@ class StatisticalMicroSettingsSlide extends Component {
       hiredate: extra["hiredate1__hiredate2"].value || [],
       department: _.map(department.valueObj, it => ({ id: it.id, name: it.name })),
       employee: _.map(employee.valueObj, it => ({ id: it.id, name: it.name })),
-      // position: _.map(position.valueObj, it => ({ id: it.id, name: it.name })),
+      position: _.map(position.valueObj, it => ({ id: it.id, name: it.name })),
       subCompany: _.map(subCompany.valueObj, it => ({ id: it.id, name: it.name })),
       taxAgent: value ? _.map(value.split(","), (it, idx) => ({ id: it, name: valueSpan.split(",")[idx] })) : [],
       status: statusVal ? _.map(statusVal.split(","), (it, idx) => ({

pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js

@@ -105,7 +105,7 @@ class Index extends Component {
     };
     return (
       <WeaTable columns={columns} dataSource={dataSource} loading={loading} bordered
-                pagination={pagination} scroll={{ y: `calc(100vh - 202px)` }}/>
+                pagination={pagination} scroll={{ y: `calc(100vh - 170px)` }}/>
     );
   }
 }

pc4mobx/hrmSalary/pages/variableSalary/index.js

@@ -97,7 +97,7 @@ class Index extends Component {
     const { taxAgentStore: { showOperateBtn }, baseTableStore: { VSSalaryItemForm } } = this.props;
     const tabs = [
       {
-        title: getLabel(111, "薪资档案"), key: "salaryFile", showDropIcon: true,
+        title: getLabel(111, "浮动数据"), key: "salaryFile", showDropIcon: true,
         dropMenuDatas: showOperateBtn ? [
           { key: "export", icon: <i className="icon-coms-export"/>, content: getLabel(111, "导出") },
           { key: "custom_cols", icon: <i className="icon-coms-Custom"/>, content: getLabel(32535, "显示列定制") }
@@ -125,7 +125,7 @@ class Index extends Component {
                                   onViewSalaryFile={(data) => this.handleOperate("create", data)}/>
       },
       {
-        title: getLabel(111, "薪资项目"), key: "salaryItem", showDropIcon: false, dropMenuDatas: [],
+        title: getLabel(111, "字段管理"), key: "salaryItem", showDropIcon: false, dropMenuDatas: [],
         buttons: showOperateBtn ? [
           <Button type="primary" onClick={() => this.setState({
             SIDialog: { visible: true, id: "", title: getLabel(111, "新增薪资项目") }

pc4mobx/hrmSalary/pages/variableSalary/index.less

@@ -4,7 +4,6 @@
   }
 
   .wea-new-top-req-content {
-    padding: 16px;
 
     .wea-new-table {
       background: #FFF;

pc4mobx/hrmSalary/style/index.less

@@ -39,6 +39,10 @@
 .form-dialog-layout {
   background: #f6f6f6;
 
+  .wea-form-item .wea-form-item-wrapper .wea-field-readonly {
+    line-height: 28px;
+  }
+
   .wea-search-group {
     padding: 16px;
   }