zy-asrs.git - Gitblit

parent: e2d1545d | 补丁 | 提交 | ignore whitespace

luxiaotao1123

2020-07-01 f4d729a909d795d55e7e749e5984586a361785b9

2个文件已修改

1个文件已添加

	src/main/webapp/static/js/matCode/matCode.js	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/matCode/matCode.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/matCode/tray.html	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/webapp/static/js/matCode/matCode.js

@@ -219,6 +219,20 @@
                    });
                }
                break;
            // 生成托盘码
            case "btnTray":
                layer.open({
                    type: 2,
                    title: '生成托盘码',
                    area: ['500px'],
                    shadeClose: true,
                    content: 'tray.html',
                    success: function(layero, index){
                    },
                    end: function () {
                    }
                });
                break;
        }
    });

@@ -282,26 +296,6 @@
                        setFormVal(layer.getChildFrame('#detail', index), data, true);
                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
                        layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
                    }
                });
                break;
            // 编辑
            case 'edit':
                layer.open({
                    type: 2,
                    title: '修改',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    shadeClose: false,
                    content: 'matCode_detail.html',
                    success: function(layero, index){
                        layer.getChildFrame('#data-detail-submit-save', index).hide();
                        setFormVal(layer.getChildFrame('#detail', index), data, false);
                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
                        top.convertDisabled(layer.getChildFrame('#matNo', index), true);
                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');

 src/main/webapp/views/matCode/matCode.html

@@ -84,13 +84,13 @@
        <button class="layui-btn layui-btn-normal" id="btn-export" lay-event="exportData" style="float: inherit">导出</button>
        <button class="layui-btn " id="btn-into" lay-event="intoData">导入</button>
        <button class="layui-btn layui-btn-danger" id="btn-print-batch" lay-event="btnPrintBatch">批量打印</button>
        <button class="layui-btn layui-btn-primary" id="btn-tray" lay-event="btnTray">生成托盘码</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>
    <button class="layui-btn layui-btn-danger layui-btn-xs btn-print" lay-event="btnPrint">打印</button>
<!--    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a>-->
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>

 src/main/webapp/views/matCode/tray.html

New file
@@ -0,0 +1,25 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <title>托盘管理</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/css/print.css" media="all">
    <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
    <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
    <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
    <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
</head>
<body>
<form class="layui-form">

</form>
</body>
</html>

			@@ -219,6 +219,20 @@
			});
			}
			break;
			// 生成托盘码
			case "btnTray":
			layer.open({
			type: 2,
			title: '生成托盘码',
			area: ['500px'],
			shadeClose: true,
			content: 'tray.html',
			success: function(layero, index){
			},
			end: function () {
			}
			});
			break;
			}
			});

			@@ -282,26 +296,6 @@
			setFormVal(layer.getChildFrame('#detail', index), data, true);
			top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
			layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
			layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
			layero.find('iframe')[0].contentWindow.layui.form.render('select');
			layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
			}
			});
			break;
			// 编辑
			case 'edit':
			layer.open({
			type: 2,
			title: '修改',
			maxmin: true,
			area: [top.detailWidth, top.detailHeight],
			shadeClose: false,
			content: 'matCode_detail.html',
			success: function(layero, index){
			layer.getChildFrame('#data-detail-submit-save', index).hide();
			setFormVal(layer.getChildFrame('#detail', index), data, false);
			top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
			top.convertDisabled(layer.getChildFrame('#matNo', index), true);
			layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
			layero.find('iframe')[0].contentWindow.layui.form.render('select');
			layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');

			@@ -84,13 +84,13 @@
			<button class="layui-btn layui-btn-normal" id="btn-export" lay-event="exportData" style="float: inherit">导出</button>
			<button class="layui-btn " id="btn-into" lay-event="intoData">导入</button>
			<button class="layui-btn layui-btn-danger" id="btn-print-batch" lay-event="btnPrintBatch">批量打印</button>
			<button class="layui-btn layui-btn-primary" id="btn-tray" lay-event="btnTray">生成托盘码</button>
			</div>
			</script>

			<script type="text/html" id="operate">
			<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>
			<button class="layui-btn layui-btn-danger layui-btn-xs btn-print" lay-event="btnPrint">打印</button>
			<!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a>-->
			</script>

			<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>

New file
			@@ -0,0 +1,25 @@
			<!DOCTYPE html>
			<html lang="en">
			<head>
			<meta charset="UTF-8">
			<title>托盘管理</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../static/css/cool.css" media="all">
			<link rel="stylesheet" href="../../static/css/common.css" media="all">
			<link rel="stylesheet" href="../../static/css/print.css" media="all">
			<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
			<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
			<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
			<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
			</head>
			<body>
			<form class="layui-form">

			</form>
			</body>
			</html>