Merge remote-tracking branch 'origin/dev' into authority

src/main/java/com/uas/platform/b2b/model/Enterprise.java

@@ -246,13 +246,13 @@ public class Enterprise implements Serializable {
 	private Short prodpurc;
 
 	/**
-	 * 企业所属行业（注册时填写）
+	 * 行业
 	 */
 	@Column(name = "en_profession")
 	private String profession;
 
 	/**
-	 * 经营范围-标签
+	 * 主营业务
 	 */
 	@Column(name = "en_tags")
 	private String tags;
@@ -270,11 +270,36 @@ public class Enterprise implements Serializable {
 	private String contactTel;
 
 	/**
-	 * 联系人email
+	 * 联系人邮箱
 	 */
 	@Column(name = "en_contactemail")
 	private String contactEmail;
 
+
+	public String getEnManagement() {
+		return enManagement;
+	}
+
+	public void setEnManagement(String enManagement) {
+		this.enManagement = enManagement;
+	}
+
+	public String getEnProducts() {
+		return enProducts;
+	}
+
+	public void setEnProducts(String enProducts) {
+		this.enProducts = enProducts;
+	}
+
+	public String getEnInfo() {
+		return enInfo;
+	}
+
+	public void setEnInfo(String enInfo) {
+		this.enInfo = enInfo;
+	}
+
 	/**
 	 * en_info 公司简介
 	 */
@@ -686,30 +711,6 @@ public class Enterprise implements Serializable {
 		this.businesscodeimg = businesscodeimg;
 	}
 
-	public String getEnManagement() {
-		return enManagement;
-	}
-
-	public void setEnManagement(String enManagement) {
-		this.enManagement = enManagement;
-	}
-
-	public String getEnProducts() {
-		return enProducts;
-	}
-
-	public void setEnProducts(String enProducts) {
-		this.enProducts = enProducts;
-	}
-
-	public String getEnInfo() {
-		return enInfo;
-	}
-
-	public void setEnInfo(String enInfo) {
-		this.enInfo = enInfo;
-	}
-
 	public String getProfession() {
 		return profession;
 	}

src/main/java/com/uas/platform/b2b/v2/service/impl/EnterpriseServiceImpl.java

@@ -51,8 +51,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		enterprise.setEnType(detail.getType());
 		enterprise.setEnUrl(detail.getUrl());
 		enterprise.setLogUrl(detail.getLogoImage());
-		enterprise.setTags(detail.getTags());
 		enterprise.setProfession(detail.getProfession());
+		enterprise.setTags(detail.getTags());
 		enterprise.setContactMan(detail.getContactMan());
 		enterprise.setContactTel(detail.getContactTel());
 		enterprise.setContactEmail(detail.getContactEmail());

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

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

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

@@ -3653,7 +3653,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 if ((i > 0 ? r.lapQty : 1) || r.price) {
                     replies.push(r);
                 }
-                if (i > 0 && r.lapQty <= item.replies[i - 1].lapQty || r.lapQty == null) {
+                // 直接比较是字符串比较，需要先转换再比较  2017年9月7日 15:05:51
+                if (i > 0 && parseInt(r.lapQty) <= parseInt(item.replies[i - 1].lapQty) || r.lapQty == null) {
                     valid = false;
                     validLapQty = r.lapQty;
                 }
@@ -3668,37 +3669,52 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 }
                 $scope.loading = false;
             } else {
-                var file = item.myFiles, file = file && file.length > 0 ? file[0] : null;
-                $upload.upload({
-                    url: 'sale/inquiry/addAttach',
-                    file: file,
-                    method: 'POST',
-                    data: {
-                        item: item
-                    }
-                }).success(function (data) {
-                    if (data.item) {
-                        item = data.item;
-                    }
-                });
                 if (withSteps) { // 保存并报价
                     PurcInquiry.reply({itemId: item.id, token: $scope.token}, item, function () {
-                        $scope.loading = false;
-                        toaster.pop('info', '提示', '报价成功');
-                        $timeout(function () {
+                        var file = item.myFiles, file = file && file.length > 0 ? file[0] : null;
+                        $upload.upload({
+                            url: 'sale/inquiry/addAttach',
+                            file: file,
+                            method: 'POST',
+                            data: {
+                                item: item
+                            }
+                        }).success(function (data) {
+                            if (data.item) {
+                                item = data.item;
+                            }
+                            $scope.loading = false;
+                            toaster.pop('info', '提示', '报价成功');
                             $scope.tableParams.reload();
-                        }, 300);
+                        }).error(function (data) {
+                            $scope.loading = false;
+                            toaster.pop('error', '附件上传失败');
+                        });
                     }, function (response) {
                         $scope.loading = false;
                         toaster.pop('error', '询价失效', response.data);
                     });
                 } else {  // 保存
                     PurcInquiry.saveItem({itemId: item.id, token: $scope.token}, item, function () {
-                        $scope.loading = false;
-                        toaster.pop('info', '提示', '保存成功');
-                        $timeout(function () {
+                        var file = item.myFiles, file = file && file.length > 0 ? file[0] : null;
+                        $upload.upload({
+                            url: 'sale/inquiry/addAttach',
+                            file: file,
+                            method: 'POST',
+                            data: {
+                                item: item
+                            }
+                        }).success(function (data) {
+                            if (data.item) {
+                                item = data.item;
+                            }
+                            $scope.loading = false;
+                            toaster.pop('info', '提示', '保存成功');
                             $scope.tableParams.reload();
-                        }, 300);
+                        }).error(function (data) {
+                            $scope.loading = false;
+                            toaster.pop('error', '附件上传失败');
+                        });
                     }, function (response) {
                         $scope.loading = false;
                         toaster.pop('error', '保存失败', response.data);
@@ -9627,6 +9643,11 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         AccountEnterprise.get({}, function (data) {
             $scope.loading = false;
             $scope.enterprise = data;
+            if (data.tags) {
+                $scope.tags = data.tags.split(',');  // 将逗号分隔的标签字符串转换成数组，便于操作
+            } else {
+                $scope.tags = [];
+            }
 
             // 获取付款企业信息
             DeputyOrder.paycompanies({enuu: $scope.enterprise.uu}, {}, function (data) {
@@ -9661,6 +9682,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 更新企业信息
         $scope.updateDetailInfo = function () {
             $scope.loading = true;
+            $scope.enterprise = $scope.copyEnterprise;
+            $scope.enterprise.tags = $scope.tags.join(','); // 将标签数组转换成逗号分隔的字符串，便于储存
             AccountEnterprise.save($scope.enterprise, function () {
                 $scope.loading = false;
                 $scope.connectionEditing = false;
@@ -9855,6 +9878,74 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         }
 
+        // 添加经营范围标签
+        $scope.addTag = function () {
+            if ($scope.tags.indexOf($scope.tag) == -1){
+                if (null != $scope.tag && '' != $scope.tag) {
+                    $scope.tags.push($scope.tag);
+                }
+            }
+            $scope.tag = '';
+        }
+
+        // 移除经营范围标签
+        $scope.removeTag = function (tag) {
+            removeByValue($scope.tags, tag);
+        }
+        // 获取行业信息
+        $http.get('static/data/profession.json').success(function (data) {
+            $scope.list = data;
+        });
+
+        // 选择行业
+        $scope.profession = new Array();
+        $scope.showProfession = false;
+        $scope.selectProfession = function () {
+            $scope.professionArray = [];
+            $scope.active = [];
+            $scope.showProfession = !$scope.showProfession;
+            $scope.profession[0] = $scope.list;
+        }
+
+        $scope.isInList = false;
+        $scope.isInInput = false;
+        $scope.hideList = function () {
+            if (!$scope.isInList && !$scope.isInInput && $scope.showProfession) {
+                $scope.showProfession = false;
+            }
+        }
+
+        // 行业子菜单点击
+        $scope.onItemClick = function (key, index, value) {
+            $scope.active[index] = key;
+            if (angular.isString(value)){ // 值为字符串说明点击的是最后一级
+                $scope.copyEnterprise.profession = value;
+                $scope.showProfession = false;
+                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;
+            }
+        }
+
+        // 判断值是否为字符串
+        $scope.isString = function (value) {
+            return angular.isString(value);
+        }
+
+        // 拷贝企业数据，在编辑企业数据是使用拷贝数据
+        $scope.copyData = function () {
+            $scope.copyEnterprise = angular.copy($scope.enterprise);
+            if ($scope.enterprise.tags) {
+                $scope.tags = $scope.enterprise.tags.split(',');  // 将逗号分隔的标签字符串转换成数组，便于操作
+            } else {
+                $scope.tags = [];
+            }
+        }
     }]);
 
     // 编辑收货地址

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

@@ -3,277 +3,421 @@
 </div>
 <link rel="stylesheet" href="static/css/add.css " />
 <style>
-.com_title {
-	width: 100%;
-	margin: 0px auto;
-	height: 40px;
-	line-height: 40px;
-	font-size: 14px;
-	color: #323232;
-	background: #f5f5f5;
-}
-
-.com_title font {
-	color: #327ebe;
-}
-
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 44px;
-	background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
-	background-color: #f5f5f5;
-	background-size: 100% 100%;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
-.com_title01 {
-	height: 50px;
-	line-height: 50x;
-	width: 100%;
-	margin: 0 auto;
-	border-bottom: #5078cb 1px dotted;
-}
-
-.com_title01 span {
-	margin-left: 20px;
-	font-size: 14px;
-	line-height: 50px;
-	color: #555;
-	font-weight: bold;
-}
-
-.com_title01 a {
-	margin-right: 20px;
-	line-height: 50px;
-}
-
-#company .com-text {
-	height: 35px;
-	line-height: 35px;
-}
-#company .com-text .title {
-	font-size: 14px;
-	font-weight: inherit;
-	color: #323232;
-	width: 120px;
-	padding-left: 5px;
-}
-
-#company .com-text .content {
-	font-size: 14px;
-	color: #969595;
-}
-
-#company .logo-load {
-	width: 100px;
-	height: 100px;
-	background: url("static/img/purc/upload.png") no-repeat center;
-	display: inline-block;
-	border: #ccc 1px solid;
-	float: left;
-	margin-left: 0;
-}
-
-#company .logo-load input {
-	width: 100px !important;
-	height: 100px;
-	filter: alpha(opacity = 0);
-	-moz-opacity: 0;
-	opacity: 0;
-}
-
-#company .logo-img {
-	height: 100px;
-}
-
-#company .logo-img .well {
-	float: left;
-	width: 100px;
-	height: 100px;
-	background: #fff;
-}
-
-#company .input-group-addon {
-	display: inline-block;
-	height: 26px;
-	width: 50px;
-	float: left;
-	margin-top: 5px;
-}
-
-#company .content {
-	width: 72%;
-	height: 35px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-#company .form-control {
-	border: #bfbfbf 1px solid;
-	margin-top: 5px;
-	font-size: 14px;
-	border-radius: 3px;
-}
-
-#company .col-xs-4 p {
-	color: #959595;
-}
-
-#company .col-xs-4 .title {
-	padding: 0;
-}
-
-#company .row-sm {
-	border-bottom: #e8e8e8 1px solid;
-	padding-bottom: 20px;
-}
-#company .com-list .row-sm:hover{
-	border: #d32526 2px solid;
-}
-.bule {
-	color: #327ebe;
-	font-size: 14px;
-	padding-left: 20px;
-}
-
-.save-btn {
-	width: 100%;
-	height: 40px;
-}
-
-.save-btn .btn01 {
-	border: 1px;
-	width: 94px;
-	height: 36px;
-	line-height: 36px;
-	font-size: 14px;
-	display: inline-block;
-	text-align: center;
-	float: right;
-	background: #327ebe;
-	color: #fff;
-	margin-right: 20px;
-}
-
-.com_title01 a.color01 {
-	color: #d32526;
-}
-
-.com_title01 a.color02 {
-	color: #3a89d1;
-}
-
-.com-list .row {
-	position: relative;
-}
-
-.com-list .edit-icon {
-	display: none;
-}
-.com-list .row:hover .edit-icon{
-	display: inline-block;
-}
-.com-list .edit-icon {
-	position: absolute;
-	top: 10px;
-	right: 0;
-	width: 100px !important;
-}
-
-.com-list .content span {
-	font-size: 14px;
-}
-
-.com-list .edit-icon a {
-	width: 42px;
-	height: 24px;
-	display: inline-block;
-	background: #8bc6f7;
-	font-size: 12px;
-	color: #fff;
-	margin: 0 0 0 3px;
-	float: left;
-	border-radius: 1px;
-	line-height: 24px;
-	text-align: center;
-}
-
-.com-list .row:hover {
-	border: #d32526 1px solid;
-}
-
-.com-list .edit-icon a:hover {
-	background: #3a89d1;
-}
-
-.com_title01 a {
-	color: #3a89d1;
-	font-size: 14px;
-	float: right;
-}
-
-.addrs-open a.open,.company-open a.open {
-	float: right;
-}
-
-.addrs-open a.open i ,.company-open a.open i{
-	margin-left: 5px;
-}
-
-.com_title01 {
-	border-top: none;
-}
-
-.com-list {
-	height: 186px;
-	width: 100%;
-	overflow: hidden;
-}
-.input-group-xs>.input-group-addon{
-	border: #bfbfbf 1px solid;
-}
-.com_title01 a span{
-	font-weight: normal;
-	color: #5078cb;
-	margin-right: 3px;
-}
-.address.active,.company.active{
-	height: auto !important;
-}
+	.com_title {
+		width: 100%;
+		margin: 0px auto;
+		height: 40px;
+		line-height: 40px;
+		font-size: 14px;
+		color: #323232;
+		background: #f5f5f5;
+	}
+
+	.com_title font {
+		color: #327ebe;
+	}
+
+	.com_head {
+		width: 100%;
+		height: 40px;
+		line-height: 44px;
+		background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
+		background-color: #f5f5f5;
+		background-size: 100% 100%;
+	}
+
+	.com_head span {
+		margin-left: 20px;
+		color: #000;
+		font-size: 14px;
+	}
+
+	.com_title01 {
+		height: 50px;
+		line-height: 50px;
+		width: 100%;
+		margin: 0 auto;
+		border-bottom: #5078cb 1px dotted;
+	}
+
+	.com_title01 span {
+		margin-left: 20px;
+		font-size: 14px;
+		line-height: 50px;
+		color: #555;
+		font-weight: bold;
+	}
+
+	.com_title01 a {
+		margin-right: 20px;
+		line-height: 50px;
+	}
+
+	#company .com-text {
+		height: 35px;
+		line-height: 35px;
+	}
+	#company .com-text .title {
+		font-size: 14px;
+		font-weight: inherit;
+		color: #323232;
+		width: 120px;
+		padding-left: 5px;
+	}
+
+	#company .com-text .content {
+		font-size: 14px;
+		color: #969595;
+	}
+
+	#company .logo-load {
+		width: 100px;
+		height: 100px;
+		background: url("static/img/purc/upload.png") no-repeat center;
+		display: inline-block;
+		border: #ccc 1px solid;
+		float: left;
+		margin-left: 0;
+	}
+
+	#company .logo-load input {
+		width: 100px !important;
+		height: 100px;
+		filter: alpha(opacity = 0);
+		-moz-opacity: 0;
+		opacity: 0;
+	}
+
+	#company .logo-img {
+		height: 100px;
+	}
+
+	#company .logo-img .well {
+		float: left;
+		width: 100px;
+		height: 100px;
+		background: #fff;
+	}
+
+	#company .input-group-addon {
+		display: inline-block;
+		height: 26px;
+		width: 50px;
+		float: left;
+		margin-top: 5px;
+	}
+
+	#company .content {
+		width: 72%;
+		height: 35px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	#company .form-control {
+		border: #bfbfbf 1px solid;
+		margin-top: 5px;
+		font-size: 14px;
+		border-radius: 3px;
+	}
+
+	#company .col-xs-4 p {
+		color: #959595;
+	}
+
+	#company .col-xs-4 .title {
+		padding: 0;
+	}
+
+	#company .row-sm {
+		border-bottom: #e8e8e8 1px solid;
+		padding-bottom: 20px;
+	}
+	#company .com-list .row-sm:hover{
+		border: #d32526 2px solid;
+	}
+	.bule {
+		color: #327ebe;
+		font-size: 14px;
+		padding-left: 20px;
+	}
+
+	.save-btn {
+		width: 100%;
+		height: 40px;
+	}
+
+	.save-btn .btn01 {
+		border: 1px;
+		width: 94px;
+		height: 36px;
+		line-height: 36px;
+		font-size: 14px;
+		display: inline-block;
+		text-align: center;
+		float: right;
+		background: #327ebe;
+		color: #fff;
+		margin-right: 20px;
+	}
+
+	.com_title01 a.color01 {
+		color: #d32526;
+	}
+
+	.com_title01 a.color02 {
+		color: #3a89d1;
+	}
+
+	.com-list .row {
+		position: relative;
+	}
+
+	.com-list .edit-icon {
+		display: none;
+	}
+	.com-list .row:hover .edit-icon{
+		display: inline-block;
+	}
+	.com-list .edit-icon {
+		position: absolute;
+		top: 10px;
+		right: 0;
+		width: 100px !important;
+	}
+
+	.com-list .content span {
+		font-size: 14px;
+	}
+
+	.com-list .edit-icon a {
+		width: 42px;
+		height: 24px;
+		display: inline-block;
+		background: #8bc6f7;
+		font-size: 12px;
+		color: #fff;
+		margin: 0 0 0 3px;
+		float: left;
+		border-radius: 1px;
+		line-height: 24px;
+		text-align: center;
+	}
+
+	.com-list .row:hover {
+		border: #d32526 1px solid;
+	}
+
+	.com-list .edit-icon a:hover {
+		background: #3a89d1;
+	}
+
+	.com_title01 a {
+		color: #3a89d1;
+		font-size: 14px;
+		float: right;
+	}
+
+	.addrs-open a.open,.company-open a.open {
+		float: right;
+	}
+
+	.addrs-open a.open i ,.company-open a.open i{
+		margin-left: 5px;
+	}
+
+	.com_title01 {
+		border-top: none;
+	}
+
+	.com-list {
+		height: 186px;
+		width: 100%;
+		overflow: hidden;
+	}
+	.input-group-xs>.input-group-addon{
+		border: #bfbfbf 1px solid;
+	}
+	.com_title01 a span{
+		font-weight: normal;
+		color: #5078cb;
+		margin-right: 3px;
+	}
+	.address.active,.company.active{
+		height: auto !important;
+	}
+	.enterprise-area span{
+		margin-right: 5px;
+		font-size: 12px;
+		padding: 0 5px;
+		display: inline-block;
+		border: #5078cb 1px solid;
+		border-radius: 4px;
+		line-height: 25px;
+		color: #5078cb;
+		position: relative;
+		float: left;
+		margin: 5px;
+	}
+	.enterprise-area span i{
+		position: absolute;
+		top: -5px;
+		right: -7px;
+		margin-left: 3px;
+		font-size: 18px;
+		color: #f00;
+		background: #fff;
+		border-radius: 100%;
+		height: 12px;
+	}
+	.enterprise-area span i:hover{
+		cursor: pointer;
+	}
+	.enterprise-area span:first-child{
+		margin-left: 0;
+	}
+	.enterprise-area .form-control{
+		height: 26px;
+		padding: 0 5px;
+		width: 103px;
+		float: left;
+		margin-right: 5px;
+	}
+	#company .add-tag{
+		padding-left: 124px;
+		position: relative;
+	}
+	#company .add-tag input{
+		width: 318px;
+	}
+	#company .add-tag a{
+		width: 75px;
+		height: 34px;
+		position: absolute;
+		top: 5px;
+		left: 363px;
+		line-height: 31px;
+		border: none;
+		background: no-repeat;
+		color: #5078cb;
+		cursor: pointer;
+	}
+	.choose-body {
+		display: table;
+		width: 33.333333%;
+		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;
+		padding-right: 2px;
+		float: left;
+	}
+
+	.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;
+	}
+	.area-bg{
+		background: url("static/img/all/dot.png") no-repeat right center;
+		background-position: 302px;
+	}
+	.area-list{
+		position: absolute;
+		top: 26px;
+		left: 125px;
+		width: 630px;
+	}
 </style>
 <!--<div class="com_title">设置&gt;企业设置<font>&gt;企业信息</font></div>-->
 <div class="com_head"><span>企业信息</span></div>
