Browse Source

Merge branch 'master' of ssh://192.168.136.45:10022/SERVER/langer

chenjunkai 5 years ago
parent
commit
7e8c3deab1
5 changed files with 171 additions and 96 deletions
  1. 18 5
      web/sku/css/sku_index.css
  2. 10 10
      web/sku/find_sku.html
  3. 124 63
      web/sku/js/sku_index.js
  4. 8 7
      web/sku/login.html
  5. 11 11
      web/sku/sku_index.html

+ 18 - 5
web/sku/css/sku_index.css

@@ -233,16 +233,29 @@ h3{
 	display: none;
 }
 .rule_save{
-	
-	width: 60px;
-    margin: 0 auto;
-    margin-top: 5px;
+	float: left;
+	width: 40%;
+  	margin-left: 5px;
+    line-height: 36px;
+    height: 36px;
+    border-radius: 3px;
+    border: solid 1px #dddddd;
+}
+.rule_add_{
+	float: right;
+	width: 40%;
+  	margin-right: 5px;
     line-height: 36px;
     height: 36px;
     border-radius: 3px;
-	border: solid 1px #dddddd;
+    border: solid 1px #dddddd;
+}
+.rule_add_:hover{
+	background: #3b99d8;
+	color: white;
 }
 
+
 .rule_save:hover{
 	background: #3b99d8;
 	color: white;

+ 10 - 10
web/sku/find_sku.html

@@ -5,26 +5,26 @@
 		<title>查找SKU</title>
 	</head>
 	<style type="text/css">  
-		@import url("css/bootstrap.min.css?ver=zb20191202");
-    	@import url("css/commonality.css?ver=zb20191202");
-    	@import url("css/find_sku.css?ver=zb20191202" );
+		@import url("css/bootstrap.min.css?ver=zb20191206");
+    	@import url("css/commonality.css?ver=zb20191206");
+    	@import url("css/find_sku.css?ver=zb20191206" );
     </style>
     
-    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=zb20191202"></script>
-    <script type="text/javascript" src="js/bootstrap-paginator.js?ver=zb20191202" ></script>
-    <script type="text/javascript" src="js/find_sku.js?ver=zb20191202" ></script>
-    <script type="text/javascript" src="js/ip.js?ver=zb20191202" ></script>
-    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=zb20191202"></script>
+    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=zb20191206"></script>
+    <script type="text/javascript" src="js/bootstrap-paginator.js?ver=zb20191206" ></script>
+    <script type="text/javascript" src="js/find_sku.js?ver=zb20191206" ></script>
+    <script type="text/javascript" src="js/ip.js?ver=zb20191206" ></script>
+    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=zb20191206"></script>
     
 	<body>
 		<!--头部-->
 		<div class='head'>
 			<div class="col-sm-2 col-xs-12 head_left"><img class="head_logo" src="img/ansjer@2x.png"></div>
-			<div class="logout" id="logout"><img src="img/logout@2x.png" style="margin-right: 5px;">注销</div>
+			<div class="logout" id="logout" title="Logout"><img src="img/logout@2x.png" style="margin-right: 5px;">注销</div>
 		</div>
 		<!--菜单-->
 		<div class="col-sm-2 col-xs-12 menu">
-			<div class="menu_list" onclick="javascript:window.location.href='sku_index.html?ver=zb20191202'" style="border-left: 3px solid #efefef;"> 
+			<div class="menu_list" onclick="javascript:window.location.href='sku_index.html?ver=zb20191206'" style="border-left: 3px solid #efefef;"> 
 				<div class="menu_ico"><img src="img/SKUnaming_rule@2x.png" class="menu_img"></div>
 				<div class="menu_text">SKU命名规则</div>
 			</div>

+ 124 - 63
web/sku/js/sku_index.js

@@ -1,4 +1,5 @@
 $(function () {
+	$("#the_new_suit_img").html('<img src="img/Add@2x.png">');
 	$(".new_suit").show(400);
 	
 	var token=$.cookie('sku_access_token');
@@ -51,10 +52,8 @@ $(function () {
 										+		'</div>'
 										+	'</div>';
 					}
-					
 				 	
 					suit_html=suit_html +	'<div class="rule_all_list" >';
-					let num=8;
 					for(var i=0;i<data.res[k].sr_qs.length;i++){
 						 
 						if(i==0){
@@ -62,48 +61,33 @@ $(function () {
 						}else{
 							suit_html=suit_html +	'<div class="rule_one">';
 						}
-						 
-						
-						
+						var no_num=9;
 						suit_html=suit_html+		'<div class="rule_ rule_hr" rid="'+data.res[k].sr_qs[i].id+'">'+data.res[k].sr_qs[i].ruleName+'</div>';
-//					 
-						if(data.res[k].sr_qs[i].cr_qs.length<8){
-							num=8
-						}
-						if(data.res[k].sr_qs[i].cr_qs.length>8){
-							num=17
-						}
-						if(data.res[k].sr_qs[i].cr_qs.length>18){
-							num=26
-						}
-						for(let j=0;j<num;j++){
-							
-							if(j==9){
-								suit_html=suit_html+		'<div class="rule_ rule_hr"></div>';
-								try{
-									suit_html=suit_html+		'<div class="rule_"><span class="rule_term">'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'</span> <input class="rule_input" rid="'+data.res[k].sr_qs[i].cr_qs[j].id+'" value="'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'"></div>'
-								}catch(e){
-									//TODO handle the exception
-									suit_html=suit_html+		'<div class="rule_ rule_hr"></div>';
-								}
-								 
-								
-							}else if(j==18){
-								suit_html=suit_html+		'<div class="rule_ rule_hr"></div>';
-								suit_html=suit_html+		'<div class="rule_"><span class="rule_term">'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'</span> <input class="rule_input" rid="'+data.res[k].sr_qs[i].cr_qs[j].id+'" value="'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'"></div>';
-							}else{
+						let math_num = Math.ceil(data.res[k].sr_qs[i].cr_qs.length/9==1?2:data.res[k].sr_qs[i].cr_qs.length/9)*10-Math.ceil(data.res[k].sr_qs[i].cr_qs.length/9==1?2:data.res[k].sr_qs[i].cr_qs.length/9)-1;
+					 
+						
+						for(let j=0;j<math_num;j++){
+						 		if(j.toString().indexOf(no_num)!=-1){
+						 			suit_html=suit_html+		'<div class="rule_"></div>';
+						 			no_num=no_num+9;
+						 		}
 								if(j<data.res[k].sr_qs[i].cr_qs.length){
 									suit_html=suit_html+		'<div class="rule_"><span class="rule_term">'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'</span> <input class="rule_input" rid="'+data.res[k].sr_qs[i].cr_qs[j].id+'" value="'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'"></div>';
 								}else{
 									suit_html=suit_html+		'<div class="rule_"></div>';
 								}
-							}
 						}
 						if(role_id=="admin"){
 							suit_html=suit_html +		'<div class="rule_" style="float: right;">'
 								 				+		'<div class="rule_operate"><img style="margin-left: 50%; "src="img/modify@2x.png" class="compile" title="编辑"></div>'
 								 				+		'<div class="rule_operate"><img style="margin-left: 10%; " src="img/delete@2x.png" class="remove" title="删除"></div>'
-								 				+		'<div class="rule_save_div"><div class="rule_save">保存</div></div>'
+								 				+		'<div class="rule_save_div">'
+								 				
+								 				+		'<div class="rule_save">保存</div>'
+								 				+		'<div class="rule_add_">添加</div>'
+								 				
+								 				+		'</div>'
+								 				
 								 				+	'</div>'
 						}else{
 								suit_html=suit_html +		'<div class="rule_" style="float: right;">'
@@ -226,7 +210,7 @@ $(function () {
 			        +'          	 </div>'
 		            +'      	</div>'
 		    $(".add_role_div").parent().children().eq(0).append(html_);
-			 
+			
 			add_i=add_i+1;
 			$('#rule_add_id').fadeIn(100);
 			$('#rule_add').slideDown(200);
@@ -255,6 +239,44 @@ $(function () {
 		
 	});
 		
+	//添加一个条件
+	$(document).on('click','.rule_add_', function() {
+ 		var html_vla=true;
+ 		 
+		for(let i=0;i<$(this).parent().parent().parent().children().length;i++){
+ 			if( '0'.indexOf(i)==-1){
+ 				if( i%10!==0){
+	 				if($(this).parent().parent().parent().children().eq(i).html()==""){
+	 					var html_='<span class="rule_term" style="display: none;">'+''+':'+''+'</span> <input class="rule_input" style="display: inline-block;" rid="default" value="'+''+':'+''+'">';
+	 					$(this).parent().parent().parent().children().eq(i).html(html_);
+	 					html_vla=false;
+	 					break;
+	 				}
+ 				}
+ 			}
+ 		} 
+	 		
+ 		if(html_vla){
+ 			var suit_html='';
+ 			for(let i=0;i<10;i++){ 
+ 				suit_html=suit_html+		'<div class="rule_ "></div>';
+ 			}
+ 			var lastChild = $(this).parent().parent().parent().children().last().html();
+ 			var length = $(this).parent().parent().parent().children().length;
+ 			$(this).parent().parent().parent().append(suit_html);
+ 			length = length+10;
+ 			console.log(length);
+ 			
+ 			$(this).parent().parent().parent().children().last().html(lastChild);
+ 			var html_='<span class="rule_term" style="display: none;">'+''+':'+''+'</span> <input class="rule_input" style="display: inline-block;" rid="default" value="'+''+':'+''+'">';
+	 		$(this).parent().parent().parent().children().eq(length-11).html(html_);
+ 			html_vla=false;
+ 		}
+ 		
+	   
+	});
+		
+		
 //	保存
 	$(document).on('click','.rule_save', function() {
 //		console.log('编辑');
@@ -266,7 +288,7 @@ $(function () {
 		$(this).parent().parent().children().eq(2).hide();
 //		console.log(a);
 		for(let i=0;i<a-1;i++){ //循环请求添加
-			if(i.toString().indexOf('10') !=-1 || i==0){
+			if(i%10 ==0 || i==0){
 				$(this).parent().parent().parent().children().eq(i).children().eq(0).hide();
 				$(this).parent().parent().parent().children().eq(i).children().eq(1).show();
 			}else{
@@ -281,27 +303,58 @@ $(function () {
 					$(this).parent().parent().parent().children().eq(i).children().eq(0).html(num_name[0]+":"+num_name[1]);
 //					console.log(id);
 //					console.log(num_name);
-					let url=http+"sku_condition/update"; 
-				    let data_string = JSON.stringify({token:token,numName:num_name[0].trim(),name:num_name[1].trim(),id:id});
-				    $.ajax({
-				        url: url,
-				        type: "post",
-				        dataType:"JSON",
-				        data: data_string,
-				        async: true,//同步
-				        success: function (data)
-				        {
-				            if(data.code==0){
-//				             	console.log(data);
-				            }else{
-				             	return;
-				            }
-				        },
-				        error:function (XMLHttpRequest) {
-				            console.log("失败!");
-				    	}
-					});
-						
+					if (id!="default"){ // id不为空的时候我就走修改的请求
+						let url=http+"sku_condition/update"; 
+					    let data_string = JSON.stringify({token:token,numName:num_name[0].trim(),name:num_name[1].trim(),id:id});
+					    $.ajax({
+					        url: url,
+					        type: "post",
+					        dataType:"JSON",
+					        data: data_string,
+					        async: true,//异步
+					        success: function (data)
+					        {
+					            if(data.code==0){
+	//				             	console.log(data);
+					            }else{
+					             	return;
+					            }
+					        },
+					        error:function (XMLHttpRequest) {
+					            console.log("失败!");
+					    	}
+						});
+					}else{
+						let url=http+"sku_condition/add"; 
+						var rule_id=$(this).parent().parent().parent().children().eq(0).attr("rid");
+//						console.log(rule_id);
+						let that=$(this);
+					    let data_string = JSON.stringify({token:token,numName:num_name[0].trim(),name:num_name[1].trim(),id:rule_id});
+//					    console.log(data_string);
+					    $.ajax({
+					        url: url,
+					        type: "post",
+					        dataType:"JSON",
+					        data: data_string,
+					        async: false,//异步
+					        success: function (data)
+					        {
+					            if(data.code==0){
+//					            	console.log(i);
+//					             	console.log(data.res[0].id);
+//					             	console.log(that.parent().parent().parent().children().eq(i).children().eq(1).attr("rid"))
+					             	that.parent().parent().parent().children().eq(i).children().eq(1).attr("rid",data.res[0].id);
+					            }else{
+					            	console.log(data.msg);
+					             	return;
+					            }
+					        },
+					        error:function (XMLHttpRequest) {
+					            console.log("失败!");
+					    	}
+						});
+					}
+					
 				}
 //				显示隐藏
 				$(this).parent().parent().parent().children().eq(i).children().eq(1).hide();
@@ -392,12 +445,14 @@ $(function () {
 						});
 							
 					}
-			//		console.log(condition_number);
-			//		console.log(condition_that)
 					let suit_html='';
 					let num=8;
 					for(let i=0;i<1;i++){
-						suit_html=suit_html +	'<div class="rule_one">';
+						if(add_rule.html()==""){
+							suit_html=suit_html +	'<div class="rule_one" style="border-top: 1px solid #e4e7e9;">';
+						}else{
+							suit_html=suit_html +	'<div class="rule_one">';
+						}
 						suit_html=suit_html+		'<div class="rule_ rule_hr" rid="'+rule_id+'">'+role_edit_name+'</div>';
 						if (condition_that.length>8){
 							num=17
@@ -429,7 +484,10 @@ $(function () {
 						suit_html=suit_html+		'<div class="rule_" style="float: right;">'
 						 				+		'<div class="rule_operate"><img style="margin-left: 50%; "src="img/modify@2x.png" class="compile" title="编辑"></div>'
 						 				+		'<div class="rule_operate"><img style="margin-left: 10%; " src="img/delete@2x.png" class="remove" title="删除"></div>'
-						 				+		'<div class="rule_save_div"><div class="rule_save">保存</div></div>'
+						 				+		'<div class="rule_save_div">'
+								 		+			'<div class="rule_save">保存</div>'
+								 		+			'<div class="rule_add_">添加</div>'
+						 				+		'</div>'
 						 				+		'</div>'
 						 				+	'</div>';
 					}
@@ -454,7 +512,6 @@ $(function () {
 	$(document).on('click','.suit_title', function() {
 //		console.log($(this).parent().parent().children().eq(1).is(':hidden'))
 		if($(this).parent().children().eq(1).children().is(':hidden')){
-			console.log($(this).parent().children().eq(1).children().html())
 			$(this).parent().parent().children().eq(1).show();
 			$(this).parent().children().eq(1).children().show();
 //			切换图标
@@ -475,7 +532,6 @@ $(function () {
 		let r = confirm("你确定删除"+html__+"吗?");
 		if (r == true) {
 		   let id=$(this).parent().parent().parent().children().eq(0).attr("rid");
-//			console.log(id);
 			let url=http+"cku_rule/delete"; 
 		    let data_string = JSON.stringify({token:token,id:id});
 		    $.ajax({
@@ -496,7 +552,12 @@ $(function () {
 		            console.log("失败!");
 		    	}
 			});
-			$(this).parent().parent().parent().hide();
+			if($(this).parent().parent().parent().prev().length==1){//前面有节点就不处理
+				
+			}else{// 如果是第一个那么就添加下一个节点的上边框颜色
+				$(this).parent().parent().parent().next().css("border-top","1px solid #e4e7e9");
+			}
+			$(this).parent().parent().parent().remove();// 直接删除该div
 		} else {
 		   return;
 		}

+ 8 - 7
web/sku/login.html

@@ -7,14 +7,14 @@
     <title>sku_login</title>
     <style type="text/css">  
 		@import url("http://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css");
-    	@import url("css/bootstrap-grid.css?ver=zb20191202");
-    	@import url("css/htmleaf-demo.css?ver=zb20191202" );
-    	@import url("css/login.css?ver=zb20191202" );
+    	@import url("css/bootstrap-grid.css?ver=zb20191206");
+    	@import url("css/htmleaf-demo.css?ver=zb20191206" );
+    	@import url("css/login.css?ver=zb20191206" );
     </style>
     
-    <script src="js/jquery-2.1.1.min.js?ver=zb20191202"></script>
-    <script src="js/jquery_cookie_min.js?ver=zb20191202"></script>
-    <script src="js/ip.js?ver=zb20191202"></script>
+    <script src="js/jquery-2.1.1.min.js?ver=zb20191206"></script>
+    <script src="js/jquery_cookie_min.js?ver=zb20191206"></script>
+    <script src="js/ip.js?ver=zb20191206"></script>
      
 </head>
 <body>
@@ -73,12 +73,13 @@
 	        data: data_string,
 	        success: function (data)
 	        {
+	        	console.log(data);
 	            if (data['code'] == 0) {
 	                console.log(data);
                 	$.cookie('sku_access_token', data.res.access_token, data.res.access_expire);
                 	$.cookie('sku_refresh_token', data.res.refresh_token, data.res.refresh_expire);
                 	$.cookie('sku_role_id', data.res.role_id, data.res.access_expire);
-                	window.location.href = "sku_index.html?ver=zb20191202";
+                	window.location.href = "sku_index.html?ver=zb20191206";
 	            } else {
 	                alert(data['msg'])
 	            }

+ 11 - 11
web/sku/sku_index.html

@@ -6,21 +6,21 @@
 	</head>
 	
 	<style type="text/css">  
-		@import url("css/bootstrap.min.css?ver=zb20191202");
-		@import url("css/commonality.css?ver=zb20191202");
-    	@import url("css/sku_index.css?ver=zb20191202");
+		@import url("css/bootstrap.min.css?ver=zb20191206");
+		@import url("css/commonality.css?ver=zb20191206");
+    	@import url("css/sku_index.css?ver=zb20191206");
     </style>
     
-    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=zb20191202"></script>
-    <script type="text/javascript" src="js/sku_index.js?ver=zb20191202" ></script>
-    <script type="text/javascript" src="js/ip.js?ver=zb20191202" ></script>
-    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=zb20191202"></script>
+    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=zb20191206"></script>
+    <script type="text/javascript" src="js/sku_index.js?ver=zb20191206" ></script>
+    <script type="text/javascript" src="js/ip.js?ver=zb20191206" ></script>
+    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=zb20191206"></script>
     
 	<body>
 		<!--头部-->
 		<div class='head'>
 			<div class="col-sm-2 col-xs-12 head_left"><img class="head_logo" src="img/ansjer@2x.png"></div>
-			<div class="logout" id="logout"><img src="img/logout@2x.png" style="margin-right: 5px;">注销</div>
+			<div class="logout" id="logout" title="Logout"><img src="img/logout@2x.png" style="margin-right: 5px;">注销</div>
 		</div>
 		<!--菜单-->
 		<div class="col-sm-2 col-xs-12 menu">
@@ -28,7 +28,7 @@
 				<div class="menu_ico"><img src="img/SKUNaming_rules_select@2x.png" class="menu_img"></div>
 				<div class="menu_text" style="color: #40ace6;">SKU命名规则</div>
 			</div>
-			<div class="menu_list" onclick="javascript:window.location.href='find_sku.html?ver=zb20191202'" style=" border-left: 3px solid #efefef;"> 
+			<div class="menu_list" onclick="javascript:window.location.href='find_sku.html?ver=zb20191206'" style=" border-left: 3px solid #efefef;"> 
 				<div class="menu_ico"><img src="img/findSKU@2x.png" class="menu_img"></div>
 				<div class="menu_text">查找SKU</div>
 			</div>
@@ -44,8 +44,8 @@
 			<div class="new_suit" style="display: none;">
 				<div class="col-sm-2 col-xs-12 new_suit_a">
 					<div class="new_suit_b" title="新增套装">
-						<div class="new_suit_img">
-							<img src="img/Add@2x.png">
+						<div class="new_suit_img" id="the_new_suit_img">
+							
 						</div>
 						<div style="float: left;">新增套装</div>
 					</div>