企业信息行业选择修改

src/main/webapp/resources/data/profession.json

@@ -0,0 +1,70 @@
+{"IT|通信|电子|互联网":[
+  "互联网/电子商务",
+  "计算机软件",
+  "IT服务(系统/数据/维护)",
+  "电子技术/半导体/集成电路",
+  "计算机硬件",
+  "通信/电信/网络设备",
+  "通信/电信运营、增值服务",
+  "网络游戏"],
+  "金融业":[
+    "基金/证券/期货/投资",
+    "保险",
+    "银行",
+    "信托/担保/拍卖/典当"],
+  "房地产|建筑业":{
+      "房地产/建筑/建材/工程": [
+        "房地产金融服务类",
+        "房地产工程施工类",
+        "房地产工程货物类"
+      ],
+      "家居/室内设计/装饰装潢": "家居/室内设计/装饰装潢",
+      "物业管理/商业中心": "物业管理/商业中心"
+  },
+  "商业服务":[
+    "专业服务/咨询(财会/法律/人力资源等)",
+    "广告/会展/公关",
+    "中介服务",
+    "检验/认证",
+    "外包服务"],
+  "贸易|批发|零售|租赁业":[
+    "快速消费品（食品/饮料/烟酒/日化）",
+    "耐用消费品（服饰/纺织/皮革/家具/家电）",
+    "贸易/进出口",
+    "零售/批发",
+    "租赁服务"],
+  "文体教育|工艺美术":[
+    "教育/培训/院校",
+    "礼品/玩具/工艺美术/收藏品/奢侈品"],
+  "生产|加工|制造":[
+    "汽车/摩托车",
+    "大型设备/机电设备/重工业",
+    "加工制造（原料加工/模具）",
+    "仪器仪表及工业自动化",
+    "印刷/包装/造纸",
+    "办公用品及设备",
+    "医药/生物工程",
+    "医疗设备/器械",
+    "航空/航天研究与制造"],
+  "交通|运输|物流|仓储":[
+    "交通/运输",
+    "物流/仓储"],
+  "服务业":[
+    "医疗/护理/美容/保健/卫生服务",
+    "酒店/餐饮",
+    "旅游/度假"],
+  "文化|传媒|娱乐|体育":[
+    "媒体/出版/影视/文化传播",
+    "娱乐/体育/休闲"],
+  "能源|矿产|环保":[
+    "能源/矿产/采掘/冶炼",
+    "石油/石化/化工",
+    "电气/电力/水利",
+    "环保"],
+  "政府|非盈利机构":[
+    "政府/公共事业/非盈利机构",
+    "学术/科研"],
+  "农|林|牧|渔|其他":[
+    "农/林/牧/渔",
+    "跨领域经营",
+    "其他"]}

src/main/webapp/resources/js/index/app.js

@@ -9869,6 +9869,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         }
 
+        // 添加经营范围标签
         $scope.addTag = function () {
             if ($scope.tags.indexOf($scope.tag) == -1){
                 $scope.tags.push($scope.tag);
@@ -9876,9 +9877,38 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.tag = '';
         }
 
+        // 移除经营范围标签
         $scope.removeTag = function (tag) {
             removeByValue($scope.tags, tag);
         }
+
+        // 选择行业
+        $scope.profession = new Array();
+        $scope.showProfession = false;
+        $scope.selectProfession = function ($event) {
+            $event.preventDefault();
+            $event.stopPropagation();
+            $scope.professionArray = [];
+            $scope.showProfession = !$scope.showProfession;
+            $http.get('static/data/profession.json').success(function (data) {
+                $scope.list = data;
+                $scope.profession[0] = data;
+            });
+        }
+
+        $scope.onItemClick = function (key, index, value) {
+            if (angular.isString(value)){
+                $scope.enterprise.profession = value;
+                return;
+            }
+            $scope.professionArray = [];
+            $scope.profession.splice(index+1);
+            if (angular.isArray(value)){
+                $scope.professionArray = value;
+            } else if (angular.isObject(value)) {
+                $scope.profession[index+1] = value;
+            }
+        }
     }]);
 
     // 编辑收货地址

src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -302,6 +302,82 @@
 		color: #5078cb;
 		cursor: pointer;
 	}