-<div class="pane base-info" id="company">
+<div class="pane base-info" id="company" ng-click="hideList()">
 	<div class="com_title01"><span>基本信息</span></div>
 	<div class="pane-body">
 		<div class="row row-sm item">
 			<div class="col-xs-12">
-				<div class="com-text col-xs-6">
-					<span class="title">企业UU号：</span>
-					<div class="content" ng-bind="::enterprise.uu"></div>
-				</div>
 				<div class="com-text col-xs-6">
 					<span class="title">企业名称：</span>
 					<div class="content" ng-bind="::enterprise.enName"></div>
 				</div>
-				<div class="com-text col-xs-6">
-					<span class="title">企业简称：</span>
-					<div class="content" ng-bind="::enterprise.enShortname"></div>
-				</div>
 				<div class="com-text col-xs-6">
 					<span class="title">营业执照号：</span>
 					<div class="content" ng-bind="::enterprise.enBussinessCode"></div>
 				</div>
 				<div class="com-text col-xs-6">
-					<span class="title">注册地区：</span>
+					<span class="title">法定代表人：</span>
+					<div class="content" ng-bind="::enterprise.enCorporation"></div>
+				</div>
+				<div class="com-text col-xs-6">
+					<span class="title">企业地址：</span>
 					<div class="content" ng-bind="::enterprise.enArea"></div>
 				</div>
