custom-艾志工业-合并个税

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

@@ -241,6 +241,98 @@ export const salaryDetailSearchConditions = [
         label: getLabel(27511, "部门"),
         labelcol: 8,
         viewAttr: 2
+      },
+      {
+        browserConditionParam: {
+          completeParams: {
+            type: 162,
+            fielddbtype: "browser.htlx"
+          },
+          conditionDataParams: {
+            type: "browser.htlx"
+          },
+          dataParams: {
+            type: "browser.htlx"
+          },
+          destDataParams: {
+            type: "browser.htlx"
+          },
+          hasAddBtn: false,
+          hasAdvanceSerach: false,
+          idSeparator: ",",
+          isAutoComplete: 1,
+          isDetail: 0,
+          isMultCheckbox: true,
+          isSingle: false,
+          icon: "icon-coms-hrm",
+          linkUrl: "",
+          pageSize: 10,
+          quickSearchName: "",
+          replaceDatas: [],
+          title: "合同签署类型",
+          type: "162",
+          viewAttr: 2
+        },
+        colSpan: 2,
+        conditionType: "BROWSER",
+        domkey: ["htqslxList"],
+        fieldcol: 16,
+        label: "合同签署类型编号",
+        lanId: 111,
+        labelcol: 8,
+        viewAttr: 2
+      },
+      {
+        browserConditionParam: {
+          completeParams: {
+            type: 162,
+            fielddbtype: "browser.rsdlgs"
+          },
+          conditionDataParams: {
+            type: "browser.rsdlgs"
+          },
+          dataParams: {
+            type: "browser.rsdlgs"
+          },
+          destDataParams: {
+            type: "browser.rsdlgs"
+          },
+          hasAddBtn: false,
+          hasAdvanceSerach: false,
+          idSeparator: ",",
+          isAutoComplete: 1,
+          isDetail: 0,
+          isMultCheckbox: true,
+          isSingle: false,
+          icon: "icon-coms-hrm",
+          linkUrl: "",
+          pageSize: 10,
+          quickSearchName: "",
+          replaceDatas: [],
+          title: "人事代理公司",
+          type: "162",
+          viewAttr: 2
+        },
+        colSpan: 2,
+        conditionType: "BROWSER",
+        domkey: ["rsdlgsList"],
+        fieldcol: 16,
+        label: "人事代理公司编号",
+        lanId: 111,
+        labelcol: 8,
+        viewAttr: 2
+      },
+      {
+        colSpan: 2,
+        conditionType: "SELECT",
+        domkey: ["statuses"],
+        fieldcol: 16,
+        label: "状态",
+        lanId: 535101,
+        labelcol: 8,
+        options: [],
+        detailtype: 3,
+        viewAttr: 2
       }
     ],
     defaultshow: true,

pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/searchPannel/index.js

@@ -36,6 +36,14 @@ class SalaryDetailAdvanceSearchPannel extends Component {
               return {
                 ...child, options: _.map(taxAgentList, o => ({ key: o.id, showname: o.content }))
               };
+            } else if (getKey(child) === "statuses") {
+              return {
+                ...child, label: getLabel(child.lanId, child.label),
+                options: [
+                  { key: "5", showname: getLabel(111, "离职") },
+                  { key: "0,1,2,3,4,6", showname: getLabel(111, "非离职") }
+                ]
+              };
             }
             return { ...child };
           })

pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js

@@ -323,7 +323,7 @@ class Index extends Component {
       }
     ];
     const tabs = [
-      { key: "statistics", title: getLabel(111, "统计表") },
+      { key: "statistics", title: getLabel(111, "月薪资对比") },
       // { key: "detail", title: getLabel(111, "员工明细") },
       { key: "salaryDetail", title: getLabel(111, "薪资明细") }
     ];

pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less

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