Merge branch 'hotfix/v2-1124' into develop

pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js

@@ -65,7 +65,74 @@ export const condition = [
         viewAttr: 2
       }
     ],
-    title: '数据采集',
+    title: "数据采集",
+    defaultshow: true
+  }
+];
+
+export const searchCondition = [
+  {
+    items: [
+      {
+        conditionType: "INPUT",
+        domkey: ["username"],
+        fieldcol: 16,
+        label: "姓名",
+        labelcol: 8,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "BROWSER",
+        domkey: ["departmentName"],
+        browserConditionParam: {
+          linkUrl: "/spa/hrm/engine.html#/hrmengine/organization?showTree=false&type=department&id=",
+          tabs: [
+            {
+              dataParams: null,
+              dataURL: null,
+              isSearch: false,
+              key: "2",
+              name: "组织结构",
+              selected: false,
+              showOrder: 0
+            },
+            {
+              dataParams: { list: "1" },
+              dataURL: null,
+              isSearch: true,
+              key: "1",
+              name: "按列表",
+              selected: false,
+              showOrder: 0
+            }
+          ],
+          title: '部门',
+          type: "4",
+          viewAttr: 2,
+          pageSize: 10,
+          noOperate: true,
+          isMultCheckbox: false,
+          icon: "icon-coms-hrm",
+          iconBgcolor: "#217346"
+        },
+        fieldcol: 16,
+        label: "部门",
+        labelcol: 8,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["jobNum"],
+        fieldcol: 16,
+        label: "工号",
+        labelcol: 8,
+        value: "",
+        viewAttr: 2
+      }
+    ],
+    title: "常用条件",
     defaultshow: true
   }
 ];

pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js

@@ -8,7 +8,7 @@ import * as API from "../../../apis/special";
 import SlideModalTitle from "../../../components/slideModalTitle";
 import AddItems from "../addItems";
 import SpecialAddContent from "./components/specialAddContent";
-import { condition } from "./components/condition";
+import { condition, searchCondition } from "./components/condition";
 import ImportModal from "../../../components/importModal";
 import { specialModalColumns } from "../cumDeduct/columns";
 import "./index.less";
@@ -351,8 +351,9 @@ class SpecialAddDeduction extends Component {
   };
   getSearchsAdQuick = (isAd) => {
     const { advanceParams } = this.state;
+    // advanceParams.condition
     const { taxAgentStore: { taxAgentAdminOption }, specialAddStore: { advanceForm } } = this.props;
-    return isAd ? getSearchs(advanceForm, advanceParams.condition, 2)
+    return isAd ? getSearchs(advanceForm, searchCondition, 2)
       : <InlineForm
         ref={dom => this.inlineForm = dom}
         taxAgentOption={taxAgentAdminOption}