+				<div class="com-text col-xs-6">
+					<span class="title">企业UU号：</span>
+					<div class="content" ng-bind="::enterprise.uu"></div>
+				</div>
 			</div>
 			<!-- <div class="col-xs-4">
 				<div class="com-text col-xs-12">
@@ -305,9 +449,9 @@
 		</div>
 	</div>
 	<div class="com_title01"><span>详细信息</span>
-		<a ng-show="!connectionEditing" ng-click="connectionEditing = true" class="pull-right text-simple"><i
-			class="fa fa-pencil fa-fw fa-lg"></i>编辑</a>
-		<a ng-show="connectionEditing" ng-click="connectionEditing = false" class="pull-right text-simple color01"><i
+		<a ng-show="!connectionEditing" ng-click="connectionEditing = true;copyData()" class="pull-right text-simple"><i
+				class="fa fa-pencil fa-fw fa-lg"></i>编辑</a>
+		<a ng-show="connectionEditing" ng-click="connectionEditing = false;copyData()" class="pull-right text-simple color01"><i
 				class="fa fa-reply-all fa-fw"></i>取消</a>
 		<a ng-show="connectionEditing" ng-click="updateDetailInfo()" class="pull-right text-simple  color02"><i
 				class="fa fa-save fa-fw"></i>保存</a>
