合并分支

chenhaozhe

2025-05-21 e50265de5ae4e5e4c8b8852e777216adab7c4ce4

 WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBillList.html

@@ -32,23 +32,14 @@
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
        <label class="layui-form-label">单据类型</label>
        <div class="layui-input-block">
            <select name="HBillType" id="HBillType">
                <option value="">所有</option>
                <option value="ZHXJ">下架找货单</option>
                <option value="ZHSJ">上架归还单</option>
            </select>
        </div>
    </div>-->
                                </div>                              
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                               
                                <div class="layui-inline">
                                    <label class="layui-form-label">制单人</label>
                                    <div class="layui-input-block">
@@ -177,16 +168,11 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container"  id="toolbarDemo_ButtonSet">
                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_LookDown" id="btn_LookDown"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="ShowBill"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData" id="getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" id="reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" id="details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" id="generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>
@@ -196,7 +182,6 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" id="exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_LookDown" id="btn_LookDown"><i class="layui-icon layui-icon-export"></i>导出</button>
                            </div>
                        </script>
                    </form>
@@ -245,7 +230,7 @@
            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
            //#endregion

            var titleData = ["hmainid", "hsubid", "设备ID", "内部单据号", "点检项目ID", "负责人ID", "设备点检规程ID", "HBillType","sorderid"];//不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "hsubid", "设备ID", "内部单据号", "点检项目ID", "负责人ID", "设备点检规程ID", "HBillType", "sorderid","HShiftsID"];//不需要显示的字段 å¯æ‰©å±•

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

@@ -605,12 +590,10 @@
                            option.cols = [col];
                            option.data = data1.data;
                            option.totalRow = true;
                            ins = table.render(option);
                            laypage.render(optionPage);
                            //列设置
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);

                            ////刷新表格数据
                            ins = table.render(option);

                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {