Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

yangle

2022-12-03 0b00f4e910d52fc70e109d5e51aaab1ac2c8cd22

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_EmployeeList.html

@@ -22,14 +22,14 @@
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>-->
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="ck-table"></table>
    <table class="layui-hide" id="mainTable"></table>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
@@ -54,13 +54,17 @@
            , layer = layui.layer;

            form.on('submit(HQuery)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val(), 0);
            });
            form.on('submit(FH)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
                var checkStatus = table.checkStatus('ck-table')
                 , data = checkStatus.data;
                var index = parent.layer.getFrameIndex(window.name);
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length == 0) {
                    parent.layer.close(index);
                    return;
                }
                switch (Type) {
                    case "HKeeper":  //返回保管
                        parent.GetHKeeperValue(data);
@@ -83,16 +87,24 @@
                    case "HWorker5":  //返回操作工5
                        parent.GetHWorkerValue5(data);
                        break;
                    case "HWorker6":  //返回操作工6
                        parent.GetHWorkerValue6(data);
                        break;
                    case "HWorker7":  //返回操作工7
                        parent.GetHWorkerValue7(data);
                        break;
                    case "HWorker8":  //返回操作工8
                        parent.GetHWorkerValue8(data);
                        break;
                    case "HEmp":  //返回职员
                        parent.GetHEmpValue(data);
                        break;
                }
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val(), 0);
            table.render({
                elem: '#ck-table'
                elem: '#mainTable'
                // , url: '/demo/table/user/'
               , data: []
              , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 æ–°å¢ž
@@ -101,6 +113,7 @@
                , { field: 'HItemID', width: 150, title: '职员ID', hide: true }
                , { field: 'HNumber', width: 150, title: '职员代码' }
                , { field: 'HName', width: 150, title: '职员名称', sort: true }
                , { field: 'HEmpRate', width: 150, title: '职员系数', sort: true }
              ]]
              , page: true
            });
@@ -122,7 +135,7 @@
                    //data: { "Value": Value },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('ck-table', {
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false