ERP商品计量单位列表整改

60c13d77 · weizhiqiang · 30634214 · 60c13d77 · 60c13d77
2 changed file
--- a/erp/src/main/resources/template/js/materialunit/materialunitlist.js
+++ b/erp/src/main/resources/template/js/materialunit/materialunitlist.js
@@ -19,11 +19,11 @@ layui.config({
        elem: '#messageTable',
        method: 'post',
        url: flowableBasePath + 'materialunit001',
-        where: {groupName: $("#groupName").val()},
+        where: getTableParams(),
        even: true,
        page: true,
-        limits: [8, 16, 24, 32, 40, 48, 56],
-        limit: 8,
+		limits: getLimits(),
+		limit: getLimit(),
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
 	        { field: 'groupName', title: '组名', align: 'left', width: 120 },
@@ -32,6 +32,9 @@ layui.config({
 	    ]],
 	    done: function(json) {
 	    	matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入组名", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
 	    }
 	});
 	
@@ -45,33 +48,22 @@ layui.config({
        }
    });
 	
-	form.render();
-
-	form.on('submit(formSearch)', function (data) {
-        
-        if (winui.verifyForm(data.elem)) {
-        	refreshloadTable();
-        }
-        return false;
-    });
-	
-	//添加
+	// 添加
 	$("body").on("click", "#addBean", function() {
    	_openNewWindows({
 			url: "../../tpl/materialunit/materialunitadd.html", 
 			title: systemLanguage["com.skyeye.addPageTitle"][languageType],
 			pageId: "materialunitadd",
-			area: ['70vw', '70vh'],
+			area: ['90vw', '90vh'],
 			callBack: function (refreshCode) {
 				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
 				loadTable();
 			}});
    });
 	
-	//删除
+	// 删除
 	function delet(data) {
-		var msg = '确认删除选中数据吗？';
-		layer.confirm(msg, { icon: 3, title: '删除计量单位' }, function (index) {
+		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
 			layer.close(index);
            AjaxPostUtil.request({url: flowableBasePath + "materialunit003", params: {rowId: data.id}, type: 'json', callback: function (json) {
 				winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
@@ -80,33 +72,34 @@ layui.config({
 		});
 	}
 	
-	//编辑
+	// 编辑
 	function edit(data) {
 		rowId = data.id;
 		_openNewWindows({
 			url: "../../tpl/materialunit/materialunitedit.html", 
 			title: systemLanguage["com.skyeye.editPageTitle"][languageType],
 			pageId: "materialunitedit",
-			area: ['70vw', '70vh'],
+			area: ['90vw', '90vh'],
 			callBack: function (refreshCode) {
 				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
 				loadTable();
 			}
 		});
 	}
-	
-	//刷新数据
+
+	form.render();
+	// 刷新数据
    $("body").on("click", "#reloadTable", function() {
    	loadTable();
    });
    
    function loadTable() {
-    	table.reloadData("messageTable", {where:{groupName: $("#groupName").val()}});
-    }
-    
-    function refreshloadTable() {
-    	table.reloadData("messageTable", {page: {curr: 1}, where:{groupName: $("#groupName").val()}});
+    	table.reloadData("messageTable", {where: getTableParams()});
    }
+
+	function getTableParams() {
+		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+	}
    
    exports('materialunitlist', {});
 });
--- a/erp/src/main/resources/template/tpl/materialunit/materialunitlist.html
+++ b/erp/src/main/resources/template/tpl/materialunit/materialunitlist.html
@@ -7,24 +7,10 @@
    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </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="groupName" name="groupName" placeholder="请输入组名" class="layui-input" />
-	                </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="addBean" class="winui-toolbtn" auth="1569160351079"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></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>
+            <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1569160351079"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
        </div>
    </div>
    <div style="margin:auto 10px;">
@@ -38,6 +24,7 @@
 			{{# } }}
        </script>
    </div>
+
    <script src="../../assets/lib/layui/layui.js"></script>
    <script src="../../assets/lib/layui/custom.js"></script>
    <script type="text/javascript">