@@ -318,88 +462,162 @@
 			<div class="row row-sm item">
 				<div class="col-xs-12">
 					<div class="com-text col-xs-6">
-						<span class="title">企业官网：</span><a ng-show="!connectionEditing" class="content"
-														   ng-bind="::enterprise.enUrl" href="http://{{::enterprise.enUrl}}"
-														   target="_blank"></a>
+						<span class="title">联系人：</span>
+						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.contactMan"></div>
 						<div class="content" ng-show="connectionEditing">
-							<div class="input-group input-group-xs" style="width: 320px;">
-								<span class="input-group-addon">http://</span>
-								<input required="required" ng-model="enterprise.enUrl" type="text" class="form-control input-xs"  style="width: 270px;" placeholder="企业官方网站网址">
-							</div>
+							<input  ng-model="copyEnterprise.contactMan" type="text" class="form-control input-xs" placeholder="联系人" />
 						</div>
 					</div>
 					<div class="com-text col-xs-6">
-						<span class="title">企业传真</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enFax"></div>
+						<span class="title">联系电话：</span>
+						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.contactTel"></div>
 						<div class="content" ng-show="connectionEditing">
-							<div class="input-group input-group-xs" style="width: 320px;">
-								<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="企业传真信息">
-							</div>
+							<input required="required" ng-model="copyEnterprise.contactTel" type="text" class="form-control input-xs" placeholder="企业电话" />
 						</div>
 					</div>
 				</div>
