From f50cd9cfde1cdfc8e5b2205a63bdb2694da28e1c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 14 四月 2026 16:55:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/PublicPage/MaterialInfo.html | 96 +++++++++++++++++++++++++++++++-----------------
1 files changed, 62 insertions(+), 34 deletions(-)
diff --git a/WebTM/views/PublicPage/MaterialInfo.html b/WebTM/views/PublicPage/MaterialInfo.html
index 4fc18a9..50da071 100644
--- a/WebTM/views/PublicPage/MaterialInfo.html
+++ b/WebTM/views/PublicPage/MaterialInfo.html
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鐗╂枡璧勬枡</title>
@@ -8,18 +9,22 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/ext/soulTable.css" media="all">
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../layuiadmin/treeTable.js"></script>
<script src="../../layuiadmin/Scripts/json2.js"></script>
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../layuiadmin/layui/zgqlayui.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../layuiadmin/layui/lay/modules/util.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
<style media="screen">
.custom-tree-item-clicked {
color: #FC9003
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -31,14 +36,16 @@
<div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
<div class="layui-row" style="padding:10px 0">
<div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;">
- <div id="treePart" lay-filter="treePart" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
+ <div id="treePart" lay-filter="treePart" class="demo-tree demo-tree-box"
+ style="height: 580px; overflow: scroll;"></div>
</div>
<div class="layui-col-xs12 layui-inline">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ <input type="text" class="layui-input" name="HNumber"
+ id="HNumber">
</div>
</div>
<div class="layui-inline">
@@ -50,16 +57,26 @@
<div class="layui-inline">
<label class="layui-form-label">浠撳簱浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HWHNumber" id="HWHNumber">
+ <input type="text" class="layui-input" name="HWHNumber"
+ id="HWHNumber">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">浠撳簱鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HWHName" id="HWHName">
+ <input type="text" class="layui-input" name="HWHName"
+ id="HWHName">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒嗙粍</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HGroup"
+ id="HGroup">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button"
+ lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -77,8 +94,7 @@
</div>
</div>
- <script src="../../layuiadmin/layui/zgqlayui.js"></script>
- <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
<script>
var treeCkData = { id: 0 };
var TagId = "";
@@ -88,7 +104,7 @@
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tableFilter'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -99,6 +115,8 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
+ , soulTable = layui.soulTable
+ , tableFilter = layui.tableFilter
//var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
//var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
var sWhere = " where 1 = 1" + " ";
@@ -112,26 +130,31 @@
, cellMinWidth: 90
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- , { field: '鐗╂枡浠撳簱璧勬枡浠ｇ爜', title: '鐗╂枡浠撳簱璧勬枡浠ｇ爜', sort: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�' }
- , { field: '杈呭姪灞炴�у悕绉�', title: '杈呭姪灞炴�у悕绉�' }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- , { field: '鎵规', title: '鎵规' }
- , { field: '鏁伴噺', title: '鏁伴噺' }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜' }
- , { field: '浠撳簱', title: '浠撳簱' }
- , { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜' }
- , { field: '浠撲綅', title: '浠撲綅' }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
- , { field: '鎵�灞炵粍缁�', title: '鎵�灞炵粍缁�' }
+ , { field: '鐗╂枡浠撳簱璧勬枡浠ｇ爜', title: '鐗╂枡浠撳簱璧勬枡浠ｇ爜', sort: true, filter: true, width: 200}
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true, filter: true, width: 200}
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', filter: true, width: 200}
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', filter: true, width: 200}
+ , { field: '鍒嗙粍', title: '鍒嗙粍', filter: true, width: 100 }
+ , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', filter: true, width: 100 }
+ , { field: '杈呭姪灞炴�у悕绉�', title: '杈呭姪灞炴�у悕绉�', filter: true, width: 100}
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', filter: true, width: 100}
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', filter: true, width: 100}
+ , { field: '鎵规', title: '鎵规', filter: true, width: 200}
+ , { field: '鏁伴噺', title: '鏁伴噺', filter: true, width: 100}
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', filter: true, width: 200}
+ , { field: '浠撳簱', title: '浠撳簱', filter: true, width: 200}
+ , { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', filter: true, width: 200}
+ , { field: '浠撲綅', title: '浠撲綅', filter: true, width: 200}
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', filter: true, width: 200}
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', filter: true, width: 200}
+ , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', filter: true, width: 200}
+ , { field: '鎵�灞炵粍缁�', title: '鎵�灞炵粍缁�', filter: true, width: 200}
]]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+
+ }
};
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -183,22 +206,26 @@
var HName = $("#HName").val();
var HWHNumber = $("#HWHNumber").val();
var HWHName = $("#HWHName").val()
+ var HGroup = $("#HGroup").val()
if (HNumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 = '" + HNumber + "'";
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
}
if (HWHNumber) {
- sWhere += " and 浠撳簱浠ｇ爜 = '" + HWHNumber + "'";
+ sWhere += " and 浠撳簱浠ｇ爜 like '%" + HWHNumber + "%'";
}
if (HWHName) {
- sWhere += " and 浠撳簱 = '" + HWHName + "'";
+ sWhere += " and 浠撳簱 like '%" + HWHName + "%'";
+ }
+ if (HGroup) {
+ sWhere += " and 鍒嗙粍 like '%" + HGroup + "%'";
}
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/MaterialList',
type: "GET",
- data: { "sWhere": sWhere},
+ data: { "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -217,7 +244,7 @@
//浠ヤ笂鏄痩ayui妯″潡
});
-
+
function SeachFilter(sWhere1) {
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
@@ -233,4 +260,5 @@
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.1