diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js
index e10bb12..63da137 100644
--- a/pc4mobx/organization/components/resource/resource.js
+++ b/pc4mobx/organization/components/resource/resource.js
@@ -333,7 +333,8 @@ export default class Resource extends React.Component {
const btn = [
(),
(),
(),
@@ -546,7 +547,7 @@ export default class Resource extends React.Component {
store.setPanelStatus(bool)}
hideSearchAd={() => store.setPanelStatus(false)}
@@ -555,8 +556,9 @@ export default class Resource extends React.Component {
hasMask={false}
buttonsAd={this.getTabBtn()}
onSearch={() => {
- store.hideRadioGroup();store.getTableInfo();
- }}
+ store.isBaseValue = true;
+ store.hideRadioGroup();store.getTableInfo();
+ }}
onSearchChange={val => this.onSearchChange(val)}
/>
diff --git a/pc4mobx/organization/stores/resource.js b/pc4mobx/organization/stores/resource.js
index e942ff5..da3fba2 100644
--- a/pc4mobx/organization/stores/resource.js
+++ b/pc4mobx/organization/stores/resource.js
@@ -47,6 +47,8 @@ export class ResourceStore extends HrmBaseStore{
@observable form2 = new WeaForm();
@observable form = new WeaForm();
@observable lastName = '';
+ @observable isBaseValue = true;
+
@observable conditionNum = 8;
@observable ids = ''; //选择行id
@observable searchConditionLoading = false;
@@ -125,17 +127,18 @@ export class ResourceStore extends HrmBaseStore{
params = {
isQuickSearch:false,
...this.selectTreeNodeInfo,
+
}
- //高级搜索内容为空
- if (this.isEmptyObject(this.form2.getFormParams())) {
+ //外部INPUT搜索
+ if (this.isBaseValue) {
params = {
...params,
- lastName: this.lastName,
+ lastName: this.lastName
};
- } else {
+ }else {
params = {
...params,
- ...this.form2.getFormParams()
+ ...this.form2.getFormParams(),
};
}
}else {
@@ -810,7 +813,7 @@ export class ResourceStore extends HrmBaseStore{
updateFields(val) {
this.form2.updateFields({
- lastname: {
+ "-1_hrm_lastname": {
value: val
}
});