ERP生产 bom清单列表修改为高级搜索

erp-produce/src/main/resources/template/js/erpBom/erpBomDetail.js

@@ -10,7 +10,7 @@ layui.config({
         var index = parent.layer.getFrameIndex(window.name);
         var $ = layui.$;
         
-        AjaxPostUtil.request({url: flowableBasePath + "erpbom003", params: {rowId: parent.rowId}, type: 'json', callback: function (json) {
+        AjaxPostUtil.request({url: flowableBasePath + "erpbom003", params: {id: parent.rowId}, type: 'json', method: 'GET', callback: function (json) {
 			$("#showForm").html(getDataUseHandlebars($("#mainHtml").html(), json));
 			$.fn.zTree.init($("#treeDemo"), setting, json.bean.bomMaterialList);
 			loadTr();

erp-produce/src/main/resources/template/js/erpBom/erpBomList.js

@@ -7,14 +7,12 @@ layui.config({
     window: 'js/winui.window'
 }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
     winui.renderColor();
-    
     var $ = layui.$,
         form = layui.form,
         table = layui.table;
     
     authBtn('1590074984041');
-    
-    
+
     table.render({
         id: 'messageTable',
         elem: '#messageTable',
@@ -23,26 +21,29 @@ layui.config({
         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: 'title', title: 'bom方案名称', align: 'left',width: 150, templet: function (d) {
-		        	return '<a lay-event="details" class="notice-title-click">' + d.title + '</a>';
+                return '<a lay-event="details" class="notice-title-click">' + d.title + '</a>';
 		    }},
 		    { field: 'materialName', title: '商品名称', align: 'left',width: 150 },
             { field: 'materialModel', title: '商品型号', align: 'left',width: 150 },
-            { field: 'unitName', title: '计量单位', align: 'center',width: 100},
-            { field: 'makeNum', title: '数量', align: 'center',width: 80},
-            { field: 'consumablesPrice', title: '耗材总费用', align: 'right',width: 100},
-            { field: 'procedurePrice', title: '工序总费用', align: 'right',width: 100},
-            { field: 'wastagePrice', title: '耗损总费用', align: 'right',width: 100},
-            { field: 'sealPrice', title: '产品销售价', align: 'right',width: 100},
-            { field: 'remark', title: '备注说明', align: 'left',width: 200},
-            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
+            { field: 'unitName', title: '计量单位', align: 'center',width: 100 },
+            { field: 'makeNum', title: '数量', align: 'center',width: 80 },
+            { field: 'consumablesPrice', title: '耗材总费用', align: 'right',width: 100 },
+            { field: 'procedurePrice', title: '工序总费用', align: 'right',width: 100 },
+            { field: 'wastagePrice', title: '耗损总费用', align: 'right',width: 100 },
+            { field: 'sealPrice', title: '产品销售价', align: 'right',width: 100 },
+            { field: 'remark', title: '备注说明', align: 'left',width: 200 },
+            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar' }
         ]],
 	    done: function(json) {
 	    	matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入方案名称", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
 	    }
     });
 
@@ -58,24 +59,14 @@ layui.config({
         }
     });
 
-    
-    form.render();
-    form.on('submit(formSearch)', function (data) {
-        
-        if (winui.verifyForm(data.elem)) {
-            refreshTable();
-        }
-        return false;
-    });
-
-    //编辑
+    // 编辑
     function edit(data) {
         rowId = data.id;
         _openNewWindows({
             url: "../../tpl/erpBom/erpBomEdit.html",
             title: systemLanguage["com.skyeye.editPageTitle"][languageType],
             pageId: "erpBomEdit",
-            area: ['100vw', '100vh'],
+            area: ['90vw', '90vh'],
             callBack: function (refreshCode) {
                 winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
                 loadTable();
@@ -100,7 +91,7 @@ layui.config({
             url: "../../tpl/erpBom/erpBomAdd.html",
             title: systemLanguage["com.skyeye.addPageTitle"][languageType],
             pageId: "erpBomAdd",
-            area: ['100vw', '100vh'],
+            area: ['90vw', '90vh'],
             callBack: function (refreshCode) {
                 winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
                 loadTable();
@@ -114,30 +105,22 @@ layui.config({
 			url: "../../tpl/erpBom/erpBomDetail.html", 
 			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
 			pageId: "erpBomDetails",
-			area: ['100vw', '100vh'],
+			area: ['90vw', '90vh'],
 			callBack: function (refreshCode) {
 			}});
 	}
 
+    form.render();
     $("body").on("click", "#reloadTable", function() {
         loadTable();
     });
 
-    //刷新
     function loadTable() {
         table.reloadData("messageTable", {where: getTableParams()});
     }
 
-    //搜索
-    function refreshTable(){
-        table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()})
-    }
-    
     function getTableParams() {
-    	return {
-    		materialName: $("#materialName").val(), 
-    		materialModel: $("#materialModel").val()
-    	};
+        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
     }
 
     exports('erpBomList', {});

erp-produce/src/main/resources/template/tpl/erpBom/erpBomDetail.html

@@ -56,13 +56,13 @@
 	        <div class="layui-form-item layui-col-xs12">
 	            <label class="layui-form-label">商品名称：</label>
 	            <div class="layui-input-block ver-center">
-	                {{productName}}
+	                {{materialName}}
 	            </div>
 	        </div>
 	        <div class="layui-form-item layui-col-xs6">
 	            <label class="layui-form-label">商品型号：</label>
 	            <div class="layui-input-block ver-center">
-	                {{productModel}}
+	                {{materialModel}}
 	            </div>
 	        </div>
 	        <div class="layui-form-item layui-col-xs6">

erp-produce/src/main/resources/template/tpl/erpBom/erpBomList.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="materialName" name="materialName" placeholder="请输入商品名称" class="layui-input" />
-	                </div>
-	                <label class="layui-form-label">商品型号</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="materialModel" name="materialModel" 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="1590074984041"><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="1590074984041"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
 	    </div>
 	</div>
 	<div style="margin:auto 10px;">