MES-WEB-LayUI.git

			@@ -8,6 +8,7 @@
			<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>
			@@ -59,6 +60,12 @@
			<input type="text" class="layui-input" name="HWHName" id="HWHName">
			</div>
			</div>
			<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>
			@@ -88,7 +95,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 +106,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 +121,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 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', sort: true, filter: true}
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', filter: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', filter: true }
			, { field: 'åç»', title: 'åç»', filter: true }
			, { field: 'è¾å©å±æ§ä»£ç ', title: 'è¾å©å±æ§ä»£ç ', filter: true }
			, { field: 'è¾å©å±æ§åç§°', title: 'è¾å©å±æ§åç§°', filter: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', filter: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', filter: true}
			, { field: 'æ¹æ¬¡', title: 'æ¹æ¬¡', filter: true }
			, { field: 'æ°é', title: 'æ°é', filter: true }
			, { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', filter: true}
			, { field: 'ä»åº', title: 'ä»åº', filter: true }
			, { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ', filter: true }
			, { field: 'ä»ä½', title: 'ä»ä½', filter: true }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', filter: true }
			, { field: 'ä¾åºå', title: 'ä¾åºå', filter: true }
			, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', filter: true}
			, { field: 'æå±ç»ç»', title: 'æå±ç»ç»', filter: true }

			]]
			, done: function (res, curr, count) {
			soulTable.render(this);

			}
			};

			//#region ç¹å»è¡éä¸é«äº®
			@@ -183,17 +197,21 @@
			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',

	WebTM/views/PublicPage/MaterialInfo.html	64 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_MouldType.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_MouldType.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -68,7 +68,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-inline">
			<textarea placeholder="è¯·è¾å¥ç»´å¤æ³¨" class="layui-textarea" name="HRemark" id="HRemark" value=""></textarea>
			<textarea placeholder="è¯·è¾å¥å¤æ³¨" class="layui-textarea" name="HRemark" id="HRemark" value=""></textarea>
			</div>
			</div>
			<div class="layui-inline">

			@@ -238,7 +238,7 @@
			var option = [];

			var sql = "";
			var HMaterTypeID = 0; //ç¶çº§åç±»èç¹id
			var HParentID = 0; //ç¶çº§åç±»èç¹id
			//#endregion

			var titleData = ["HMouldID", "hsubid", "HItemID", "HParentID","HUSEORGID"];
			@@ -775,7 +775,7 @@
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: ['../å¬ç¨åºç¡èµæ/Add_Edit_Gy_MouldType.html?hID=' + TagId + '&Level=' + Level + ''],
			content: ['../å¬ç¨åºç¡èµæ/Add_Edit_Gy_MouldType.html?hID=' + TagId + '&Level=' + Level + '&TagParentId=' + HParentID],
			end: function () {
			//å·æ°é¡µé¢,
			location.reload();