+	.choose-body {
+		display: table;
+		width: 40%;
+		margin-top: 10px;
+		margin-left: 120px;
+		padding: 10px;
+		table-layout: fixed;
+		border-collapse: separate;
+		border: 1px solid #ccc;
+		position: relative;
+		background: #fff;
+		z-index: 1000;
+	}
+
+	.choose-body>.choose-item {
+		display: table-cell;
+	}
+
+	.choose-body>.choose-item>ul {
+		height: 200px;
+		overflow-x: hidden;
+		overflow-y: scroll;
+	}
+
+	.choose-body>.choose-item>ul>li {
+		line-height: 30px;
+		padding-left: 5px;
+		position: relative;
+	}
+
+	.choose-body>.choose-item>ul>li.add {
+		margin: 10px 5px;
+		text-align: center;
+		border: 1px solid #ff7300;
+		color: #ff7300;
+		border-radius: 4px;
+		cursor: pointer;
+	}
+
+	.choose-body>.choose-item>ul>li:hover {
+		background: #f1f1f1;
+	}
+
+	.choose-body>.choose-item>ul>li.active {
+		background: #fff1d0;
+	}
+
+	.choose-body>.choose-item>ul>li.active a {
+		color: #ff7300;
+	}
+
+	.choose-body>.choose-item>ul>li>a {
+		display: block;
+		color: #666666;
+	}
+
+	.choose-body>.choose-item .caret {
+		float: right;
+		margin-top: 14px;
+		margin-right: 8px;
+		border-left: 3px solid;
+		border-right: none;
+		border-top: 3px solid transparent;
+		border-bottom: 3px solid transparent;
+	}
+
+	.choose-body>.choose-item .setting {
+		display: none;
+		position: absolute;
+		right: 20px;
+		top: 1px;
+	}
+
+	.choose-body>.choose-item>ul>li:hover .setting {
+		display: block;
+	}
 </style>
 <!--<div class="com_title">设置&gt;企业设置<font>&gt;企业信息</font></div>-->
 <div class="com_head"><span>企业信息</span></div>
@@ -461,11 +537,59 @@
 							<!--{{enterprise.enIndustry=='make'?'制造型':'贸易型'}}-->
 						</div>
 						<div class="content" ng-show="connectionEditing">
-							<select ng-model="enterprise.profession" placeholder="所属行业"
-									class="form-control input-xs" type="text" style="width: 320px;">
-								<option value="make">制造型</option>
-								<option value="trade">贸易型</option>
-							</select>
+							<input ng-model="enterprise.profession" placeholder="所属行业"
+									class="form-control input-xs" type="text" style="width: 320px;"
+									ng-click="selectProfession()">
+								<!--<option value="make">制造型</option>-->
+								<!--<option value="trade">贸易型</option>-->
+
+							</input>
+						</div>
+						<div ng-show="showProfession">
+							<div class="choose-body">
+								<div class="choose-item">
+									<ul class="list-unstyled">
+										<li ng-repeat="(key, value) in profession[0]" ng-class="{active: value.$active}">
+											<a ng-click="onItemClick(key, 0, value)">{{key}}
+												<span class="caret" ></span>
+											</a>
+										</li>
+									</ul>
+								</div>
+							</div>
+							<div class="choose-body" ng-show="profession[1]">
+								<div class="choose-item">
+									<ul class="list-unstyled">
+										<li ng-repeat="(key, value) in profession[1]" ng-class="{active: value.$active}">
+											<a ng-click="onItemClick(key, 1, value)">{{key}}
+												<span class="caret" ></span>
+											</a>
+										</li>
+									</ul>
+								</div>
+							</div>
+							<div class="choose-body" ng-show="profession[2]">
+								<div class="choose-item">
+									<ul class="list-unstyled">
+										<li ng-repeat="(key, value) in profession[2]" ng-class="{active: value.$active}">
+											<a ng-click="onItemClick(key, 2, value)">{{key}}
+												<span class="caret" ></span>
+											</a>
+										</li>
+									</ul>
+								</div>
+							</div>
+							<div class="choose-body" ng-show="professionArray.length > 0">
+								<div class="choose-item">
+									<ul class="list-unstyled">
+										<li ng-repeat="value in professionArray" ng-class="{active: value.$active}">
+											<a ng-click="onItemClick(null, -1, value)">{{value}}
+												<span class="caret" ></span>
+											</a>
+										</li>
+									</ul>
+								</div>
+							</div>
 						</div>
 					</div>
 				</div>