自动化立体仓库 - WMS系统
#
luxiaotao1123
2020-06-17 412369afd312125a5f8744b31f5752710f0658de
#
6个文件已修改
49 ■■■■ 已修改文件
src/main/webapp/static/js/basWhs/basWhs.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/locMast/locMast.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/rowLastno/rowLastno.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/wrkLastno/wrkLastno.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/basWhs/basWhs_detail.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/locMast/locMast.html 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/basWhs/basWhs.js
@@ -91,7 +91,7 @@
                    type: 2,
                    title: '新增',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    area: ['500px', top.detailHeight],
                    shadeClose: false,
                    content: 'basWhs_detail.html',
                    success: function(layero, index){
@@ -207,7 +207,7 @@
                    type: 2,
                    title: '修改',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    area: ['500px', top.detailHeight],
                    shadeClose: false,
                    content: 'basWhs_detail.html',
                    success: function(layero, index){
src/main/webapp/static/js/locMast/locMast.js
@@ -53,7 +53,7 @@
            // ,{field: 'PdcType', align: 'center',title: ''}
            // ,{field: 'ctnNo', align: 'center',title: ''}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:100}
        ]],
        request: {
            pageName: 'curr',
src/main/webapp/static/js/rowLastno/rowLastno.js
@@ -21,15 +21,15 @@
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
            ,{field: 'whsType', align: 'center',title: '类别', width:80}
            ,{field: 'wrkMk', align: 'center',title: '当前工作号'}
            ,{field: 'currentRow', align: 'center',title: '当前排号'}
            ,{field: 'sRow', align: 'center',title: '起始排号'}
            ,{field: 'currentRow', align: 'center',title: '当前排号', style: 'color: #AA3130;font-weight: bold'}
            ,{field: 'eRow', align: 'center',title: '终止排号'}
            ,{field: 'crnQty', align: 'center',title: '堆垛机数量'}
            ,{field: 'memo', align: 'center',title: '备注'}
            // ,{field: 'modiUser$', align: 'center',title: '修改人员'}
            // ,{field: 'modiTime$', align: 'center',title: '修改时间', width:200}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],
        request: {
            pageName: 'curr',
src/main/webapp/static/js/wrkLastno/wrkLastno.js
@@ -19,12 +19,12 @@
        cols: [[
            {type: 'checkbox', fixed: 'left'}
            ,{field: 'wrkMk', align: 'center',title: '类型'}
            ,{field: 'wrkNo', align: 'center',title: '当前ID'}
            ,{field: 'sno', align: 'center',title: '起始ID'}
            ,{field: 'wrkNo', align: 'center',title: '当前ID', style: 'color: #AA3130;font-weight: bold'}
            ,{field: 'eno', align: 'center',title: '终止ID'}
            ,{field: 'memoM', align: 'center',title: '备注'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', width:200}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', width:120}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate'}
        ]],
        request: {
src/main/webapp/views/basWhs/basWhs_detail.html
@@ -14,7 +14,7 @@
<!-- 详情 -->
<div id="data-detail" class="layer_self_wrap">
    <form id="detail" class="layui-form">
    <form id="detail" class="layui-form" style="text-align: center">
    <!--
        <div class="layui-inline"  style="display: none">
            <label class="layui-form-label"><span class="not-null">*</span>编  号:</label>
@@ -23,13 +23,13 @@
            </div>
        </div>
    -->
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>编  号:</label>
            <div class="layui-input-inline">
                <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'basWhs')">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">库位类型:</label>
            <div class="layui-input-inline">
                <input id="whsDesc" class="layui-input" type="text">
src/main/webapp/views/locMast/locMast.html
@@ -30,18 +30,6 @@
        </div>
    </div>
    <div class="layui-inline">
        <label class="layui-form-label">库位类型:</label>
        <div class="layui-input-inline cool-auto-complete">
            <input id="whsType" class="layui-input" name="whs_type" type="text" placeholder="请输入" autocomplete="off" style="display: none">
            <input id="whsType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                </select>
            </div>
        </div>
    </div>
    <div class="layui-inline">
        <label class="layui-form-label">库位状态:</label>
        <div class="layui-input-inline cool-auto-complete">
            <input id="locType" class="layui-input" name="loc_type" type="text" placeholder="请输入" autocomplete="off" style="display: none">
@@ -53,9 +41,20 @@
            </div>
        </div>
    </div>
    <div class="layui-inline">
        <label class="layui-form-label">库位类型:</label>
        <div class="layui-input-inline cool-auto-complete">
            <input id="whsType" class="layui-input" name="whs_type" type="text" placeholder="请输入" autocomplete="off" style="display: none">
            <input id="whsType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                </select>
            </div>
        </div>
    </div>
    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item">
    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>
    </div>
@@ -76,7 +75,7 @@
</script>
<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>
<!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>-->
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a>
</script>