diff --git a/o2web/source/x_component_Org/Main.js b/o2web/source/x_component_Org/Main.js
index 2e05727993b890863470954d736560422fd1ca99..682cebf6bd3d98afb119d11139333d473e8d236e 100644
--- a/o2web/source/x_component_Org/Main.js
+++ b/o2web/source/x_component_Org/Main.js
@@ -181,6 +181,7 @@ MWF.xApplication.Org.Main = new Class({
},
loadPersonImport: function(){
var action = o2.Actions.get("x_organization_assemble_control");
+ MWF.require("MWF.widget.MaskNode", null, false);
var url = o2.filterUrl(action.action.address + action.action.actions.getImportPersonTemplate.uri);
var infor = this.lp.importPersonInfor.replace("{url}", url);
@@ -197,16 +198,27 @@ MWF.xApplication.Org.Main = new Class({
"method": "importPerson",
"multiple": false,
"onCompleted": function(json){
+ if (!this.maskNode){
+ this.maskNode = new MWF.widget.MaskNode(this.importConfiguratorContentNode, {"style": "bam"});
+ this.maskNode.load();
+ }
+
var url = o2.filterUrl(action.action.address + action.action.actions.getImportPersonResault.uri);
url = url.replace("{flag}", json.data.flag);
var result = this.lp.importPersonResult.replace("{url}", url);
this.importPersonResultNode.set("html", result);
this.importPersonResultNode.show();
+ if (this.maskNode) this.maskNode.hide(function(){
+ MWF.release(this.maskNode);
+ this.maskNode = null;
+ }.bind(this));
+
}.bind(this)
}).load();
}.bind(this));
}.bind(this));
+
var exporturl = o2.filterUrl(o2.Actions.getHost("x_cms_assemble_control") + "/x_organization_assemble_control/jaxrs/export/export/all");
this.exportPersonNode.set("text", this.lp.exportPersonText);
this.exportPersonNode.set("href", exporturl);
diff --git a/o2web/source/x_component_Org/lp/zh-cn.js b/o2web/source/x_component_Org/lp/zh-cn.js
index 3e66aa2cc2b5842231fd548e3fec7d79de0c65f8..7b199f6469f7ee3c4876f3b94b6c634b46eab52e 100644
--- a/o2web/source/x_component_Org/lp/zh-cn.js
+++ b/o2web/source/x_component_Org/lp/zh-cn.js
@@ -255,7 +255,7 @@ MWF.xApplication.Org.LP = {
"importPersonTitle": "组织导入导出",
"importPersonInfor": "您可以通过Excel批量导入组织,点击此处获取组织导入模板",
"importPersonAction": "上传Excel文件,导入组织",
- "importPersonResult": "组织已导入,点击此处查看导入结果",
+ "importPersonResult": "数据导入已处理,点击此处查看导入结果(如有校验未通过则不会导入任何数据)",
"exportPersonText": "导出组织到excel文件",
"queryPrivateConfigTitle":"个人通讯录权限配置",