生产模块-部门加工单列表信息整改，待验证

d6114868 · weizhiqiang · 328244ba · d6114868 · d6114868
2 changed file
--- a/erp-produce/src/main/resources/template/js/erpMachin/erpDepartMachinList.js
+++ b/erp-produce/src/main/resources/template/js/erpMachin/erpDepartMachinList.js
@@ -21,14 +21,14 @@ layui.config({
        where: getTablePatams(),
        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,
+        limits: getLimits(),
+        limit: getLimit(),
        cols: [[
            { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
            { field: 'orderNum', rowspan: '2', title: '单据编号', align: 'center', width: 180, templet: function (d) {
@@ -75,28 +75,21 @@ layui.config({
        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') { //详情
+        if (layEvent === 'details') { // 详情
        	details(data);
        }
    });

-    
-    form.render();
-    form.on('submit(formSearch)', function (data) {
-        
-        if (winui.verifyForm(data.elem)) {
-            loadTable();
-        }
-        return false;
-    });
-    
-    //详情
+    // 详情
 	function details(data) {
 		rowId = data.id;
 		_openNewWindows({
@@ -107,26 +100,19 @@ layui.config({
 			callBack: function (refreshCode) {
 			}});
 	}
-	
+
+    form.render();
    $("body").on("click", "#reloadTable", function() {
        loadTable();
    });

-    //刷新
+    // 刷新
    function loadTable() {
        table.reloadData("messageTable", {where: getTablePatams()});
    }

-    //搜索
-    function refreshTable(){
-        table.reloadData("messageTable", {page: {curr: 1}, where: getTablePatams()})
-    }
-    
    function getTablePatams(){
-    	return {
-    		defaultNumber: $("#defaultNumber").val(), 
-    		materialName: $("#materialName").val()
-    	};
+    	return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
    }

    exports('erpDepartMachinList', {});

--- a/erp-produce/src/main/resources/template/tpl/erpMachin/erpDepartMachinList.html
+++ b/erp-produce/src/main/resources/template/tpl/erpMachin/erpDepartMachinList.html
@@ -7,30 +7,11 @@
    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </head>
 <body>
-	<div class="winui-tip alert-info" id="showInfo">
-		该数据仅展示已经由上级审批通过的部门加工单信息。
-	</div>
-	<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="defaultNumber" name="defaultNumber" placeholder="请输入单据编号" class="layui-input" />
-	                </div>
-	                <label class="layui-form-label">商品名称</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="materialName" name="materialName" 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-tip alert-info" id="showInfo">该数据仅展示已经由上级审批通过的部门加工单信息。</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;">