生产加工单列表整改

8482c5f6 · Skyeye云 · 693f2516 · 8482c5f6 · 8482c5f6
2 changed file
--- a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js
+++ b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinList.js
@@ -36,8 +36,8 @@ layui.config({
            { field: 'orderNum', rowspan: '2', title: '单据编号', align: 'center', width: 180, templet: function (d) {
 		        return '<a lay-event="details" class="notice-title-click">' + d.orderNum + '</a>';
 		    }},
-            { field: 'productionNumber', rowspan: '2', title: '生产计划单', align: 'center', width: 200},
-            { colspan: '3', title: '加工成品信息', align: 'center'},
+            { field: 'productionNumber', rowspan: '2', title: '生产计划单', align: 'center', width: 200 },
+            { colspan: '3', title: '加工成品信息', align: 'center' },
            { field: 'state', rowspan: '2', title: '状态', align: 'left', width: 80, templet: function (d) {
 		        if(d.state == '1'){
 	        		return "<span class='state-down'>未审核</span>";
@@ -54,19 +54,22 @@ layui.config({
 	        	}
 		    }},
            { colspan: '3', title: '加工信息', align: 'center'},
-            { field: 'createName', rowspan: '2', title: '录入人', align: 'left', width: 100},
+            { field: 'createName', rowspan: '2', title: '录入人', align: 'left', width: 120 },
            { field: 'createTime', rowspan: '2', title: '录入日期', align: 'center', width: 150 },
            { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
        ],[
-	        { field: 'materialName', title: '名称', align: 'left', width: 120},
-	    	{ field: 'unitName', title: '规格', align: 'center', width: 80},
-	        { field: 'needNum', title: '加工数量', align: 'center', width: 80},
-	        { field: 'departmentName', title: '部门', align: 'left', width: 100},
+	        { field: 'materialName', title: '名称', align: 'left', width: 120 },
+	    	{ field: 'unitName', title: '规格', align: 'center', width: 80 },
+	        { field: 'needNum', title: '加工数量', align: 'center', width: 80 },
+	        { field: 'departmentName', title: '部门', align: 'left', width: 100 },
 	    	{ field: 'startTime', title: '开始时间', align: 'center', width: 150 },
-	        { field: 'endTime', title: '结束时间', align: 'center', width: 150}
+	        { field: 'endTime', title: '结束时间', align: 'center', width: 150 }
        ]],
        done: function(json) {
        	matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
 	    	soulTable.render(this);
        }
    });
@@ -87,14 +90,6 @@ layui.config({
        }
    });

-    form.render();
-    form.on('submit(formSearch)', function (data) {
-        if (winui.verifyForm(data.elem)) {
-            loadTable();
-        }
-        return false;
-    });
-    
    // 编辑
    function edit(data) {
        rowId = data.id;
@@ -155,7 +150,7 @@ layui.config({
 			}});
    }
 	
-    //添加
+    // 添加
    $("body").on("click", "#addBean", function() {
        _openNewWindows({
            url: "../../tpl/erpMachin/erpMachinAdd.html",
@@ -168,25 +163,18 @@ layui.config({
            }});
    });

+    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('erpMachinList', {});

--- a/erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinList.html
+++ b/erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinList.html
@@ -7,28 +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="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-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="1593442212544"><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="1593442212544"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
 	    </div>
 	</div>
 	<div style="margin:auto 10px;">