diff --git a/pc4mobx/hrmSalary/pages/reportView/components/condition.js b/pc4mobx/hrmSalary/pages/reportView/components/condition.js index 2f88f912..0e86091c 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/condition.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/condition.js @@ -77,36 +77,36 @@ export const condition = [ labelcol: 6, viewAttr: 2 }, - { - browserConditionParam: { - completeParams: {}, - conditionDataParams: {}, - dataParams: {}, - destDataParams: {}, - hasAddBtn: false, - hasAdvanceSerach: true, - idSeparator: ",", - isAutoComplete: 1, - isDetail: 0, - isMultCheckbox: false, - isSingle: false, - linkUrl: "", - pageSize: 10, - quickSearchName: "", - replaceDatas: [], - title: getLabel(111, "岗位"), - type: "278", - viewAttr: 2 - }, - colSpan: 2, - conditionType: "BROWSER", - domkey: ["position"], - fieldcol: 18, - isQuickSearch: false, - label: getLabel(111, "岗位"), - labelcol: 6, - viewAttr: 2 - }, + // { + // browserConditionParam: { + // completeParams: {}, + // conditionDataParams: {}, + // dataParams: {}, + // destDataParams: {}, + // hasAddBtn: false, + // hasAdvanceSerach: true, + // idSeparator: ",", + // isAutoComplete: 1, + // isDetail: 0, + // isMultCheckbox: false, + // isSingle: false, + // linkUrl: "", + // pageSize: 10, + // quickSearchName: "", + // replaceDatas: [], + // title: getLabel(111, "岗位"), + // type: "278", + // viewAttr: 2 + // }, + // colSpan: 2, + // conditionType: "BROWSER", + // domkey: ["position"], + // fieldcol: 18, + // isQuickSearch: false, + // label: getLabel(111, "岗位"), + // labelcol: 6, + // viewAttr: 2 + // }, { browserConditionParam: { completeParams: {}, diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js index bda4cc15..6c39dd46 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js @@ -122,7 +122,7 @@ class StatisticalMicroSettingsSlide extends Component { hiredate: extra["hiredate1__hiredate2"].value || [], department: _.map(department.valueObj, it => ({ id: it.id, name: it.name })), employee: _.map(employee.valueObj, it => ({ id: it.id, name: it.name })), - position: _.map(position.valueObj, it => ({ id: it.id, name: it.name })), + // position: _.map(position.valueObj, it => ({ id: it.id, name: it.name })), subCompany: _.map(subCompany.valueObj, it => ({ id: it.id, name: it.name })), taxAgent: value ? _.map(value.split(","), (it, idx) => ({ id: it, name: valueSpan.split(",")[idx] })) : [], items: dataSource,