diff --git a/web/source/x_component_CRM/ClueOpen.js b/web/source/x_component_CRM/ClueOpen.js
index 93bdf4390f142e7a4f1d99dfcc241951cf31ba29..256f8ad60a152dbc3dac5572eaa5dfca774e3020 100644
--- a/web/source/x_component_CRM/ClueOpen.js
+++ b/web/source/x_component_CRM/ClueOpen.js
@@ -177,9 +177,12 @@ MWF.xApplication.CRM.ClueOpen = new Class({
             var itemTemplateObject = _self.lp;
             var section_conent = '<div class="section-conent">';
             for ( i in itemTemplateObject){
-
+                var conentValue = jsonObj[i];
+                if(i == "province" && conentValue.indexOf("#")>0){
+                    conentValue = conentValue.replaceAll("#","-")
+                }
                 section_conent = section_conent+'<div class="conent-inline"><div class="conent-title">'+itemTemplateObject[i].text+'</div>' +
-                    '<div class="conent-value">'+jsonObj[i]+'</div></div>';
+                    '<div class="conent-value">'+conentValue+'</div></div>';
 
             }
             section_conent = section_conent + '</div>';
@@ -1064,296 +1067,6 @@ debugger
     loadFormData:function(){
         var tmpData={};
         this.loadForm();
-
-        /*
-         var html = "<table width='100%' bordr='0' cellpadding='5' cellspacing='0' styles='formTable'>" +
-         "<tr>" +
-         "   <td styles='formTableTitle'><span lable='TCustomerName'></span><span style='color:#f00'>*</span></td>" +
-         "   <td styles='formTableValue' item='TCustomerName'></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TCustomerType'></td>" +
-         "   <td styles='formTableValue'><div id='TCustomerType'></div></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TCustomerLevel'></td>" +
-         "   <td styles='formTableValue'><div id='TCustomerLevel'></div></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TSource'></td>" +
-         "   <td styles='formTableValue'><div id='TSource'></div></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TIndustryFirst'></td>" +
-         "   <td styles='formTableValue'><div id='TIndustryFirst'></div><div id='TIndustrySecond'></div></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TDistrict'></td>" +
-         "   <td styles='formTableValue'><div id='TProvince'></div><div id='TCity'></div><div id='TArea'></div></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TStreet'></td>" +
-         "   <td styles='formTableValue' item='TStreet'></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TLocation'></td>" +
-         "   <td styles='formTableValue'><div style='width:100%;height:30px;'><input type='text' placeholder='"+this.lp.TLocationNotice+"' id='mapLocation' disabled/></div></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle'></td>" +
-         "   <td styles='formTableValue'><div id='mapDiv' styles='mapDiv'></div></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TTelphone'></td>" +
-         "   <td styles='formTableValue' item='TTelphone'></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TFax'></td>" +
-         "   <td styles='formTableValue' item='TFax'></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TRemark'></td>" +
-         "   <td styles='formTableValue' item='TRemark'></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TWebSite'></td>" +
-         "   <td styles='formTableValue' item='TWebSite'></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TEmail'></td>" +
-         "   <td styles='formTableValue' item='TEmail'></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TCustomerStatus'></td>" +
-         "   <td styles='formTableValue'><div id='TCustomerStatus'></div></td>" +
-         "</tr><tr>" +
-         "   <td styles='formTableTitle' lable='TCustomerGrade'></td>" +
-         "   <td styles='formTableValue'><div id='TCustomerGrade'></div></td>" +
-         "</tr>" +
-         "</table>"
-         this.formTableArea.set("html", html);
-
-
-         this.TCustomerType = this.formTableArea.getElement("#TCustomerType");
-         this.TCustomerLevel = this.formTableArea.getElement("#TCustomerLevel");
-         this.TSource = this.formTableArea.getElement("#TSource");
-         this.TIndustryFirst = this.formTableArea.getElement("#TIndustryFirst");
-         this.TIndustrySecond = this.formTableArea.getElement("#TIndustrySecond");
-         this.TProvince = this.formTableArea.getElement("#TProvince");
-         this.TCity = this.formTableArea.getElement("#TCity");
-         this.TArea = this.formTableArea.getElement("#TArea");
-         this.TCustomerStatus = this.formTableArea.getElement("#TCustomerStatus");
-         this.TCustomerGrade = this.formTableArea.getElement("#TCustomerGrade");
-
-         var size = {"width":230,"height":30};
-
-         this.TIndustryFirst.setStyles({"float":"left"});
-         this.TIndustrySecond.setStyles({"float":"left","margin-left":"10px"});
-
-
-
-         //客户类型
-         this.TCustomerTypeSelector =  new MWF.xApplication.CRM.Template.Select(this.TCustomerType,this, this.actions, size);
-         this.TCustomerTypeSelector.load();
-         alert(JSON.stringify(this.profileData.customertype_config))
-         this.TCustomerTypeSelector.setList(this.profileData.customertype_config);
-         if(this.customerData && this.customerData.customertype){
-         this.TCustomerTypeSelector.selectValueDiv.set({"text":this.customerData.customertype});
-         this.TCustomerTypeSelector.node.set("value",this.customerData.customertype);
-         }
-         //客户级别
-         this.TCustomerLevelSelector =  new MWF.xApplication.CRM.Template.Select(this.TCustomerLevel,this, this.actions, size);
-         this.TCustomerLevelSelector.load();
-         this.TCustomerLevelSelector.setList(this.profileData.level_config);
-         if(this.customerData && this.customerData.level){
-         this.TCustomerLevelSelector.selectValueDiv.set({"text":this.customerData.level});
-         this.TCustomerLevelSelector.node.set("value",this.customerData.level);
-         }
-         //来源
-         this.TSourceSelector =  new MWF.xApplication.CRM.Template.Select(this.TSource,this, this.actions, size);
-         this.TSourceSelector.load();
-         this.TSourceSelector.setList(this.profileData.source_config);
-         if(this.customerData && this.customerData.source){
-         this.TSourceSelector.selectValueDiv.set({"text":this.customerData.source});
-         this.TSourceSelector.node.set("value",this.customerData.source);
-         }
-         //行业
-         this.TIndustryFirstSelector =  new MWF.xApplication.CRM.Template.Select(this.TIndustryFirst,this, this.actions, {"width":230,"height":30});
-         this.TIndustrySecondSelector =  new MWF.xApplication.CRM.Template.Select(this.TIndustrySecond,this, this.actions, {"width":230,"height":30,"available":"no"});
-         this.TIndustrySecondSelector.load();
-         this.TIndustryFirstSelector.load();
-         if(this.customerData && this.customerData.industryfirst){
-         this.TIndustryFirstSelector.selectValueDiv.set({"text":this.customerData.industryfirst});
-         this.TIndustryFirstSelector.node.set("value",this.customerData.industryfirst);
-
-
-         this.profileData.industry_config.childNodes.each(function(d){
-         if(d.configname == this.customerData.industryfirst){
-         tmpData = d;
-         }
-         }.bind(this));
-         this.TIndustrySecondSelector.setList(tmpData);
-         this.TIndustrySecond.set("available","yes");
-         this.TIndustrySecond.setStyles({"background-color":""});
-
-         }
-         if(this.customerData && this.customerData.industrysecond){
-         this.TIndustrySecondSelector.selectValueDiv.set({"text":this.customerData.industrysecond});
-         this.TIndustrySecondSelector.node.set("value",this.customerData.industrysecond);
-
-         this.profileData.industry_config.childNodes.each(function(d){
-         if(d.configname == this.customerData.industryfirst){
-         tmpData = d;
-         }
-         }.bind(this));
-         this.TIndustrySecondSelector.setList(tmpData);
-         this.TIndustrySecond.set("available","yes");
-         this.TIndustrySecond.setStyles({"background-color":""});
-
-         }
-         this.TIndustryFirstSelector.setList(this.profileData.industry_config,function(d){
-         if(this.TIndustryFirst.get("value") == this.lp.defaultSelect){
-         this.TIndustrySecondSelector.createDefault();
-         this.TIndustrySecondSelector.setList();
-         this.TIndustrySecond.set("available","no");
-         this.TIndustrySecond.setStyles({"background-color":"#eeeeee"})
-         }else{
-         this.TIndustrySecondSelector.createDefault();
-         this.TIndustrySecondSelector.setList(d);
-         this.TIndustrySecond.set("available","yes");
-         this.TIndustrySecond.setStyles({"background-color":""});
-         }
-         }.bind(this));
-
-
-
-         //省、市、区
-         this.TProvinceSelector =  new MWF.xApplication.CRM.Template.Select(this.TProvince,this, this.actions, {"width":150,"height":30});
-         this.TProvinceSelector.load({},function(){
-         this.actions.getProvinceList(function(json){
-         this.TProvinceSelector.setAddress(json.data,function(d){
-         //city
-         if(this.TProvince.get("value") == this.lp.defaultSelect){
-         this.TCitySelector.createDefault();
-         this.TCitySelector.setAddress();
-         this.TCity.set("available","no");
-         this.TCity.setStyles({"background-color":"#eeeeee"});
-         }else{
-         this.actions.getCityList({pid: d.cityid},function(json){
-         this.TCitySelector.createDefault();
-         this.TCitySelector.setAddress(json.data,function(dd){
-         //area
-         if(this.TCity.get("value") == this.lp.defaultSelect){
-         this.TAreaSelector.createDefault();
-         this.TAreaSelector.setAddress();
-         this.TArea.set("available","no");
-         this.TArea.setStyles({"background-color":"#eeeeee"});
-         }else{
-         this.actions.getAreaList({pid:dd.cityid},function(json){
-         this.TAreaSelector.createDefault();
-         this.TAreaSelector.setAddress(json.data);
-         this.TArea.set("available","yes");
-         this.TArea.setStyles({"background-color":""});
-         }.bind(this));
-         }
-
-         }.bind(this));
-         this.TCity.set("available","yes");
-         this.TCity.setStyles({"background-color":""});
-         }.bind(this));
-
-         }
-
-         this.TAreaSelector.createDefault();
-         this.TAreaSelector.setAddress();
-         this.TArea.set("available","no");
-         this.TArea.setStyles({"background-color":"#eeeeee"});
-         }.bind(this))
-         }.bind(this))
-         }.bind(this));
-         this.TCitySelector =  new MWF.xApplication.CRM.Template.Select(this.TCity,this, this.actions, {"width":150,"height":30,"available":"no"});
-         this.TCitySelector.load();
-         this.TAreaSelector =  new MWF.xApplication.CRM.Template.Select(this.TArea,this, this.actions, {"width":150,"height":30,"available":"no"});
-         this.TAreaSelector.load();
-
-         if(this.customerData && this.customerData.province){ //省
-         this.TProvinceSelector.selectValueDiv.set({"text":this.customerData.province});
-         this.TProvinceSelector.node.set("value",this.customerData.province);
-         }
-         if(this.customerData && this.customerData.city){ //市
-         if(this.customerData && this.customerData.province){
-         this.actions.getCityListByName({"regionname":this.customerData.province},
-         function(json){
-         this.TCitySelector.setAddress(json.data,function(dd){
-         //area
-         if(this.TCity.get("value") == this.lp.defaultSelect){
-         this.TAreaSelector.createDefault();
-         this.TAreaSelector.setAddress();
-         this.TArea.set("available","no");
-         this.TArea.setStyles({"background-color":"#eeeeee"});
-         }else{
-         this.actions.getAreaList({pid:dd.cityid},function(json){
-         this.TAreaSelector.createDefault();
-         this.TAreaSelector.setAddress(json.data);
-         this.TArea.set("available","yes");
-         this.TArea.setStyles({"background-color":""});
-         }.bind(this));
-         }
-
-         }.bind(this));
-         }.bind(this));
-         }
-         this.TCitySelector.selectValueDiv.set({"text":this.customerData.city});
-         this.TCitySelector.node.set("value",this.customerData.city);
-         this.TCity.set("available","yes");
-         this.TCity.setStyles({"background-color":""});
-
-
-         }
-         if(this.customerData && this.customerData.county){ //区
-         if(this.customerData && this.customerData.city){
-         this.actions.getAreaListByName({"regionname":this.customerData.city},
-         function(json){
-         this.TAreaSelector.setAddress(json.data);
-         }.bind(this));
-         }
-         this.TAreaSelector.selectValueDiv.set({"text":this.customerData.county});
-         this.TAreaSelector.node.set("value",this.customerData.county);
-         this.TArea.set("available","yes");
-         this.TArea.setStyles({"background-color":""});
-         }
-
-         this.TProvince.setStyles({"float":"left"});
-         this.TCity.setStyles({"float":"left","margin-left":"10px"});
-         this.TArea.setStyles({"float":"left","margin-left":"10px"});
-
-         this.TCustomerStatusSelector =  new MWF.xApplication.CRM.Template.Select(this.TCustomerStatus,this, this.actions, size);
-         this.TCustomerStatusSelector.load();
-         this.TCustomerStatusSelector.setList(this.profileData.state_config);
-         if(this.customerData && this.customerData.state){
-         this.TCustomerStatusSelector.selectValueDiv.set({"text":this.customerData.state});
-         this.TCustomerStatusSelector.node.set("value",this.customerData.state);
-         }
-         this.TCustomerGradeSelector = new MWF.xApplication.CRM.Template.Select(this.TCustomerGrade,this, this.actions, size);
-         this.TCustomerGradeSelector.load();
-         this.TCustomerGradeSelector.setList(this.profileData.customerrank_config);
-
-         this.TMap = this.formTableArea.getElement("#mapDiv");
-         this.TMap.addEvents({
-         "mousewheel":function(e){
-         e.stopPropagation();
-         }
-         });
-         this.mapLocation = this.formTableArea.getElement("#mapLocation");
-         this.mapLocation.setStyles({
-         "width": "99%",
-         "text-indent":"5px",
-         "border":"1px solid #999",
-         "background-color":"#eee",
-         "border-radius": "3px",
-         "box-shadow": "0px 0px 6px #eee",
-         "height": "26px"
-         });
-
-
-         MWF.xDesktop.requireApp("CRM", "BaiduMap", function(){
-         this.bMap = new MWF.xApplication.CRM.BaiduMap(this.TMap,this.app,this,this.actions,{"from":"newCustomer"});
-         var mapData = {};
-         if(this.customerData && this.customerData.addresslatitude){
-         mapData.latitude = this.customerData.addresslatitude
-         }
-         if(this.customerData && this.customerData.addresslongitude){
-         mapData.longitude = this.customerData.addresslongitude
-         }
-         this.bMap.load(mapData);
-         }.bind(this));
-         */
     },
     ok: function (e) {
         this.fireEvent("queryOk");
diff --git a/web/source/x_component_CRM/ContactsOpen.js b/web/source/x_component_CRM/ContactsOpen.js
index 81d4ed55a721f9531186c05a5cb7b3a1a7d3ae9b..c5ab20abd280c139e1281139f45871a0a4cf6e1d 100644
--- a/web/source/x_component_CRM/ContactsOpen.js
+++ b/web/source/x_component_CRM/ContactsOpen.js
@@ -182,7 +182,12 @@ MWF.xApplication.CRM.ContactsOpen = new Class({
                 var valueStr = "";
                 if(i=="customername"){
                     valueStr = ((typeof(jsonObj.customer)=="undefined")?"" : jsonObj.customer.customername);
-                }else{
+                }else if(i == "province"){
+                    valueStr = ((typeof(jsonObj[i])=="undefined")?"" : jsonObj[i]);
+                    if(valueStr.indexOf("#")>0){
+                        valueStr = valueStr.replaceAll("#","-");
+                    }
+                } else{
                     valueStr = ((typeof(jsonObj[i])=="undefined")?"" : jsonObj[i]);
                 }
                 section_conent = section_conent+'<div class="conent-inline"><div class="conent-title">'+itemTemplateObject[i].text+'</div>' +
diff --git a/web/source/x_component_CRM/CustomerOpen.js b/web/source/x_component_CRM/CustomerOpen.js
index 5c237e3a1361330c7fc62b451286f130279815b4..05f561caef7b3c41df4692241afb2ac1afb7fafc 100644
--- a/web/source/x_component_CRM/CustomerOpen.js
+++ b/web/source/x_component_CRM/CustomerOpen.js
@@ -215,8 +215,12 @@ MWF.xApplication.CRM.CustomerOpen = new Class({
             var itemTemplateObject = _self.lp;
             var section_conent = '<div class="section-conent">';
             for ( i in itemTemplateObject){
+                var conentValue = jsonObj[i];
+                if(i == "province" && conentValue.indexOf("#")>0){
+                    conentValue = conentValue.replaceAll("#","-")
+                }
                 section_conent = section_conent+'<div class="conent-inline"><div class="conent-title">'+itemTemplateObject[i].text+'</div>' +
-                    '<div class="conent-value">'+((typeof(jsonObj[i])=="undefined")?"" : jsonObj[i])+'</div></div>';
+                    '<div class="conent-value">'+((typeof(conentValue)=="undefined")?"" : conentValue)+'</div></div>';
 
             }
             section_conent = section_conent + '</div>';
diff --git a/web/source/x_component_CRM/PublicseasOpen.js b/web/source/x_component_CRM/PublicseasOpen.js
index d2df94fd49c22cd9f0a9f0523969e5b291e13ea6..bd02c910c1a8c8b812879414e499a2897367e5b3 100644
--- a/web/source/x_component_CRM/PublicseasOpen.js
+++ b/web/source/x_component_CRM/PublicseasOpen.js
@@ -192,8 +192,12 @@ MWF.xApplication.CRM.PublicseasOpen = new Class({
             var itemTemplateObject = _self.getItemTemplate(_self.lp );
             var section_conent = '<div class="section-conent">';
             for ( i in itemTemplateObject){
+                var conentValue = jsonObj[i];
+                if(i == "province" && conentValue.indexOf("#")>0){
+                    conentValue = conentValue.replaceAll("#","-")
+                }
                 section_conent = section_conent+'<div class="conent-inline"><div class="conent-title">'+itemTemplateObject[i].text+'</div>' +
-                    '<div class="conent-value">'+((typeof(jsonObj[i])=="undefined")?"" : jsonObj[i])+'</div></div>';
+                    '<div class="conent-value">'+((typeof(jsonObj[i])=="undefined")?"" : conentValue)+'</div></div>';
 
             }
             section_conent = section_conent + '</div>';
@@ -1327,6 +1331,10 @@ MWF.xApplication.CRM.PublicseasOpen = new Class({
                 text:lp.cellphone,
                 type: "text"
             },
+            province: {
+                text:lp.province,
+                type: "map"
+            },
             detailaddress: {
                 text:lp.detailaddress,
                 type: "text"
@@ -1334,10 +1342,6 @@ MWF.xApplication.CRM.PublicseasOpen = new Class({
             remark: {
                 text:lp.remark,
                 type: "textarea"
-            },
-            location: {
-                text:lp.location,
-                type: "map"
             }
 
         }
diff --git a/web/source/x_component_CRM/lp/zh-cn.js b/web/source/x_component_CRM/lp/zh-cn.js
index 5ce64da567e24451d94bb31fa1e9a6645e039dbe..7e91368dd72097704e62c7a90dbb7b83d608b9a4 100644
--- a/web/source/x_component_CRM/lp/zh-cn.js
+++ b/web/source/x_component_CRM/lp/zh-cn.js
@@ -409,7 +409,7 @@ MWF.xApplication.CRM.LP = {
 			"remark":"备注",
 			"cellphone":"手机",
 			"detailaddress":"详细地址",
-			"location":"区域",
+			"province":"区域",
 			"saveSuccess":"新建成功",
 			"actionConfirm":"确定",
 			"actionCancel":"关闭"