MES-WEB-LayUI.git

parent: 95810fc9 | 补丁 | 提交 | ignore whitespace

器具档案列表增加左边树形器具分类，点击分类，根据分类来过滤，方便选择器具档案里，增加字段 HMouldClass varchar(50) 器...

yangle

2024-03-07 e63dde0be7603ad08cb92d8c4dba3b8ab2ece51c

器具档案列表 增加 左边树形 器具分类，点击分类，根据分类来过滤，方便选择
 器具档案里，增加字段 HMouldClass varchar(50) 器具类型 下拉框 （模具、工装、夹具、刀具、检具、周转器具、其他）

2个文件已修改

	WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html	135 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß¹ÜÀí/Gy_MouldFile.html

@@ -358,6 +358,20 @@
                                                <input type="text" class="layui-input" name="HNextMainDate" id="HNextMainDate" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline" style="margin-left:10px;">
                                            <label class="layui-form-label">å¨å·åç±»</label>
                                            <div class="layui-input-block">
                                                <select name="HMouldClass" lay-filter="HMouldClass" id="HMouldClass">
                                                    <option value="æ¨¡å·" selected="selected">æ¨¡å·</option>
                                                    <option value="å·¥è£">å·¥è£</option>
                                                    <option value="å¤¹å·">å¤¹å·</option>
                                                    <option value="åå·">åå·</option>
                                                    <option value="æ£å·">æ£å·</option>
                                                    <option value="å¨è½¬å¨å·">å¨è½¬å¨å·</option>
                                                    <option value="å¶ä»">å¶ä»</option>
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -1250,6 +1264,7 @@
                        $("#HBarCode").val(d.data[0].æ¡ç ç¼å·);
                        $("#HMadeSupID").val(d.data[0].HMadeSupID);
                        $("#HMadeSupName").val(d.data[0].å¶é åå);
                        $("#HMouldClass").val(d.data[0].å¨å·åç±»);
                        //$("#HNowSupID").val(d.data[0].HNowSupID);
                        //$("#HNowSupName").val(d.data[0].èæä»);
                        var HCycleUnit = d.data[0].å¨æåä½;
@@ -1258,6 +1273,8 @@
                        if ( !(HCycleUnit == null || HCheckCycle == null ) ) {
                            calculateHNextMainDate(d.data[0].hmainid, HCycleUnit, HCheckCycle);
                        }

                        form.render('select');
                    }
                });
            }

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß¹ÜÀí/Gy_MouldFileList.html

@@ -8,11 +8,18 @@
    <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">
    <style type="text/css">
    </style>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>

    <script src="../../../layuiadmin/layui/layui1.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/lay/modules/table.js"></script>
    <style>
        /*æ ç¶å¾ç¹å»é«äº®åè²*/
        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
            background: #aef0f7;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
@@ -47,7 +54,16 @@

                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div class="layui-row" style="padding:10px 0">
                            <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <div id="TreeTable" class="demo-tree demo-tree-box"></div>
                            </div>
                            <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
                                <div>
                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
@@ -68,27 +84,23 @@
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/layui/layui.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/PubCustom.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tree'], function () {
            //#region å¬å±åé
            var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            , soulTable = layui.soulTable
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , soulTable = layui.soulTable
                , tree = layui.tree
            var sWhere = "";
            var option = [];
            //#endregion
@@ -156,6 +168,8 @@

                //æ¥è¯¢
                get_Display(sWhere);
                //æ¥è¯¢å¨å·åç±»
                get_Display_Tree();
            }

            //åå§åè¡¨æ ¼
