From 52121e2713b1f32e72450a1ae8cc8e452d404f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 25 Nov 2022 11:47:29 +0800 Subject: [PATCH] 3 --- .../components/condition.js | 69 ++++++++++++++++++- .../specialAddDeduction/index.js | 5 +- 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js index 5f1187c7..aec25fae 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js +++ b/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 } ]; diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js index 97e8d8e1..1b58ad6d 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js +++ b/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) : this.inlineForm = dom} taxAgentOption={taxAgentAdminOption}