-			<!-- 	<div class="col-xs-12">
-					<div class="com-text col-xs-6">
-						<span class="title">成立时间：</span>
-						<div class="content" ng-show="connectionEditing">
-							<input required="required" type="text" class="form-control input-xs" placeholder="成立时间" />
-						</div>
-					</div>
-					<div class="com-text col-xs-6">
-						<span class="title">员工人数：</span>
-						<div class="content" ng-show="connectionEditing">
-							<input required="required" type="text" class="form-control input-xs" placeholder="员工人数" />
-						</div>
-					</div>
-				</div> -->
 				<div class="col-xs-12">
 					<div class="com-text col-xs-6">
-						<span class="title">企业电话：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enTel"></div>
+						<span class="title">邮箱：</span>
+						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.contactEmail"></div>
 						<div class="content" ng-show="connectionEditing">
-							<input required="required" ng-model="enterprise.enTel" type="text" class="form-control input-xs" placeholder="企业电话" />
+							<input required="required" ng-model="copyEnterprise.contactEmail" type="text" class="form-control input-xs" placeholder="邮箱" />
 						</div>
 					</div>
 					<div class="com-text col-xs-6">
-						<span class="title">开户银行：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enbank"></div>
+						<span class="title">传真：</span>
+						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enFax"></div>
 						<div class="content" ng-show="connectionEditing">
-							<input required="required" type="text" class="form-control input-xs" placeholder="开户银行" ng-model="enterprise.enbank"/>
+							<div class="input-group input-group-xs" style="width: 320px;">
+								<input required="required" ng-model="copyEnterprise.enFax" type="text" class="form-control input-xs" placeholder="企业传真信息">
+							</div>
 						</div>
 					</div>
 				</div>
 				<div class="col-xs-12">
 					<div class="com-text col-xs-6">
