部门物料库存整改

erp-produce/src/main/resources/template/js/erpDepartStock/erpDepartStockList.js

@@ -6,113 +6,71 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form', 'eleTree', 'soulTable'], function (exports) {
+}).define(['window', 'table', 'jquery', 'winui', 'form', 'soulTable'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table,
-		soulTable = layui.soulTable,
-		eleTree = layui.eleTree;
+		soulTable = layui.soulTable;
 	
-	//初始化表格
-	initTable();
-	function initTable(){
-		table.render({
-		    id: 'messageTable',
-	        elem: '#messageTable',
-	        method: 'post',
-	        url: flowableBasePath + 'erpdepartstock001',
-	        where: getTableParams(),
-	        even: true,
-	        page: true,
-	        limits: [8, 16, 24, 32, 40, 48, 56],
-	        overflow: {
-	            type: 'tips',
-	            hoverTime: 300, // 悬停时间，单位ms, 悬停 hoverTime 后才会显示，默认为 0
-	            minWidth: 150, // 最小宽度
-	            maxWidth: 500 // 最大宽度
-	        },
-	        limit: 8,
-		    cols: [[
-		        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-		        { field: 'name', title: '商品名称', align: 'left', width: 150, templet: function (d) {
-			        	return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
-			    }},
-		        { field: 'model', title: '型号', align: 'left', width: 150 },
-		        { field: 'categoryName', title: '所属类型', align: 'center', width: 100 },
-		        { field: 'typeName', title: '商品来源', align: 'left', width: 100 },
-		        { field: 'norms', title: '库存', align: 'center', width: 100, templet: function (d) {
-		        	var str = "";
-		        	$.each(d.norms, function(i, item) {
-		        		str += '<span class="layui-badge layui-bg-blue">' + item.allTock + '</span>' + item.unitName + '<br>';
-		        	});
-		        	return str;
-		        }},
-		        { field: 'enabled', title: '状态', align: 'center', width: 60, templet: function (d) {
-		        	if(d.enabled == '0'){
-		        		return "<span class='state-down'>禁用</span>";
-		        	} else if (d.enabled == '1'){
-		        		return "<span class='state-up'>启用</span>";
-		        	}
-		        }},
-		        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }
-		    ]],
-		    done: function(json) {
-		    	matchingLanguage();
-		    	soulTable.render(this);
-		    	if(!loadFirstType){
-		    		initFirstType();
-		    	}
-		    }
-		});
-		
-		table.on('tool(messageTable)', function (obj) {
-	        var data = obj.data;
-	        var layEvent = obj.event;
-	        if (layEvent === 'details') { //详情
-	        	details(data);
-	        }
-	    });
+	table.render({
+		id: 'messageTable',
+		elem: '#messageTable',
+		method: 'post',
+		url: flowableBasePath + 'erpdepartstock001',
+		where: getTableParams(),
+		even: true,
+		page: true,
+		limits: getLimits(),
+		limit: getLimit(),
+		overflow: {
+			type: 'tips',
+			hoverTime: 300, // 悬停时间，单位ms, 悬停 hoverTime 后才会显示，默认为 0
+			minWidth: 150, // 最小宽度
+			maxWidth: 500 // 最大宽度
+		},
+		cols: [[
+			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'materialName', title: '商品名称', align: 'left', width: 150, templet: function (d) {
+				return '<a lay-event="details" class="notice-title-click">' + d.materialName + '</a>';
+			}},
+			{ field: 'materialModel', title: '型号', align: 'left', width: 150 },
+			{ field: 'categoryName', title: '所属类型', align: 'center', width: 100 },
+			{ field: 'typeName', title: '商品来源', align: 'left', width: 100 },
+			{ field: 'norms', title: '库存', align: 'center', width: 100, templet: function (d) {
+				var str = "";
+				$.each(d.norms, function(i, item) {
+					str += '<span class="layui-badge layui-bg-blue">' + item.allTock + '</span>' + item.name + '<br>';
+				});
+				return str;
+			}},
+			{ field: 'enabled', title: '状态', align: 'center', width: 60, templet: function (d) {
+				if (d.enabled == '0') {
+					return "<span class='state-down'>禁用</span>";
+				} else if (d.enabled == '1') {
+					return "<span class='state-up'>启用</span>";
+				}
+			}},
+			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }
+		]],
+		done: function(json) {
+			matchingLanguage();
+			soulTable.render(this);
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入商品名称，型号", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
+		}
+	});
+
+	table.on('tool(messageTable)', function (obj) {
+		var data = obj.data;
+		var layEvent = obj.event;
+		if (layEvent === 'details') { // 详情
+			details(data);
+		}
+	});
 	    
