diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js
index d20a5f6..bcd8495 100644
--- a/pc4mobx/organization/components/resource/resource.js
+++ b/pc4mobx/organization/components/resource/resource.js
@@ -330,7 +330,7 @@ export default class Resource extends React.Component {
 
         const btn = [
             (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@bx87i8`} type="primary" onClick={() => {
-                resource.getTableInfo(); resource.setPanelStatus(false)
+                resource.hideRadioGroup();resource.getTableInfo(); resource.setPanelStatus(false);
             }}>{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@218ju7`} type="primary" onClick={() => resource.openSearchDialog(true)}>{i18n.button.conditionSet()}</Button>),
@@ -483,8 +483,9 @@ export default class Resource extends React.Component {
         } else {
             return <div onKeyDown={(e) => {
                 if (e.keyCode == 13 && e.target.tagName === "INPUT") {
-                    rankScheme.getTableInfo();
-                    rankScheme.setPanelStatus(false)
+                    resource.hideRadioGroup()
+                    resource.getTableInfo();
+                    resource.setPanelStatus(false)
                 }
             }}>{arr}</div>
         }
@@ -533,7 +534,7 @@ export default class Resource extends React.Component {
                             <WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@9c3zts`}
                                 searchType={['base', 'advanced']}
                                 showSearchAd={isPanelShow}
-                                searchsBaseValue={this.isEmptyObject(form2.getFormParams()) ? lastName : form2.getFormParams().lastName}
+                                searchsBaseValue={this.isEmptyObject(form2.getFormParams()) ? lastName : form2.getFormParams()["-1_hrm_lastname"]}
                                 searchsBasePlaceHolder='请输入姓名'
                                 setShowSearchAd={bool => store.setPanelStatus(bool)}
                                 hideSearchAd={() => store.setPanelStatus(false)}
diff --git a/pc4mobx/organization/index.js b/pc4mobx/organization/index.js
index 444140a..1dd57d7 100644
--- a/pc4mobx/organization/index.js
+++ b/pc4mobx/organization/index.js
@@ -52,9 +52,9 @@ let getLocaleLabel = WeaLocaleProvider.getLocaleLabel.bind(
 );
 
 // 不需要读取系统多语言
-getLocaleLabel = function (nextState, replace, callback) {
-  callback();
-};
+// getLocaleLabel = function (nextState, replace, callback) {
+//   callback();
+// };
 
 //const Home = (props) => props.children;
 
@@ -134,9 +134,9 @@ class NetworkStrategy extends React.Component {
 
   componentDidMount() {
     // 多语言加载之后，已经 mount 的组件，需要重新 render 一次，刷新多语言配置。
-    // getLocaleLabelByCode('hrm').then(() => this.setState({
-    //     reRender: true
-    // }));
+    getLocaleLabelByCode('organization').then(() => this.setState({
+        reRender: true
+    }));
   }
 
   render = () => (
@@ -167,7 +167,3 @@ module.exports = {
   },
 };
 
-// module.exports = {
-//   Route: Routes,
-//   store: stores,
-// };
diff --git a/pc4mobx/organization/stores/resource.js b/pc4mobx/organization/stores/resource.js
index 681bddf..0b0c35b 100644
--- a/pc4mobx/organization/stores/resource.js
+++ b/pc4mobx/organization/stores/resource.js
@@ -86,6 +86,7 @@ export class ResourceStore {
     }
 
     @observable rangeConditions = [];
+    @observable defaultRangeConditions = [];
     @observable radioParams = {};
 
     @observable refreshRadioGroup = new Date().getTime();
@@ -102,6 +103,8 @@ export class ResourceStore {
 
     @action onRadioGroupChangeHandle = params => { 
         this.radioParams = params;
+        this.form2.resetForm();
+        this.lastName = '';
         this.getTableInfo();
     }
 
@@ -132,7 +135,6 @@ export class ResourceStore {
                 isQuickSearch:true
             }
         }
-        this.form2.resetForm();
         Api.getSearchList(params).then(res => {
             if (res.code === 200) {
                 res.data.datas && this.tableStore.getDatas(res.data.datas, 1);
@@ -223,6 +225,7 @@ export class ResourceStore {
         Api.getQuickSearchCondition().then(res => {
             if (res.code === 200) {
                 this.rangeConditions = res.data.rangeConditions;
+                this.defaultRangeConditions = res.data.rangeConditions;
                 this.enable = res.data.enable;
             } else {
                 message.warning(res.msg);
@@ -756,7 +759,7 @@ export class ResourceStore {
 
     updateFields(val) {
         this.form2.updateFields({
-            lastname: {
+            "-1_hrm_lastname": {
                 value: val
             }
         });
@@ -790,12 +793,10 @@ export class ResourceStore {
     setPanelStatus(bool) {
         this.isPanelShow = bool;
         this.search = true;
-        this.searchDialog.loading = true;
+        this.searchDialog.loading = true;  
         this.getSearchTemplate(bool);
-        bool && this.getSearchCondition();
-        if (!bool) {
-            this.scLoadingReset();
-        }
+        //第一次加载或者切换模板时
+        (bool && this.isEmptyObject(this.form2.getFormParams())) && this.getSearchCondition();
     }
 
     arrToJson(arr, rows, rowKey = "isused") {