-						<span class="title">员工人数：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.emcount"></div>
+						<span class="title">官网：</span>
+						<a ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enUrl"
+                           href="http://{{::enterprise.enUrl}}"
+						   target="_blank">
+						</a>
 						<div class="content" ng-show="connectionEditing">
-							<input required="required" type="text" class="form-control input-xs" placeholder="员工人数" ng-model="enterprise.emcount"/>
-						</div>
-					</div>
-					<div class="com-text col-xs-6">
-						<span class="title">地址：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enAddress"></div>
-						<div class="content" ng-show="connectionEditing" style="width: 320px;">
-							<input ng-model="enterprise.enAddress" placeholder="详细地址"
-								   class="form-control input-xs" type="text" />
+							<div class="input-group input-group-xs" style="width: 320px;">
+								<span class="input-group-addon">http://</span>
+								<input required="required" ng-model="copyEnterprise.enUrl" type="text" class="form-control input-xs"  style="width: 270px;" placeholder="企业官方网站网址">
+							</div>
 						</div>
 					</div>
 				</div>
-				<div class="col-xs-12">
+				<!--<div class="col-xs-12">-->
+				<!--<div class="com-text col-xs-6">-->
+				<!--<span class="title">企业电话：</span>-->
+				<!--<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enTel"></div>-->
+				<!--<div class="content" ng-show="connectionEditing">-->
+				<!--<input required="required" ng-model="enterprise.enTel" type="text" class="form-control input-xs" placeholder="企业电话" />-->
+				<!--</div>-->
+				<!--</div>-->
+				<!--<div class="com-text col-xs-6">-->
+				<!--<span class="title">开户银行：</span>-->
+				<!--<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enbank"></div>-->
+				<!--<div class="content" ng-show="connectionEditing">-->
+				<!--<input required="required" type="text" class="form-control input-xs" placeholder="开户银行" ng-model="enterprise.enbank"/>-->
+				<!--</div>-->
+				<!--</div>-->
+				<!--</div>-->
+				<!--<div class="col-xs-12">-->
+				<!--<div class="com-text col-xs-6">-->
+				<!--<span class="title">员工人数：</span>-->
+				<!--<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.emcount"></div>-->
+				<!--<div class="content" ng-show="connectionEditing">-->
+				<!--<input required="required" type="text" class="form-control input-xs" placeholder="员工人数" ng-model="enterprise.emcount"/>-->
+				<!--</div>-->
+				<!--</div>-->
+				<!--<div class="com-text col-xs-6">-->
+				<!--<span class="title">地址：</span>-->
+				<!--<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enAddress"></div>-->
+				<!--<div class="content" ng-show="connectionEditing" style="width: 320px;">-->
+				<!--<input ng-model="enterprise.enAddress" placeholder="详细地址"-->
+				<!--class="form-control input-xs" type="text" />-->
+				<!--</div>-->
+				<!--</div>-->
+				<!--</div>-->
+				<div class="col-xs-12" >
 					<div class="com-text col-xs-6">
 						<span class="title">行业：</span>
-						<div ng-show="!connectionEditing" class="content">
-							{{enterprise.enIndustry=='make'?'制造型':'贸易型'}}
+						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.profession">
+							<!--{{enterprise.enIndustry=='make'?'制造型':'贸易型'}}-->
 						</div>
 						<div class="content" ng-show="connectionEditing">
-							<select ng-model="enterprise.enIndustry" placeholder="所属行业"
-									class="form-control input-xs" type="text" style="width: 320px;">
-								<option value="make">制造型</option>
-								<option value="trade">贸易型</option>
-							</select>
+							<input ng-model="copyEnterprise.profession" placeholder="所属行业" ng-mouseenter="isInInput = true"  ng-mouseleave="isInInput = false"
+								   class="area-bg 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" ng-mouseenter="isInList = true" ng-mouseleave="isInList = false" class="area-list">
+							<div class="choose-body">
+								<div class="choose-item">
+									<ul class="list-unstyled">
+										<li ng-repeat="(key, value) in profession[0]" ng-class="{active: key == active[0]}">
+											<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: key == active[1]}">
+											<a ng-click="onItemClick(key, 1, value)">{{key}}
+												<span ng-show="!isString(value)" class="caret" ></span>
+											</a>
+										</li>
+									</ul>
+								</div>
+							</div>
+							<div class="choose-body" ng-show="profession[2]" style="border-left:0;">
+								<div class="choose-item">
+									<ul class="list-unstyled">
+										<li ng-repeat="(key, value) in profession[2]" ng-class="{active: key == active[2]}">
+											<a ng-click="onItemClick(key, 2, value)">{{key}}
+												<span ng-show="!isString(value)" class="caret" ></span>
+											</a>
+										</li>
+									</ul>
+								</div>
+							</div>
+							<div class="choose-body" ng-show="professionArray.length > 0" style="border-left:0;">
+								<div class="choose-item">
+									<ul class="list-unstyled">
+										<li ng-repeat="value in professionArray" ng-class="{active: false}">
+											<a ng-click="onItemClick(null, -1, value)">{{value}}</a>
+										</li>
+									</ul>
+								</div>
+							</div>
 						</div>
 					</div>
 				</div>
