liang.cheng
/
trunk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

花名搜索修复

This commit is contained in:
Chengliang 2024-07-30 16:22:54 +08:00
parent 04c7115ce5
commit d1760f765a
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pc4mobx/organization/components/resource/resource.js
View File

@ -333,7 +333,8 @@ export default class Resource extends React.Component {
const btn = [ const btn = [
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@bx87i8`} type="primary" onClick={() => { (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@bx87i8`} type="primary" onClick={() => {
resource.selectTreeNodeInfo = {};resource.setPanelStatus(false);resource.getTableInfo(); resource.isBaseValue = false;
resource.selectTreeNodeInfo = {}; resource.setPanelStatus(false);resource.getTableInfo();
}}>{i18n.button.search()}</Button>), }}>{i18n.button.search()}</Button>),
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@218ju6`} type="primary" onClick={() => this.saveTemplate()}>{i18n.button.saveTemplate()}</Button>), (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@218ju6`} type="primary" onClick={() => this.saveTemplate()}>{i18n.button.saveTemplate()}</Button>),
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@218ju7`} type="primary" onClick={() => resource.openSearchDialog()}>{i18n.button.conditionSet()}</Button>), (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@218ju7`} type="primary" onClick={() => resource.openSearchDialog()}>{i18n.button.conditionSet()}</Button>),
@ -546,7 +547,7 @@ export default class Resource extends React.Component {
<WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@9c3zts`} <WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@9c3zts`}
searchType={['base', 'advanced']} searchType={['base', 'advanced']}
showSearchAd={isPanelShow} showSearchAd={isPanelShow}
searchsBaseValue={this.isEmptyObject(form2.getFormParams()) ? lastName : form2.getFormParams().lastName} searchsBaseValue={this.isEmptyObject(form2.getFormParams()) ? lastName : form2.getFormParams()["-1_hrm_lastname"]}
searchsBasePlaceHolder='' searchsBasePlaceHolder=''
setShowSearchAd={bool => store.setPanelStatus(bool)} setShowSearchAd={bool => store.setPanelStatus(bool)}
hideSearchAd={() => store.setPanelStatus(false)} hideSearchAd={() => store.setPanelStatus(false)}
@ -555,8 +556,9 @@ export default class Resource extends React.Component {
hasMask={false} hasMask={false}
buttonsAd={this.getTabBtn()} buttonsAd={this.getTabBtn()}
onSearch={() => { onSearch={() => {
store.hideRadioGroup();store.getTableInfo(); store.isBaseValue = true;
}} store.hideRadioGroup();store.getTableInfo();
}}
onSearchChange={val => this.onSearchChange(val)} onSearchChange={val => this.onSearchChange(val)}
/> />
<Spin size="large" spinning={exSpinning} tip={getLabel(547647,'正在导出请稍候....')} className="hrm-loading-center-small"/> <Spin size="large" spinning={exSpinning} tip={getLabel(547647,'正在导出请稍候....')} className="hrm-loading-center-small"/>

15
pc4mobx/organization/stores/resource.js
View File

@ -47,6 +47,8 @@ export class ResourceStore extends HrmBaseStore{
@observable form2 = new WeaForm(); @observable form2 = new WeaForm();
@observable form = new WeaForm(); @observable form = new WeaForm();
@observable lastName = ''; @observable lastName = '';
@observable isBaseValue = true;
@observable conditionNum = 8; @observable conditionNum = 8;
@observable ids = ''; //选择行id @observable ids = ''; //选择行id
@observable searchConditionLoading = false; @observable searchConditionLoading = false;
@ -125,17 +127,18 @@ export class ResourceStore extends HrmBaseStore{
params = { params = {
isQuickSearch:false, isQuickSearch:false,
...this.selectTreeNodeInfo, ...this.selectTreeNodeInfo,
} }
//高级搜索内容为空 //外部INPUT搜索
if (this.isEmptyObject(this.form2.getFormParams())) { if (this.isBaseValue) {
params = { params = {
...params, ...params,
lastName: this.lastName, lastName: this.lastName
}; };
} else { }else {
params = { params = {
...params, ...params,
...this.form2.getFormParams() ...this.form2.getFormParams(),
}; };
} }
}else { }else {
@ -810,7 +813,7 @@ export class ResourceStore extends HrmBaseStore{
updateFields(val) { updateFields(val) {
this.form2.updateFields({ this.form2.updateFields({
lastname: { "-1_hrm_lastname": {
value: val value: val
} }
}); });