Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线

pc4mobx/hrmSalary/components/pcTemplate/index.less

@@ -155,13 +155,14 @@
               .item-count {
                 //flex-basis: 328px;
                 flex: 1;
-                padding-left: 16px;
+                padding: 12px 16px;
                 height: 100%;
-                line-height: 40px;
                 background: #fff;
                 font-size: 12px;
                 color: #5F5F5F;
                 word-break: break-all;
+                display: flex;
+                align-items: center;
               }
             }
           }

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

@@ -153,6 +153,36 @@ export const salaryDetailSearchConditions = [
         multiple: true,
         viewAttr: 2
       },
+      {
+        browserConditionParam: {
+          completeParams: {},
+          conditionDataParams: {},
+          dataParams: {},
+          destDataParams: {},
+          hasAddBtn: false,
+          hasAdvanceSerach: false,
+          idSeparator: ",",
+          isAutoComplete: 1,
+          isDetail: 0,
+          isMultCheckbox: false,
+          isSingle: false,
+          icon: "icon-coms-hrm",
+          linkUrl: "",
+          pageSize: 10,
+          quickSearchName: "",
+          replaceDatas: [],
+          title: "",
+          type: "17",
+          viewAttr: 2
+        },
+        colSpan: 1,
+        conditionType: "BROWSER",
+        domkey: ["employeeIds"],
+        fieldcol: 16,
+        label: getLabel(111, "人员"),
+        labelcol: 8,
+        viewAttr: 2
+      },
       {
         browserConditionParam: {
           completeParams: {},

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

@@ -109,12 +109,13 @@ class SalaryDetails extends Component {
   getSalaryList = (props) => {
     const { attendanceStore: { salaryDetailSearchForm, tableStore }, dateRange } = props || this.props;
     const [startDateStr, endDateStr] = dateRange;
-    const { taxAgentIds, subcompanyIds, departmentIds, ...extra } = salaryDetailSearchForm.getFormParams();
+    const { taxAgentIds, subcompanyIds, departmentIds, employeeIds, ...extra } = salaryDetailSearchForm.getFormParams();
     const { pageInfo, transferDialog, updateSum } = this.state;
     const payload = {
       taxAgentIds: taxAgentIds ? taxAgentIds.split(",") : [],
       departmentIds: departmentIds ? departmentIds.split(",") : [],
       subcompanyIds: subcompanyIds ? subcompanyIds.split(",") : [],
+      employeeIds: employeeIds ? employeeIds.split(",") : [],
       ...extra, ...pageInfo, startDateStr, endDateStr
     };
     this.setState({ loading: true });

pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less

@@ -182,7 +182,7 @@
     }
 
     .wea-advanced-searchsAd {
-      height: 155px;
+      height: 200px;
       overflow: hidden auto;
 
       .formItem-delete {