+				<div class="col-xs-12" style="height: auto">
+					<div class="com-text col-xs-12" style="height: auto">
+						<span class="title">经营范围：</span>
+						<div class="content enterprise-area" style="height: auto" ng-model="::enterprise.tags">
+                            <span ng-if="tags.length == 0" style="background: #5078cb; color: #ffffff">暂无标签</span>
+							<span ng-repeat="tag in tags track by $index">{{tag}}
+								<i class="fa fa-times-circle" ng-show="connectionEditing" ng-click="removeTag(tag)"></i>
+							</span>
+						</div>
+					</div>
+					<div class="com-text col-xs-12 add-tag" ng-show="connectionEditing">
+						<input type="text" ng-model="tag" class="form-control" maxlength="10" placeholder="不大于10个字符"/>
+						<a ng-click="addTag()">+添加标签</a>
+					</div>
+				</div>
 			</div>
 		</form>
 	</div>
@@ -503,7 +721,7 @@
 		</form>
 	</div>
 
-	<div class="com_title01"><span>企业管理员</span>
+	<div class="com_title01"><span>管理员信息</span>
 		<a href="https://account.ubtob.com/changeAdmin/changeAdmin" class="pull-right text-simple" target="_blank"><i class="fa fa-exchange fa-fw fa-lg"></i>更换管理员</a>
 	</div>
 	<div class="pane-body">
@@ -514,10 +732,10 @@
 						<span class="title">姓名：</span>
 						<div class="content" ng-bind="::enterprise.admin.userName">陈虎</div>
 					</div>
-					<div class="com-text col-xs-6">
-						<span class="title">性别：</span>
-						<div class="content">{{enterprise.admin.userSex === 'F' ? '女' : '男'}}</div>
-					</div>
+					<!--<div class="com-text col-xs-6">-->
+					<!--<span class="title">性别：</span>-->
+					<!--<div class="content">{{enterprise.admin.userSex === 'F' ? '女' : '男'}}</div>-->
+					<!--</div>-->
 				</div>
 				<div class="col-xs-12">
 					<div class="com-text col-xs-6">
@@ -660,11 +878,12 @@
 			</form>
 		</div>
 	</div>
-	<div class="com_title01"><span>你拥有的服务</span></div>
+	<div class="com_title01"><span>已开通服务</span></div>
 	<div class="pane-body">
 		<div class="row">
-			<div class="col-xs-6"><a href="http://uas.ubtob.com/#/index" class="bule">B2B商务平台</a></div>
-			<div class="col-xs-6"><a href="http://www.usoftmall.com/" class="bule" target="_blank">优软商城</a></div>
+			<div class="col-xs-4"><a href="http://uas.ubtob.com/#/index" class="bule" title="B2B商务平台">B2B商务平台</a></div>
+			<div class="col-xs-4"><a href="http://www.usoftmall.com/" class="bule" target="_blank" title="优软商城">优软商城</a></div>
+			<div class="col-xs-4"><a href="http://v2.usoftchina.com/uu" class="bule" target="_blank" title="UU互联">UU互联</a></div>
 		</div>
 	</div>
 	<div class="save-btn">
@@ -672,80 +891,80 @@
 	</div>
 </div>
 <div class="bomb-box" style="display: none" id="ship">
-    <form class="box04 box" name="shipAddress" id="shipAddress">
-        <i class="off"><img src="static/img/purc/close.png" alt="" /></i>
-        <p>收货人资料</p>
-        <ul>
-            <li class="line01">
-                <div class="fl">
-                    <span class="fl"><em>*</em>收货人：</span>
-                    <span class="fr"><input type="text" placeholder="填写收货人" ng-model="ship.receiver" required="true"/></span>
-                </div>
-                <div class="fr">
-                    <span class="fl"><em>*</em>手机：</span>
-                    <span class="fr"><input type="text" ng-model="ship.usertel" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/"/></span>
-                </div>
-            </li>
-            <li class="line01">
-                <div class="fl">
-                    <span class="fl">固定电话<em></em>：</span>
-                    <span class="fr"><input type="text" ng-model="ship.phone"  ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"/></span>
-                </div>
-                <div class="fr">
-                    <span class="fl">邮箱：</span>
-                    <span class="fr emaill"><input type="text" ng-model="ship.email" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/"/><i>用于接收订单提醒邮件，便于您及时了解订单状态</i></span>
-                </div>
-            </li>
-            <li class="line02 margin-top40">
-                <div class="fl"><em>*</em>所在地址：</div>
-                <!--<div class="select fr"><input type="text" placeholder="请选择" ng-model="ship.address" required="true"/><i class="fa fa-angle-down"></i></div>-->
-				 <div class="select fr">
-                    <select required="" class="area-select" ng-model="ship.province" ng-options="key as key for (key,value) in provinces"
-                            ng-change="ship.city='';ship.district='';" required="true">  
-                        <option value="">省</option>  
-                    </select>
-                    <select class="area-select" ng-model="ship.city" ng-options="key as key for (key,value) in provinces[ship.province]"
-                            ng-change="ship.district='';" required="true">  
-                        <option value="">市</option>  
-                    </select>
-                    <select class="area-select" ng-model="ship.district" ng-options="value as value for value in provinces[ship.province][ship.city]" required="true">
-                        <option value="">区</option>  
-                    </select>  
+	<form class="box04 box" name="shipAddress" id="shipAddress">
+		<i class="off"><img src="static/img/purc/close.png" alt="" /></i>
+		<p>收货人资料</p>
+		<ul>
+			<li class="line01">
+				<div class="fl">
+					<span class="fl"><em>*</em>收货人：</span>
+					<span class="fr"><input type="text" placeholder="填写收货人" ng-model="ship.receiver" required="true"/></span>
+				</div>
+				<div class="fr">
+					<span class="fl"><em>*</em>手机：</span>
+					<span class="fr"><input type="text" ng-model="ship.usertel" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/"/></span>
+				</div>
+			</li>
+			<li class="line01">
+				<div class="fl">
+					<span class="fl">固定电话<em></em>：</span>
+					<span class="fr"><input type="text" ng-model="ship.phone"  ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"/></span>
 				</div>
