Merge branch 'hotfix/2.9.42310.01' into develop

pc4mobx/hrmSalary/apis/mySalaryBenefits.js

@@ -1,4 +1,5 @@
 import { WeaTools } from "ecCom";
+import { convertToUrlString } from "../util/url";
 
 // 工资单列表
 export const mySalaryBillList = params => {
@@ -25,7 +26,13 @@ export const recordList = params => {
 
 // 工资查看详情
 export const mySalaryBill = params => {
-  return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/mySalaryBill", "GET", params);
+  return fetch(`/api/bs/hrmsalary/salaryBill/mySalaryBill?${convertToUrlString(params)}`, {
+    method: "GET",
+    mode: "cors",
+    headers: {
+      "Content-Type": "application/json"
+    }
+  }).then(res => res.json());
 };
 
 export const isNeedSecondPwdVerify = params => {

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

@@ -50,7 +50,6 @@ export const condition = [
         options: [],
         viewAttr: 2,
         helpfulTip: "",
-        hide: true
       },
       {
         colSpan: 1,
@@ -92,7 +91,6 @@ export const reportCondition = [
         rules: "required|string",
         viewAttr: 3,
         helpfulTip: "",
-        hide: true
       }
     ],
     title: "",