销售类目

@@ -50,6 +50,9 @@ $(document).on('click', '.del-sort-btn', function() {
 $('#save_brand').on('click', function() {
 	e.submit($('#basicForm').attr('action'), function(option) {
 		console.log(option.data);
+		$.each(tabTreeArr, function(i, item) {
+			
+		});
 		option.success = function(res) {
 			res = res.data;
 			if (res.code == '200') {

@@ -26,38 +26,12 @@ var g = new common.grid({
 				return html;
 			}
 		}
-		/*, {
-				display: 'ID',
-				name: 'categoryId'
-			}, {
-				display: '品类名称',
-	name: 'categoryName'
-			}, {
-				display: '所属分类',
-				name: '',
-				render: function() {
-					return '一级分类';
-				}
-			}, {
-				display: '分类图标',
-				name: ''
-			}, {
-				display: '排序',
-				name: 'orderBy'
-			}, {
-				display: '状态',
-				name: 'status'
-			}, {
-				display: '操作',
-				render: function() {
-
-				}
-			}*/
 	]
 });
 
 g.init($("#gridurl").val());
 
+//打开层级类目
 $(document).on('click', '.folder', function() {
 	var $wrap = $(this).parent();
 
@@ -79,4 +53,208 @@ $(document).on('click', '.folder', function() {
 	}
 
 
-});
\ No newline at end of file
+});
+
+var e = null,
+	tabTree = null,
+	tabTreeArr = [],
+	editHtml = $('#editTemp').html();
+
+//添加根分类
+$('#add-root-category').on('click', function() {
+	var data = {};
+	data.action = '/sale/salesCategory/addSC';
+	common.dialog.open({
+		title: '销售类目编辑',
+		content: common.util.__template2(editHtml, data),
+		width: 900
+	});
+	e = new common.edit('#basicForm', {
+		bucket: 'taobaocms'
+	});
+	e.init();
+
+	tabTree = new common.tabTree(".sortTree");
+	tabTree.init();
+	tabTreeArr.push(tabTree);
+});
+
+//添加子分类
+$(document).on('click', '.add-sub-category', function() {
+	var categoryId = $(this).parent().data('id');
+	common.util.__ajax({
+		url: '/sale/salesCategory/querySCById',
+		data: {
+			categoryId: categoryId
+		}
+	}, function(res) {
+		var data = {};
+		data.action = '/sale/salesCategory/addSC';
+		data.parentSC = res.data.parentSC;
+		data.subCategoryName = res.data.categoryName;
+		common.dialog.open({
+			title: '销售类目编辑',
+			content: common.util.__template2(editHtml, data),
+			width: 900
+		});
+		e = new common.edit('#basicForm', {
+			bucket: 'taobaocms'
+		});
+		e.init();
+
+		tabTree = new common.tabTree(".sortTree");
+		tabTree.init();
+		tabTreeArr.push(tabTree);
+	}, true);
+});
+
+//编辑销售类目
+$(document).on('click', '.edit-btn', function() {
+	var categoryId = $(this).parent().data('id');
+	common.util.__ajax({
+		url: '/sale/salesCategory/querySCById',
+		data: {
+			categoryId: categoryId
+		}
+	}, function(res) {
+		res.data.action = '/sale/salesCategory/updateSC';
+		common.dialog.open({
+			title: '销售类目编辑',
+			content: common.util.__template2(editHtml, res.data),
+			width: 900
+		});
+		e = new common.edit('#basicForm', {
+			bucket: 'taobaocms'
+		});
+		e.init();
+
+		tabTree = new common.tabTree(".sortTree");
+		tabTree.init();
+		tabTreeArr.push(tabTree);
+
+		var selectedArr = [];
+
+		$.each(res.data.relationProductSort, function(i, item) {
+			var sort = [{id: item.id, sortName: item.sortName}];
+			addSelected(sort, item);
+			selectedArr.push(sort);
+
+		});
+
+		if (selectedArr > 0) {
+			$('.sort-wrap').empty();
+
+		}
+
+		tabTreeArr = [];
+
+		$.each(selectedArr, function(i, item) {
+			var $sortGroup = $($('#sortWrap').html());
+			$('.sort-wrap').find('.row:last').find('.add-sort-btn').hide().end().find('.del-sort-btn').show();
+			$sortGroup.appendTo($('.sort-wrap'));
+			console.log($('.sort-wrap').find('.row:last'));
+			tabTree = new common.tabTree(".sortTree:last");
+			tabTreeArr.push(tabTree);
+			tabTree.init(item);
+		});
+		
+	}, true);
+});
+
+function addSelected(arr, item) {
+	if (item && item.parentPS) {
+		arr.unshift({id: item.parentPS.id, sortName: item.parentPS.sortName});
+		addSelected(arr, item.parentPS)
+	}
+}
+
+//添加物理类目
+$(document).on('click', '.add-sort-btn',function() {
+	var $sortGroup = $($('#sortWrap').html());
+	$('.sort-wrap').find('.row:last').find('.add-sort-btn').hide().end().find('.del-sort-btn').show();
+	$sortGroup.appendTo($('.sort-wrap'));
+	tabTree = new common.tabTree(".sortTree:last");
+	tabTreeArr.push(tabTree);
+	tabTree.init();
+});
+
+//删除物理类目
+$(document).on('click', '.del-sort-btn', function() {
+	$(this).parents('.row').remove();
+	$('.sort-wrap').find('.row:last').find('.add-sort-btn').show().end().find('.del-sort-btn').show();
+	if ($('.sort-wrap').find('.row').size() == 1) {
+		$('.sort-wrap').find('.row:last').find('.add-sort-btn').show().end().find('.del-sort-btn').hide();
+	}
+});
+
+//保存销售类目
+$(document).on('click', '#save_brand', function() {
+	e.submit($('#basicForm').attr('action'), function(option) {
+		var selected = [];
+		$.each(tabTreeArr, function(i, item){
+			if (item.selected.length > 0) {
+				selected.push(item.selected[item.selected.length - 1].id);
+			}
+		});
+
+		option.data.relationParameter = selected.join(',');
+		console.log(option.data);
+		option.success = function(res) {
+			res = res.data;
+			if (res.code == '200') {
+				e.$tip(res.message, function() {
+					//location.reload();
+				}, 'growl-success');
+			} else {
+				e.$tip(res.message);
+			}
+			return false;
+		}
+	});
+});
+
+//开启销售类目
+$(document).on('click', '.open-category', function() {
+	var categoryId = $(this).parent().data('id'),
+		categoryName = $(this).parent().data('name');
+
+	common.dialog.confirm("温馨提示", "确定开启（" + categoryName + "）分类吗", function() {
+		common.util.__ajax({
+			url: '/sale/salesCategory/updateSC',
+			data: {
+				categoryId: categoryId,
+				state: 1
+			}
+		}, function(res){
+			if (res.code == 200) {
+				g.reload();
+			}
+		})
+	});
+})
+
+
+$(document).on('click', '.close-category', function() {
+	var categoryId = $(this).parent().data('id'),
+		categoryName = $(this).parent().data('name');
+
+	common.dialog.confirm("温馨提示", "确定关闭（" + categoryName + "）分类吗", function() {
+		common.util.__ajax({
+			url: '/sale/salesCategory/updateSC',
+			data: {
+				categoryId: categoryId,
+				state: 0
+			}
+		}, function(res){
+			if (res.code == 200) {
+				g.reload();
+			}
+		})
+	});
+})
+
+
+$('input[name="state"]').on('change', function() {
+	$(this).parent().addClass('current').siblings().removeClass('current');
+	g.reload();
+});

@@ -20,11 +20,12 @@ var config = {
         //http://172.16.6.124:8088/platform/product/queryAllProductAttr
         //domain: 'http://172.16.6.146:8088/platform', //玛丽
         //domain:'http://172.16.6.157:8080/yohobuy-platform-web',//葛超
-        domain: 'http://192.168.102.202:8088/platform',
+        //domain: 'http://192.168.102.202:8088/platform',
         //domain: 'http://172.16.6.239:8080', //孙杰翔
         //domain:'http://172.16.6.189:8088/platform', //李健1
         //domain:'http://192.168.102.216:8180/platform', //李健2
-        //domain: 'http://172.16.6.243:8088/platform', //谭玲
+        domain: 'http://172.16.6.243:8088/platform', //谭玲
+        //domain: 'http://172.16.6.204:8088/platform', //陆斌斌
         yohoSearch: 'http://192.168.102.208:8087/yohosearch',
         loggers: {
             api: {

@@ -22,16 +22,40 @@ exports.res = [{
 		type: 'string'
 	}]
 }, {
-	//新增分类页面渲染
+	route: '/sale/salesCategory/querySCById',
+	method: 'POST',
+	url: '/salesCategory/querySCById',
+	params:[{
+		name: 'categoryId',
+		type: 'number'
+	}]
+}/*, {
+	//新增根分类页面渲染
 	route: '/sale/category/add',
 	method: 'GET',
 	src: '/salecategory/edit',
 	view: 'pages/salecategory/edit',
 	data: {
 		action: '/sale/salesCategory/addSC',
-		data: {}
+		data: {
+			addRootCategory: true
+		}
 	}
 }, {
+	//新增子分类页面渲染
+	route: '/sale/category/add/:categoryId',
+	method: 'GET',
+	src: '/salecategory/edit',
+	url: '/salesCategory/querySCById',
+	view: 'pages/salecategory/edit',
+	data: {
+		action: '/sale/salesCategory/addSC'
+	},
+	params: [{
+		name: 'categoryId',
+		type: 'number'
+	}]
+}, {
 	//编辑分类页面渲染
 	route: '/sale/category/edit/:categoryId',
 	method: 'GET',
@@ -45,7 +69,7 @@ exports.res = [{
 		name: 'categoryId',
 		type: 'number'
 	}]
-}, {
+}*/, {
 	//标签管理页面渲染
 	route: '/sale/category/tag/:categoryId',
 	method: 'GET',
@@ -150,7 +174,7 @@ exports.res = [{
 		name: 'icon',
 		type: 'string'
 	}, {
-		name: 'status',
+		name: 'state',
 		type: 'string'
 	}]
 }, {

@@ -22,10 +22,12 @@
         <div class="panel-body">
             <form id="basicForm" role="form" action="{{action}}" class="form-horizontal form-bordered">
                 {{# data}}
+                {{#unless addRootCategory}}
                 <div class="form-group">
                     <label class="col-sm-2 control-label">父分类</label>
                     <div class="col-sm-8 height40">{{# parentSC}}{{categoryName}}{{# items}}-{{categoryName}}{{/ items}}{{/ parentSC}}</div>
                 </div>
+                {{/unless}}
                 
                 <div class="form-group">
                     <label class="col-sm-2 control-label">分类名称</label>
@@ -33,7 +35,7 @@
                 </div>
                 <div class="form-group">
                     <label class="col-sm-2 control-label">分类图标</label>
-                    <div class="col-sm-8"><input type="file" id="icon" name="icon" value="{{icon}}" required="" placeholder="分别图标"></div>
+                    <div class="col-sm-8"><input type="file" id="icon" name="icon" value="{{icon}}" placeholder="分别图标"></div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-2 control-label">物理类目关联</label>
@@ -49,6 +51,7 @@
                         </div>
                     </div>
                 </div>
+                <input id="parentId" type="hidden" value="{{parentId}}">
                 {{/ data}}
             </form>
         </div>
@@ -66,7 +69,7 @@
 
 <script type="text/template" id="sortWrap">
 <div class="row">
-    <div class="col-sm-4">
+    <div class="col-sm-6">
         <div class="sortTree"></div>
     </div>
     <div class="col-sm-2 height40">

@@ -22,33 +22,24 @@
 </div>
 
 <div class="contentpanel">
-<<<<<<< HEAD
     
     <div class="panel panel-default" style="margin:10px 0;">
         <div class="panel-body nopadding">
             <div class="state-select">
                 <strong>状态：</strong>
-                <label><input type="radio" name="state" value="全部">全部</label>
+                <label><input type="radio" name="state" value="">全部</label>
                 <label class="current"><input type="radio" name="state" value="1">开启</label>
                 <label><input type="radio" name="state" value="0">关闭</label>
             </div>
         </div>
     </div>
 
-    <a href="/sale/category/add" class="btn btn-success"  style="margin:10px 0;"><i class="fa fa-plus"></i> 添加根分类</a>
+    <a href="javascript:;" id="add-root-category" class="btn btn-success"  style="margin:10px 0;"><i class="fa fa-plus"></i> 添加根分类</a>
 
     <div class="panel">
         <div class="panel-body nopadding">
             
             <div class="sale-category-table dataTables_wrapper no-footer" id="basicTable"></div>
-=======
-    <div class="panel panel-default" style="margin-bottom:10px;">
-        <div class="panel-head">
-            
-        </div>
-        <div class="panel-body nopadding">
-            <div class="dataTables_wrapper no-footer" id="basicTable"></div>
->>>>>>> release/1.6
         </div>
     </div>
     
@@ -56,7 +47,74 @@
 </div>
 
 <input type="hidden" id="gridurl" value="{{gridurl}}">
-<<<<<<< HEAD
+
+<script type="text/template" id="editTemp">
+    <div class="panel">
+        <div class="panel-body nopadding">
+            <form id="basicForm" role="form" action="[[action]]" class="form-horizontal form-bordered">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">父分类</label>
+                    <!-- <div class="col-sm-8 height40">{{# parentSC}}{{categoryName}}{{# items}}-{{categoryName}}{{/ items}}{{/ parentSC}}</div> -->
+                     <div class="col-sm-8 height40">
+                        [[each parentSC as a index]]
+                            [[a.categoryName]]
+                            [[each a.items as b index]]
+                                -[[b.categoryName]]
+                            [[/each]]
+                        [[/each]]
+                        [[if subCategoryName]]
+                            [[if parentSC.length>0]]
+                            -
+                            [[/if]]
+                            [[subCategoryName]]
+                        [[/if]]
+                    </div>
+                </div> 
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">分类名称</label>
+                    <div class="col-sm-8"><input type="text" id="categoryName" name="categoryName" class="form-control" placeholder="分类名称" value="[[categoryName]]"></div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">分类图标</label>
+                    <div class="col-sm-8"><input type="file" id="icon" name="icon" value="[[icon]]" placeholder="分别图标"></div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">物理类目关联</label>
+                    <div class="col-sm-8 sort-wrap">
+                        <div class="row">
+                            <div class="col-sm-10">
+                                <div class="sortTree"></div>
+                            </div>
+                            <div class="col-sm-2 height40">
+                                <a class="btn btn-danger btn-xs del-sort-btn" style="display: none;" href="javascript:;">-</a>
+                                <a class="btn btn-info btn-xs add-sort-btn" href="javascript:;">+</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <input id="categoryId" type="hidden" value="[[categoryId]]">
+                <input id="parentId" type="hidden" value="[[parentId]]">
+                <input id="orderBy" type="hidden" value="[[orderBy]]">
+            </form>
+        </div>
+        <div class="panel-footer">
+            <a id="save_brand" data-loading-text="保存中..." class="btn btn-primary" href="javascript:;">保存</a>
+            <a href="javascript:;" onclick="history.go(-1);" class="btn btn-danger">取消</a>
+        </div>
+    </div>
+</script>
+
+<script type="text/template" id="sortWrap">
+    <div class="row">
+        <div class="col-sm-10">
+            <div class="sortTree"></div>
+        </div>
+        <div class="col-sm-2 height40">
+            <a class="btn btn-danger btn-xs del-sort-btn" href="javascript:;">-</a>
+            <a class="btn btn-info btn-xs add-sort-btn" href="javascript:;">+</a>
+        </div>
+    </div>
+</script>
 
 <script type="text/template" id="tableHdTemp">
     <div class="level-hd clearfix">
@@ -88,15 +146,15 @@
                 关闭
                 [[/if]]
             </span>
-            <span class="operate">
-                <a class="btn btn-info btn-xs edit-btn" href="/sale/category/edit/[[categoryId]]">编辑</a>
+            <span class="operate" data-id="[[categoryId]]" data-name="[[categoryName]]">
+                <a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
                 <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[categoryId]]">标签管理</a>
-                <a class="btn btn-info btn-xs" href="javascript:;">添加子分类</a>
+                <a class="btn btn-info btn-xs add-sub-category" href="javascript:;">添加子分类</a>
                 [[if state=="1"]]
-                <a class="btn btn-danger btn-xs" href="javascript:;">关闭</a>
+                <a class="btn btn-danger btn-xs close-category" href="javascript:;">关闭</a>
                 [[/if]]
                 [[if state=="0"]]
-                <a class="btn btn-warning btn-xs" href="javascript:;">开启</a>
+                <a class="btn btn-warning btn-xs open-category" href="javascript:;">开启</a>
                 [[/if]]
             </span>
             [[if items]]
@@ -117,15 +175,15 @@
                         关闭
                         [[/if]]
                     </span>
-                    <span class="operate">
-                        <a class="btn btn-info btn-xs edit-btn" href="/sale/category/edit/[[a.categoryId]]">编辑</a>
+                    <span class="operate" data-id="[[a.categoryId]]" data-name="[[a.categoryName]]">
+                        <a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
                         <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[a.categoryId]]">标签管理</a>
-                        <a class="btn btn-info btn-xs" href="javascript:;">添加子分类</a>
+                        <a class="btn btn-info btn-xs add-sub-category" href="javascript:;">添加子分类</a>
                         [[if a.state=="1"]]
-                        <a class="btn btn-danger btn-xs" href="javascript:;">关闭</a>
+                        <a class="btn btn-danger btn-xs close-category" href="javascript:;">关闭</a>
                         [[/if]]
                         [[if a.state=="0"]]
-                        <a class="btn btn-warning btn-xs" href="javascript:;">开启</a>
+                        <a class="btn btn-warning btn-xs open-category" href="javascript:;">开启</a>
                         [[/if]]
                     </span>
                     [[if a.items]]
@@ -146,15 +204,15 @@
                                 关闭
                                 [[/if]]
                             </span>
-                            <span class="operate">
-                                <a class="btn btn-info btn-xs edit-btn" href="/sale/category/edit/[[b.categoryId]]">编辑</a>
+                            <span class="operate" data-id="[[b.categoryId]]" data-name="[[b.categoryName]]">
+                                <a class="btn btn-info btn-xs edit-btn"  href="javascript:;">编辑</a>
                                 <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[b.categoryId]]">标签管理</a>
-                                <a class="btn btn-info btn-xs" href="javascript:;">添加子分类</a>
+                                <a class="btn btn-info btn-xs add-sub-category" href="javascript:;">添加子分类</a>
                                 [[if b.state=="1"]]
-                                <a class="btn btn-danger btn-xs" href="javascript:;">关闭</a>
+                                <a class="btn btn-danger btn-xs close-category" href="javascript:;">关闭</a>
                                 [[/if]]
                                 [[if b.state=="0"]]
-                                <a class="btn btn-warning btn-xs" href="javascript:;">开启</a>
+                                <a class="btn btn-warning btn-xs open-category" href="javascript:;">开启</a>
                                 [[/if]]
                             </span>
                         </div>
@@ -170,5 +228,3 @@
         
     </div>
 </script>
-=======
->>>>>>> release/1.6