-            </li>
-            <li class="line02">
-                <div class="fl"><em>*</em>详细地址：</div>
-                <div class="fr"><input type="text" ng-model="ship.addressdet" required="true"/></div>
-            </li>
-            <li class="line02">
-                <div class="fl">地址别名：</div>
-                <div class="fr address"><input type="text" ng-model="ship.addalias"/><i>建议填写常用名称：家里/父母家/公司</i></div>
-            </li>
-        </ul>
-        <div class="many-file-btn">
-            <button class="btn01" ng-click="saveShipAddress(ship)" ng-disabled="shipAddress.$invalid">保存</button><a class="btn02" ng-click="">取消</a>
-        </div>
-    </form>
+				<div class="fr">
+					<span class="fl">邮箱：</span>
+					<span class="fr emaill"><input type="text" ng-model="ship.email" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/"/><i>用于接收订单提醒邮件，便于您及时了解订单状态</i></span>
+				</div>
+			</li>
+			<li class="line02 margin-top40">
+				<div class="fl"><em>*</em>所在地址：</div>
+				<!--<div class="select fr"><input type="text" placeholder="请选择" ng-model="ship.address" required="true"/><i class="fa fa-angle-down"></i></div>-->
+				<div class="select fr">
+					<select required="" class="area-select" ng-model="ship.province" ng-options="key as key for (key,value) in provinces"
+							ng-change="ship.city='';ship.district='';" required="true">
+						<option value="">省</option>
+					</select>
+					<select class="area-select" ng-model="ship.city" ng-options="key as key for (key,value) in provinces[ship.province]"
+							ng-change="ship.district='';" required="true">
+						<option value="">市</option>
+					</select>
+					<select class="area-select" ng-model="ship.district" ng-options="value as value for value in provinces[ship.province][ship.city]" required="true">
+						<option value="">区</option>
+					</select>
+				</div>
+			</li>
+			<li class="line02">
+				<div class="fl"><em>*</em>详细地址：</div>
+				<div class="fr"><input type="text" ng-model="ship.addressdet" required="true"/></div>
+			</li>
+			<li class="line02">
+				<div class="fl">地址别名：</div>
+				<div class="fr address"><input type="text" ng-model="ship.addalias"/><i>建议填写常用名称：家里/父母家/公司</i></div>
+			</li>
+		</ul>
+		<div class="many-file-btn">
+			<button class="btn01" ng-click="saveShipAddress(ship)" ng-disabled="shipAddress.$invalid">保存</button><a class="btn02" ng-click="">取消</a>
+		</div>
+	</form>
 </div>
 <script src="static/lib/jquery/jquery.min.js"></script>
 <script>
-    $(function(){
-        //新增收货地址
-        $(".com_title01 .add-address").click(function(){
-        	document.getElementById('shipAddress').reset();
-            $("#ship").show();
-        });
-        
-        $("#message .add-address").click(function(){
-        	document.getElementById('shipAddress').reset();
-            $("#ship").show();
-        });
-        
-        $(".bomb-box .box04 .off,.box04 .many-file-btn .btn02").click(function(){
-            $(".bomb-box").hide();
-        })
-         $(".bomb-box .box04 .off,.box04 .many-file-btn .btn01").click(function(){
-            $(".bomb-box").hide();
-        })
-    })
+	$(function(){
+		//新增收货地址
+		$(".com_title01 .add-address").click(function(){
+			document.getElementById('shipAddress').reset();
+			$("#ship").show();
+		});
+
+		$("#message .add-address").click(function(){
+			document.getElementById('shipAddress').reset();
+			$("#ship").show();
+		});
+
+		$(".bomb-box .box04 .off,.box04 .many-file-btn .btn02").click(function(){
+			$(".bomb-box").hide();
+		})
+		$(".bomb-box .box04 .off,.box04 .many-file-btn .btn01").click(function(){
+			$(".bomb-box").hide();
+		})
+	})
 </script>

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -396,7 +396,7 @@
 					<div ng-repeat="reply in inquiryItem.replies">
 						<div class="form-group input-group input-group-xs">
 							<input type="text" class="form-control input-xs" ng-class="{'input-error': !replylapQtys[$index]}"  ng-change="verifylapQty(reply.lapQty,$index, inquiryItem)"
-								   ng-model="reply.lapQty" min="{{$index == 0 ? 0 :(inquiryItem.replies[$index - 1].lapQty + 1)}}"
+								   ng-model="reply.lapQty" min="{{$index == 0 ? 0 :(inquiryItem.replies[$index - 1].lapQty + 1)}}" ng-pattern="/^\+?[1-9]\d*$/"
 								   ng-Readonly="$index == 0"  placeholder="数量" />
 								   <span class="input-group-btn" ng-show="$index != 0">
 									<button class="btn btn-default" type="button"