我已使用的配件列表关联商品规格信息

431bb912 · Skyeye云 · 5b1494a2 · 431bb912 · 431bb912 · 431bb912
4 changed file
--- a/seal-service/src/main/resources/template/js/myparts/myusepartslist.js
+++ b/seal-service/src/main/resources/template/js/myparts/myusepartslist.js
@@ -6,23 +6,21 @@ layui.config({
    window: 'js/winui.window'
 }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
-	
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table;
 	
 	//获取我使用的配件
-	
 	table.render({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
 	    url: flowableBasePath + 'sealseservice032',
-	    where: {materialName: $("#materialName").val(), materialModel: $("#materialModel").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: 'materialName', title: '配件名称', align: 'left', width: 200 },
@@ -33,6 +31,9 @@ layui.config({
 	    ]],
 	    done: function(json) {
 	    	matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单价", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
 	    }
 	});
 	
@@ -42,27 +43,17 @@ layui.config({
    });
 	
 	form.render();
-	
-	//刷新数据
 	$("body").on("click", "#reloadTable", function() {
 		loadTable();
 	});
 	
-	form.render();
-	form.on('submit(formSearch)', function (data) {
-        if (winui.verifyForm(data.elem)) {
-        	refreshTable();
-        }
-        return false;
-	});
-    
    function loadTable() {
-    	table.reloadData("messageTable", {where: {materialName: $("#materialName").val(), materialModel: $("#materialModel").val()}});
-    }
-    
-    function refreshTable(){
-    	table.reloadData("messageTable", {page: {curr: 1}, where: {materialName: $("#materialName").val(), materialModel: $("#materialModel").val()}});
+    	table.reloadData("messageTable", {where: getTableParams()});
    }

+	function getTableParams() {
+		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+	}
+
    exports('myusepartslist', {});
 });
\ No newline at end of file
--- a/seal-service/src/main/resources/template/tpl/myparts/myusepartslist.html
+++ b/seal-service/src/main/resources/template/tpl/myparts/myusepartslist.html
@@ -7,34 +7,17 @@
    <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="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;">
        <table id="messageTable" lay-filter="messageTable"></table>
-        	<script type="text/html" id="tableBar">
-        	</script>
+		<script type="text/html" id="tableBar">
+		</script>
    </div>
+
    <script src="../../assets/lib/layui/layui.js"></script>
    <script src="../../assets/lib/layui/custom.js"></script>
    <script type="text/javascript">

--- a/web/src/main/resources/template/assets/lib/layui/custom.js
+++ b/web/src/main/resources/template/assets/lib/layui/custom.js
@@ -190,7 +190,7 @@ function _openNewWindows(mation){
 * 根据页面高度进行分页
 * @return {}
 */
-function getLimits(){
+function getLimits() {
 	var limit = getLimit();
 	var limits = new Array();
 	for(var i = 1; i <= 7; i++){
@@ -203,11 +203,13 @@ function getLimit(){
 	var clientHeight = document.body.clientHeight;
 	var toolbarHeight = $(".winui-toolbar").outerHeight(true);
 	var txtcenterHeight = $(".txtcenter").outerHeight(true);
+	var winuiTip = $(".winui-tip").outerHeight(true);
 	var tabTtileHeight = $(".layui-tab-title").outerHeight(true);
 	// 计算表格tbody的高度
 	var realHeight = clientHeight - 120
 		- (isNull(toolbarHeight) ? 0 : toolbarHeight)
 		- (isNull(txtcenterHeight) ? 0 : txtcenterHeight)
+		- (isNull(winuiTip) ? 0 : winuiTip)
 		- (isNull(tabTtileHeight) ? 0 : tabTtileHeight);
 	// 计算limit
 	return decimerFiveOrZero(Math.floor(realHeight / 35));

--- a/web/src/main/resources/template/assets/lib/winui/css/customer/skyeye-base.css
+++ b/web/src/main/resources/template/assets/lib/winui/css/customer/skyeye-base.css
@@ -2,9 +2,10 @@ html,
 body {
    height: 100%;
    background-size: cover;
+    overflow-y: auto;
 }

-button{
+button {
    cursor: pointer !important;
 }

@@ -40,11 +41,11 @@ button{
    margin-top: 50px;
 }

-.pic-show-bg{
+.pic-show-bg {
    background-color: rgba(0, 0, 0, 0) !important;
 }

-.pic-show-bg .layui-layer-close{
+.pic-show-bg .layui-layer-close {
    top: 0px !important;
    right: 0px !important;
 }
@@ -75,6 +76,7 @@ button{
    top: 0;
    bottom: 30px;
 }
+
 /*按钮*/
 .winui-btn {
    font-size: 12px;
@@ -224,7 +226,7 @@ input:disabled {
    line-height: 100px;
 }

-select option{
+select option {
    padding: 5px;
 }