diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/advanceInputBtn/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/advanceInputBtn/index.js index 97fe5c49..95b36e5b 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/advanceInputBtn/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/advanceInputBtn/index.js @@ -1,7 +1,7 @@ import React, { Component } from "react"; import { inject, observer } from "mobx-react"; import { Button } from "antd"; -import { WeaInputSearch, WeaLocaleProvider } from "ecCom"; +import { WeaLocaleProvider } from "ecCom"; import "./index.less"; const getLabel = WeaLocaleProvider.getLabel; @@ -12,14 +12,7 @@ class Index extends Component { render() { const { calculateStore: { ECSearchForm } } = this.props; return ( -
- ECSearchForm.updateFields({ employeeName: v })} - onSearch={this.props.onAdvanceSearch} - /> - -
+ ); } } diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js index 332d1a91..ebb23b69 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js @@ -1,15 +1,46 @@ export const editCalcSearchConditions = [ { items: [ + // { + // colSpan: 2, + // conditionType: "INPUT", + // domkey: ["employeeName"], + // fieldcol: 12, + // label: "姓名", + // lanId: 25034, + // labelcol: 6, + // value: "", + // viewAttr: 2 + // }, { - colSpan: 2, - conditionType: "INPUT", - domkey: ["employeeName"], + 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: 12, - label: "姓名", - lanId: 25034, + label: "人员", + lanId: 111, labelcol: 6, - value: "", viewAttr: 2 }, { @@ -150,6 +181,86 @@ export const editCalcSearchConditions = [ options: [], 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: 12, + label: "合同签署类型编号", + lanId: 111, + labelcol: 6, + 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: 12, + label: "人事代理公司编号", + lanId: 111, + labelcol: 6, + viewAttr: 2 + }, { colSpan: 2, conditionType: "CHECKBOX", diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js index ea364d59..349f77a7 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js @@ -44,12 +44,20 @@ class EditCalcAdvanceSearchPannel extends Component { { key: "0,1,2,3,4,6", showname: getLabel(111, "非离职") } ] }; - } else if (getKey(o) === "submitStatus" || getKey(o) === "approveStatus") { + } else if (getKey(o) === "submitStatus") { return { ...o, label: getLabel(o.lanId, o.label), options: [ + { key: "", showname: "" }, { key: "NOT_SUBMITTED", showname: getLabel(111, "未提交") }, - { key: "SUBMITTED", showname: getLabel(111, "已提交") }, + { key: "SUBMITTED", showname: getLabel(111, "已提交") } + ] + }; + } else if (getKey(o) === "approveStatus") { + return { + ...o, label: getLabel(o.lanId, o.label), + options: [ + { key: "", showname: "" }, { key: "NOT_APPROVED", showname: getLabel(111, "未审核") }, { key: "APPROVED", showname: getLabel(111, "已审核") } ] diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 8ca97bd2..92453039 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -253,13 +253,18 @@ class EditCalcTable extends Component { taxAgentStore: { showOperateBtn, PageAndOptAuth }, calcDetail = false } = this.props; const { confirmAuth, submitAuth } = toJS(PageAndOptAuth); - const { subcompanyIds, departmentIds, positionIds, statuses, ...extra } = ECSearchForm.getFormParams(); + const { + employeeIds, subcompanyIds, departmentIds, positionIds, statuses, htqslxList, rsdlgsList, ...extra + } = ECSearchForm.getFormParams(); const payload = { salaryAcctRecordId, ...pageInfo, ...extra, otherConditions, + employeeIds: !_.isEmpty(employeeIds) ? employeeIds.split(",") : [], departmentIds: !_.isEmpty(departmentIds) ? departmentIds.split(",") : [], positionIds: !_.isEmpty(positionIds) ? positionIds.split(",") : [], subcompanyIds: !_.isEmpty(subcompanyIds) ? subcompanyIds.split(",") : [], - statuses: !_.isEmpty(statuses) ? statuses.split(",") : [] + statuses: !_.isEmpty(statuses) ? statuses.split(",") : [], + htqslxList: !_.isEmpty(htqslxList) ? htqslxList.split(",") : [], + rsdlgsList: !_.isEmpty(rsdlgsList) ? rsdlgsList.split(",") : [] }; this.setState({ loading: true }); acctResultList(payload).then(({ status, data }) => {