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

yangle

2022-12-03 0b00f4e910d52fc70e109d5e51aaab1ac2c8cd22

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_DutyList.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>
@@ -40,13 +40,13 @@
            , form = layui.form
            , layer = layui.layer;

            form.on('submit(HQuery)', function () {//选择单位
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
            form.on('submit(HQuery)', function () {//选择职务
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            form.on('submit(FH)', function () {//选择职务
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
                var checkStatus = table.checkStatus('ck-table')
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
                 , data = checkStatus.data;
                parent.GetHDutyNameValue(data);
                var index = parent.layer.getFrameIndex(window.name);
@@ -54,15 +54,15 @@
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#ck-table'
                elem: '#mainTable'
                // , url: '/demo/table/user/'
               , data: []
              , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 æ–°å¢ž
              , cols: [[
                  { type: 'radio' }
                , { field: 'HItemID', width: 150, title: '职务ID', hide: true }
                , { field: 'HNumber', width: 150, title: '职务代码' }
                , { field: 'HName', width: 150, title: '职务名称', sort: true }
                , { field: 'HItemID', title: '职务ID', hide: true }
                , { field: 'HNumber', title: '职务代码' }
                , { field: 'HName', title: '职务名称', sort: true }
              ]]
              , page: true
            });
@@ -81,7 +81,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