-	    form.render();
-	}
-    
-    var loadFirstType = false;
-	//初始化商品类型
-	function initFirstType(){
-		loadFirstType = true;
-		var el5 = eleTree.render({
-            elem: '.ele5',
-            url: flowableBasePath + "materialcategory009",
-            defaultExpandAll: true,
-            expandOnClickNode: false,
-            highlightCurrent: true
-        });
-        $(".ele5").hide();
-		$("#categoryId").on("click",function (e) {
-		    e.stopPropagation();
-		    $(".ele5").toggle();
-		});
-		eleTree.on("nodeClick(data5)",function(d) {
-		    $("#categoryId").val(d.data.currentData.name);
-		    $("#categoryId").attr("categoryId", d.data.currentData.id);
-		    $(".ele5").hide();
-		}) 
-		$(document).on("click",function() {
-		    $(".ele5").hide();
-		})
-	}
-	
-	
-	form.on('submit(formSearch)', function (data) {
-        
-        if (winui.verifyForm(data.elem)) {
-        	refreshloadTable();
-        }
-        return false;
-    });
-    
-    //详情
+    // 详情
 	function details(data) {
 		rowId = data.id;
 		_openNewWindows({
@@ -123,8 +81,8 @@ layui.config({
 			callBack: function (refreshCode) {
 			}});
 	}
-	
-	//刷新数据
+
+	form.render();
     $("body").on("click", "#reloadTable", function() {
     	loadTable();
     });
@@ -132,19 +90,9 @@ layui.config({
     function loadTable() {
     	table.reloadData("messageTable", {where: getTableParams()});
     }
-    
-    function refreshloadTable() {
-    	table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
-    }
-    
+
     function getTableParams() {
-    	return {
-    		materialName: $("#materialName").val(), 
-    		model: $("#model").val(), 
-    		categoryId: isNull($("#categoryId").val()) ? "" : $("#categoryId").attr("categoryId"), 
-    		typeNum: $("#typeNum").val(), 
-    		enabled: $("#enabled").val()
-    	};
+    	return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
     }
     
     exports('erpDepartStockList', {});

erp-produce/src/main/resources/template/tpl/erpDepartStock/erpDepartStockList.html

@@ -16,48 +16,9 @@
 	</style>
 </head>
 <body>
-	<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-	    <form class="layui-form layui-form-pane" action="" autocomplete="off">
-	        <div class="layui-form-item">
-	            <div class="layui-inline">
-	                <label class="layui-form-label">商品名称</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="materialName" name="materialName" placeholder="请输入商品名称" class="layui-input" />
-	                </div>
-	                <label class="layui-form-label">型号</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="model" name="model" placeholder="请输入产品型号" class="layui-input" />
-	                </div>
-	                <label class="layui-form-label">所属类型</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="categoryId" name="categoryId" placeholder="请选择商品类型" class="layui-input" readonly="readonly" categoryId=""/>
-	                    <div class="eleTree ele5" lay-filter="data5"></div>
-	                </div>
-	                <label class="layui-form-label">商品来源</label>
-	                <div class="layui-input-inline">
-	                    <select lay-filter="typeNum" lay-search="" id="typeNum">
-	                    	<option value="">全部</option>
-	                    	<option value="1">自产</option>
-	                    	<option value="2">外购</option>
-	                    </select>
-	                </div>
-	                <label class="layui-form-label">状态</label>
-	                <div class="layui-input-inline">
-	                    <select lay-filter="enabled" lay-search="" id="enabled">
-	                    	<option value="">全部</option>
-	                    	<option value="0">禁用</option>
-	                    	<option value="1">启用</option>
-	                    </select>
-	                </div>
-	                <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-	                <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-	            </div>
-	        </div>
-	    </form>
-	</div>
     <div class="winui-toolbar">
         <div class="winui-tool">
-            <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
         </div>
     </div>
     <div style="margin:auto 10px;">
@@ -66,6 +27,7 @@
 			
         </script>
     </div>
+
     <script src="../../assets/lib/layui/layui.js"></script>
     <script src="../../assets/lib/layui/custom.js"></script>
     <script type="text/javascript">