zy-asrs.git - Gitblit

parent: 24b39a85 | 补丁 | 提交 | ignore whitespace

lsh

2024-12-24 b32497eebb0fbb3950fa315ed7a75c8457404744

4个文件已修改

	src/main/webapp/static/js/basProcessProcedures/basProcessProcedures.js	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/basQualityTesting/basQualityTesting.js	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/basProcessProcedures/basProcessProcedures.html	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/basQualityTesting/basQualityTesting.html	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/webapp/static/js/basProcessProcedures/basProcessProcedures.js

@@ -21,10 +21,10 @@
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'boxSpecs', align: 'center',title: '任务号'}
            ,{field: 'boxType', align: 'center',title: '堆垛机'}
            // {type: 'checkbox'},
            {field: 'id', align: 'center',title: 'ID'}
            ,{field: 'boxSpecs', align: 'center',title: '工序名'}
            ,{field: 'boxType', align: 'center',title: '工序号'}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],

 src/main/webapp/static/js/basQualityTesting/basQualityTesting.js

@@ -21,10 +21,10 @@
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'boxSpecs', align: 'center',title: '任务号'}
            ,{field: 'boxType', align: 'center',title: '堆垛机'}
            // {type: 'checkbox'},
            {field: 'id', align: 'center',title: 'ID'}
            ,{field: 'boxSpecs', align: 'center',title: '状态名'}
            ,{field: 'boxType', align: 'center',title: '状态号'}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],

 src/main/webapp/views/basProcessProcedures/basProcessProcedures.html

@@ -17,16 +17,16 @@
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
                     <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                        </div>
                    </div>
<!--                    <div class="layui-inline">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">-->
<!--                        </div>-->
<!--                    </div>-->
<!--                     <div class="layui-inline" style="width: 300px">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
@@ -50,14 +50,16 @@
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
<!--        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>-->
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    {{# if (d.id != 1) { }}
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
    {{# } }}
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -73,15 +75,15 @@
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">任务号: </label>
                    <label class="layui-form-label layui-form-required">工序名: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="boxSpecs" placeholder="请输入任务号" lay-vertype="tips" lay-verify="required">
                        <input class="layui-input" name="boxSpecs" placeholder="请输入工序名" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">堆垛机: </label>
                    <label class="layui-form-label">工序号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="boxType" placeholder="请输入堆垛机">
                        <input class="layui-input" name="boxType" placeholder="请输入工序号">
                    </div>
                </div>


 src/main/webapp/views/basQualityTesting/basQualityTesting.html

@@ -17,16 +17,16 @@
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
                     <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                        </div>
                    </div>
<!--                    <div class="layui-inline">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">-->
<!--                        </div>-->
<!--                    </div>-->
<!--                     <div class="layui-inline" style="width: 300px">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
@@ -50,14 +50,16 @@
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
<!--        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>-->
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    {{# if (d.id != 1) { }}
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
    {{# } }}
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -73,15 +75,15 @@
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">任务号: </label>
                    <label class="layui-form-label layui-form-required">状态名: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="boxSpecs" placeholder="请输入任务号" lay-vertype="tips" lay-verify="required">
                        <input class="layui-input" name="boxSpecs" placeholder="请输入状态名" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">堆垛机: </label>
                    <label class="layui-form-label">状态号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="boxType" placeholder="请输入堆垛机">
                        <input class="layui-input" name="boxType" placeholder="请输入状态号">
                    </div>
                </div>

			@@ -21,10 +21,10 @@
			cellMinWidth: 50,
			height: 'full-120',
			cols: [[
			{type: 'checkbox'}
			,{field: 'id', align: 'center',title: 'ID'}
			,{field: 'boxSpecs', align: 'center',title: '任务号'}
			,{field: 'boxType', align: 'center',title: '堆垛机'}
			// {type: 'checkbox'},
			{field: 'id', align: 'center',title: 'ID'}
			,{field: 'boxSpecs', align: 'center',title: '工序名'}
			,{field: 'boxType', align: 'center',title: '工序号'}

			,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
			]],

			@@ -17,16 +17,16 @@
			<div class="layui-card-body">
			<div class="layui-form toolbar" id="search-box">
			<div class="layui-form-item">
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline" style="width: 300px">
			<div class="layui-input-inline">
			<input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
			</div>
			</div>
			<!-- <div class="layui-inline">-->
			<!-- <div class="layui-input-inline">-->
			<!-- <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- <div class="layui-inline" style="width: 300px">-->
			<!-- <div class="layui-input-inline">-->
			<!-- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">-->
			<!-- </div>-->
			<!-- </div>-->
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
			@@ -50,14 +50,16 @@
			<script type="text/html" id="toolbar">
			<div class="layui-btn-container">
			<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
			<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
			<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>-->
			<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
			</div>
			</script>

			<script type="text/html" id="operate">
			<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
			{{# if (d.id != 1) { }}
			<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
			{{# } }}
			</script>

			<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
			@@ -73,15 +75,15 @@
			<div class="layui-row">
			<div class="layui-col-md12">
			<div class="layui-form-item">
			<label class="layui-form-label layui-form-required">任务号: </label>
			<label class="layui-form-label layui-form-required">工序名: </label>
			<div class="layui-input-block">
			<input class="layui-input" name="boxSpecs" placeholder="请输入任务号" lay-vertype="tips" lay-verify="required">
			<input class="layui-input" name="boxSpecs" placeholder="请输入工序名" lay-vertype="tips" lay-verify="required">
			</div>
			</div>
			<div class="layui-form-item">
			<label class="layui-form-label">堆垛机: </label>
			<label class="layui-form-label">工序号: </label>
			<div class="layui-input-block">
			<input class="layui-input" name="boxType" placeholder="请输入堆垛机">
			<input class="layui-input" name="boxType" placeholder="请输入工序号">
			</div>
			</div>