| 
					
				 | 
			
			
				@@ -1,8 +1,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 $(function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    $("#jqGrid").jqGrid({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        url: '../goodsproduct/list', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        datatype: "json", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        colModel: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	$("#jqGrid").jqGrid({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		url: '../goodsproduct/list', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		datatype: "json", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		colModel: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			{label: 'mallGoodsProductSn', name: 'mallGoodsProductSn', index: 'mall_goods_product_sn', key: true, hidden: true}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			{label: '商户编号', name: 'merchSn', index: 'merch_sn', width: 160}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			{label: '第三方商户编号', name: 'thirdMerchSn', index: 'third_merch_sn', width: 160}, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -72,34 +72,34 @@ $(function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					return transDate(value, 'yyyy-MM-dd hh:mm:ss'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				}}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		viewrecords: true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        height: 550, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        rowNum: 10, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        rowList: [10, 30, 50], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        rownumbers: true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        rownumWidth: 25, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        autowidth: true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		height: 550, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		rowNum: 10, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		rowList: [10, 30, 50], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		rownumbers: true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		rownumWidth: 25, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		autowidth: true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		shrinkToFit: false, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		autoScroll: true,   //开启水平滚动条 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		multiselect: true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		width: 1600, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        pager: "#jqGridPager", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        jsonReader: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            root: "page.list", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            page: "page.currPage", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            total: "page.totalPage", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            records: "page.totalCount" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        prmNames: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            page: "page", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            rows: "limit", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            order: "order" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        gridComplete: function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		pager: "#jqGridPager", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		jsonReader: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			root: "page.list", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			page: "page.currPage", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			total: "page.totalPage", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			records: "page.totalCount" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		prmNames: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			page: "page", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			rows: "limit", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			order: "order" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		gridComplete: function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			$("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 var exportMsg; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -107,8 +107,8 @@ var exportMsg; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 let vm = new Vue({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	el: '#rrapp', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	data: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        showList: true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        title: null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		showList: true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		title: null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		goodsProduct: {}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		ruleValidate: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			name: [ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -116,7 +116,7 @@ let vm = new Vue({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		q: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		    name: '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			name: '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	methods: { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -129,35 +129,35 @@ let vm = new Vue({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			vm.goodsProduct = {}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		update: function (event) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            let mallGoodsProductSn = getSelectedRow(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			let mallGoodsProductSn = getSelectedRow(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			if (mallGoodsProductSn == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			vm.showList = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            vm.title = "修改"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			vm.title = "修改"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            vm.getInfo(mallGoodsProductSn) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			vm.getInfo(mallGoodsProductSn) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		saveOrUpdate: function (event) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            let url = vm.goodsProduct.mallGoodsProductSn == null ? "../goodsproduct/save" : "../goodsproduct/update"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			let url = vm.goodsProduct.mallGoodsProductSn == null ? "../goodsproduct/save" : "../goodsproduct/update"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$.ajax({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				type: "POST", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			    url: url, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			    contentType: "application/json", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			    data: JSON.stringify(vm.goodsProduct), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                success: function (r) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    if (r.code === 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        alert('操作成功', function (index) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            vm.reload(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        alert(r.msg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				url: url, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				contentType: "application/json", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				data: JSON.stringify(vm.goodsProduct), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				success: function (r) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					if (r.code === 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						alert('操作成功', function (index) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							vm.reload(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					} else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						alert(r.msg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		del: function (event) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            let mallGoodsProductSns = getSelectedRows(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			let mallGoodsProductSns = getSelectedRows(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			if (mallGoodsProductSns == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			} 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -165,10 +165,10 @@ let vm = new Vue({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			confirm('确定要删除选中的记录?', function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				$.ajax({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					type: "POST", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				    url: "../goodsproduct/delete", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				    contentType: "application/json", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				    data: JSON.stringify(mallGoodsProductSns), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				    success: function (r) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					url: "../goodsproduct/delete", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					contentType: "application/json", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					data: JSON.stringify(mallGoodsProductSns), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					success: function (r) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						if (r.code == 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							alert('操作成功', function (index) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 								$("#jqGrid").trigger("reloadGrid"); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -182,32 +182,32 @@ let vm = new Vue({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		getInfo: function(mallGoodsProductSn){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$.get("../goodsproduct/info/"+mallGoodsProductSn, function (r) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                vm.goodsProduct = r.goodsProduct; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				vm.goodsProduct = r.goodsProduct; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        reloadSearch: function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            vm.q = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                name: '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            vm.reload(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		reloadSearch: function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			vm.q = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				name: '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			vm.reload(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		reload: function (event) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			vm.showList = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            let page = $("#jqGrid").jqGrid('getGridParam', 'page'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			let page = $("#jqGrid").jqGrid('getGridParam', 'page'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$("#jqGrid").jqGrid('setGridParam', { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                postData: {'name': vm.q.name}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                page: page 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }).trigger("reloadGrid"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            vm.handleReset('formValidate'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				postData: {'name': vm.q.name}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				page: page 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			}).trigger("reloadGrid"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			vm.handleReset('formValidate'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		handleSubmit: function (name) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			handleSubmitValidate(this, name, function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				vm.saveOrUpdate() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		handleReset: function (name) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			handleResetForm(this, name); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        handleSubmit: function (name) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            handleSubmitValidate(this, name, function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                vm.saveOrUpdate() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        handleReset: function (name) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            handleResetForm(this, name); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		uploadExcelSuccess: function (data) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			// console.log(data); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			if(data.code==0){ 
			 |