@@ -497,6 +511,89 @@
                }
            }

            // æ ç¶å¾æ¥è¯¢
            function get_Display_Tree() {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_Mould/TreeList',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.close(ajaxLoad);
                            var data = JSON.parse(data1.data);
                            MenuMain(data);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }

            //éåçæä¸»èå
            function MenuMain(data) {
                var liStr = '[';
                //éåçæä¸»èå
                for (var i = 0; i < data.length; i++) {
                    // å¤ææ¯å¦åå¨åèå
                    if (data[i].children != null && data[i].children.length > 0) {
                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
                        // éåè·ååèå
                        for (var k = 0; k < data[i].children.length; k++) {
                            liStr += getChildMenu(data[i].children[k], 0);
                        }
                        liStr = liStr.substring(0, liStr.length - 1);
                        liStr += ']},';
                    } else {
                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
                    }
                };
                liStr = liStr.substring(0, liStr.length - 1);
                liStr += "]";
                var treeTable = JSON.parse(liStr);
                tree.render({
                    elem: '#TreeTable' //é»è®¤æ¯ç¹å»èç¹å¯è¿è¡æ¶ç¼©
                    , data: treeTable
                    , click: function (obj) {
                        //é«äº®åè²
                        $(".layui-tree-set").removeClass('layui-tree-set-active');
                        obj.elem.addClass('layui-tree-set-active');

                        var data = obj.data;  //è·åå½åç¹å»çèç¹æ°æ®
                        var sql = "";
                        if (data.id == "0") {
                            sql = "";
                        } else {
                            sql = " and HMouldTypeID='" + data.id + "' ";
                        }
                        get_Display(sql);
                    }
                });
            }

            // éå½çæåèå
            function getChildMenu(subMenu, num) {
                num++;
                var subStr = '';
                if (subMenu.children != null && subMenu.children.length > 0) {
                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
                    for (var j = 0; j < subMenu.children.length; j++) {
                        subStr += getChildMenu(subMenu.children[j], num);
                        if (j + 1 == subMenu.children.length) {
                            subStr = subStr.substring(0, subStr.length - 1);
                        }
                    }
                    subStr += ']},';
                } else {
                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
                }
                return subStr;
            }

            //å·æ°
            function get_Refresh() {
                $("#HNumber").val("");

			@@ -358,6 +358,20 @@
			<input type="text" class="layui-input" name="HNextMainDate" id="HNextMainDate" readonly>
			</div>
			</div>
			<div class="layui-inline" style="margin-left:10px;">
			<label class="layui-form-label">å¨å·åç±»</label>
			<div class="layui-input-block">
			<select name="HMouldClass" lay-filter="HMouldClass" id="HMouldClass">
			<option value="æ¨¡å·" selected="selected">æ¨¡å·</option>
			<option value="å·¥è£">å·¥è£</option>
			<option value="å¤¹å·">å¤¹å·</option>
			<option value="åå·">åå·</option>
			<option value="æ£å·">æ£å·</option>
			<option value="å¨è½¬å¨å·">å¨è½¬å¨å·</option>
			<option value="å¶ä»">å¶ä»</option>
			</select>
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -1250,6 +1264,7 @@
			$("#HBarCode").val(d.data[0].æ¡ç ç¼å·);
			$("#HMadeSupID").val(d.data[0].HMadeSupID);
			$("#HMadeSupName").val(d.data[0].å¶é åå);
			$("#HMouldClass").val(d.data[0].å¨å·åç±»);
			//$("#HNowSupID").val(d.data[0].HNowSupID);
			//$("#HNowSupName").val(d.data[0].èæä»);
			var HCycleUnit = d.data[0].å¨æåä½;
			@@ -1258,6 +1273,8 @@
			if ( !(HCycleUnit == null \|\| HCheckCycle == null ) ) {
			calculateHNextMainDate(d.data[0].hmainid, HCycleUnit, HCheckCycle);
			}

			form.render('select');
			}
			});
			}

			@@ -8,11 +8,18 @@
			<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">
			<style type="text/css">
			</style>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>

			<script src="../../../layuiadmin/layui/layui1.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/lay/modules/table.js"></script>
			<style>
			/æ ç¶å¾ç¹å»é«äº®åè²/
			.layui-tree-set-active > .layui-tree-entry .layui-tree-main {
			background: #aef0f7;
			}
			</style>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -47,7 +54,16 @@

			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div id="TreeTable" class="demo-tree demo-tree-box"></div>
			</div>
			<div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
			<div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>
			</div>
			</div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
			@@ -68,27 +84,23 @@
			</div>
			</div>
			</div>
			<script src="../../../layuiadmin/layui/layui.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/PubCustom.js"></script>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tree'], function () {
			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, soulTable = layui.soulTable
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, soulTable = layui.soulTable
			, tree = layui.tree
			var sWhere = "";
			var option = [];
			//#endregion
			@@ -156,6 +168,8 @@

			//æ¥è¯¢
			get_Display(sWhere);
			//æ¥è¯¢å¨å·åç±»
			get_Display_Tree();
			}

			//åå§åè¡¨æ ¼
			@@ -497,6 +511,89 @@
			}
			}

			// æ ç¶å¾æ¥è¯¢
			function get_Display_Tree() {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_Mould/TreeList',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			layer.close(ajaxLoad);
			var data = JSON.parse(data1.data);
			MenuMain(data);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//éåçæä¸»èå
			function MenuMain(data) {
			var liStr = '[';
			//éåçæä¸»èå
			for (var i = 0; i < data.length; i++) {
			// å¤ææ¯å¦åå¨åèå
			if (data[i].children != null && data[i].children.length > 0) {
			liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
			// éåè·ååèå
			for (var k = 0; k < data[i].children.length; k++) {
			liStr += getChildMenu(data[i].children[k], 0);
			}
			liStr = liStr.substring(0, liStr.length - 1);
			liStr += ']},';
			} else {
			liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
			}
			};
			liStr = liStr.substring(0, liStr.length - 1);
			liStr += "]";
			var treeTable = JSON.parse(liStr);
			tree.render({
			elem: '#TreeTable' //é»è®¤æ¯ç¹å»èç¹å¯è¿è¡æ¶ç¼©
			, data: treeTable
			, click: function (obj) {
			//é«äº®åè²
			$(".layui-tree-set").removeClass('layui-tree-set-active');
			obj.elem.addClass('layui-tree-set-active');

			var data = obj.data; //è·åå½åç¹å»çèç¹æ°æ®
			var sql = "";
			if (data.id == "0") {
			sql = "";
			} else {
			sql = " and HMouldTypeID='" + data.id + "' ";
			}
			get_Display(sql);
			}
			});
			}

			// éå½çæåèå
			function getChildMenu(subMenu, num) {
			num++;
			var subStr = '';
			if (subMenu.children != null && subMenu.children.length > 0) {
			subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
			for (var j = 0; j < subMenu.children.length; j++) {
			subStr += getChildMenu(subMenu.children[j], num);
			if (j + 1 == subMenu.children.length) {
			subStr = subStr.substring(0, subStr.length - 1);
			}
			}
			subStr += ']},';
			} else {
			subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
			}
			return subStr;
			}

			//å·æ°
			function get_Refresh() {
			$("#HNumber").val("");