yusijie
2025-04-08 47b213eb82aeac6e4ea2653d37d281ada5dca462
设备模块
11个文件已修改
96 ■■■■■ 已修改文件
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterUnitList.html 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EqpConkBookBillList.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipDotCheckBillList.html 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipMaintainBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备停机单/Sb_EquipStopBillList.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备开机单/Sb_EquipBeginBillList.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备维修派工单/Sb_EquipRepairSendWorkBillEdit.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_TechnologyParameterList.html
@@ -480,7 +480,7 @@
            function get_Display(sWhere) {
                var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();
                sWhere += addSWhereByOpenType();//添加单据模块选择基础资料时的过滤条件,已审核未关闭
                //sWhere += addSWhereByOpenType();//添加单据模块选择基础资料时的过滤条件,已审核未关闭
                //加载数据到网格
                $.ajax({
                    url: GetWEBURL() + '/Gy_TechnologyParameter/list',// Gy_Employee/list
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_TechnologyParameterUnitList.html
@@ -294,7 +294,7 @@
            function get_Display(sWhere) {
                var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();
                sWhere += addSWhereByOpenType();//添加单据模块选择基础资料时的过滤条件,已审核未关闭
                //sWhere += addSWhereByOpenType();//添加单据模块选择基础资料时的过滤条件,已审核未关闭
                //加载数据到网格
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
@@ -628,16 +628,16 @@
            //#endregion
            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开,并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = getUrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var addSWhere = "";
                if (typeof (openType) != "undefined") {
                    addSWhere = " and isnull(关闭人,'') = '' and å®¡æ ¸äºº != ''";
                }
                return addSWhere;
            }
            //function addSWhereByOpenType() {
            //    //获取参数
            //    var params = getUrlVars();
            //    var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
            //    var addSWhere = "";
            //    if (typeof (openType) != "undefined") {
            //        addSWhere = " and isnull(关闭人,'') = '' and å®¡æ ¸äºº != ''";
            //    }
            //    return addSWhere;
            //}
            //#endregion
            //#region å®¡æ ¸
WebTM/views/É豸¹ÜÀí/Sb_Add_EqpConkBookBillList.html
@@ -580,7 +580,7 @@
                            var data = result.data.h_v_Sb_EquipConkBookBillList_Edit[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                , "HDate": Format(data.日期)
                                , "HDate": Format(data.日期, "yyyy-MM-dd")
                                , "HInnerBillNo": data.内部单据号
                                , "HDeptID": data.HDeptID                 //使用部门ID
                                , "HDeptName": data.部门名称              //使用部门名称
@@ -592,7 +592,7 @@
                                , "HEquipName": data.设备名称             //设备名称
                                , "HConkTypeID": data.HConkTypeID            //故障类别ID
                                , "HConkTypeName": data.故障类别          //故障类别
                                , "HConkBeginDate": Format(data.发生日期) //故障发生日期
                                , "HConkBeginDate": Format(data.发生日期, "yyyy-MM-dd") //故障发生日期
                                , "HExplanation": data.故障描述           //摘要
                                , "HLev": data.紧急程度                //备注
                                , "HReason": data.故障原因分析及预防措施                //备注
WebTM/views/É豸¹ÜÀí/Sb_Add_EqpMaintenanceBillList.html
@@ -999,16 +999,16 @@
                            var data = result.data.h_v_Sb_EquipRepairWorkBill_Edit[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
                                , "HDate": formatDate(data.日期, "yyyy-MM-dd")
                                , "HInnerBillNo": data.内部单据号
                                , "HEmpID": data.HEmpID                   //维修人ID
                                , "HEmpName": data.维修人                   //维修人
                                , "HRepairBeginDate": formatDate(data.维修开始日期)   //维修开始日期
                                , "HRepairBeginDate": formatDate(data.维修开始日期, "yyyy-MM-dd")   //维修开始日期
                                , "HEquipID": data.HEquipID               //设备ID
                                , "HEquipName": data.设备名称             //设备名称
                                , "HManagerID": data.HManagerID           //负责人ID
                                , "HManagerName": data.负责人           //负责人名称
                                , "HRepairEndDate": formatDate(data.维修结束日期)     //维修结束日期
                                , "HRepairEndDate": formatDate(data.维修结束日期, "yyyy-MM-dd")     //维修结束日期
                                , "HRepairID": data.HRepairID             //维修项目ID
                                , "HRepairName": data.维修项目             //维修项目名称
                                , "HDeptID": data.HDeptID                 //维修部门ID
@@ -1028,15 +1028,15 @@
                                , "HRepairer": data.报修人
                                , "HIsCapacityImpact": data.是否有产能影响
                                , "HMaker": data.制单人
                                , "HMakeDate": data.制单日期 == null ? "" : Format(new Date(data.制单日期), "yyyy-MM-dd")
                                , "HMakeDate": data.制单日期 == null ? "" : formatDate(new Date(data.制单日期), "yyyy-MM-dd")
                                , "HChecker": data.审核人
                                , "HCheckDate": data.审核日期 == null ? "" : Format(new Date(data.审核日期), "yyyy-MM-dd")
                                , "HCheckDate": data.审核日期 == null ? "" : formatDate(new Date(data.审核日期), "yyyy-MM-dd")
                                , "HUpDater": data.修改人
                                , "HUpDateDate": data.修改日期 == null ? "" : Format(new Date(data.修改日期), "yyyy-MM-dd")
                                , "HUpDateDate": data.修改日期 == null ? "" : formatDate(new Date(data.修改日期), "yyyy-MM-dd")
                                , "HCloseMan": data.关闭人
                                , "HCloseDate": data.关闭日期 == null ? "" : Format(new Date(data.关闭日期), "yyyy-MM-dd")
                                , "HCloseDate": data.关闭日期 == null ? "" : formatDate(new Date(data.关闭日期), "yyyy-MM-dd")
                                , "HDeleteMan": data.作废人
                                , "HDeleteDate": data.作废日期 == null ? "" : Format(new Date(data.作废日期), "yyyy-MM-dd")
                                , "HDeleteDate": data.作废日期 == null ? "" : formatDate(new Date(data.作废日期), "yyyy-MM-dd")
                            });
                        } else {
WebTM/views/É豸¹ÜÀí/Sb_EqpConkBookBillList.html
@@ -340,9 +340,6 @@
                laypage.render(optionPage);
            }
            //初始化表格
            DisPlay_HideColumn();
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBillList.html
@@ -168,18 +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">
                            <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>
                            <div class="layui-btn-container"  id="toolbarDemo_ButtonSet">
                                <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>
@@ -189,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>
                            </div>
                        </script>
                    </form>
@@ -598,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) {
WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckPlanBillList.html
@@ -409,7 +409,7 @@
                var ajaxLoad = layer.load();
                sWhere += addSWhereByOpenType();//添加单据模块选择基础资料时的过滤条件,已审核未关闭
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldDotCheckBill/GetMouldDotCheckBillListPage',
                    url: GetWEBURL() + '/Sb_EquipDotCheckPlanBill/GetEquipDotCheckPlanBillListPage',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
                    success: function (data1) {
WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainBillList.html
@@ -674,7 +674,7 @@
            function get_DisplayPage(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillListPage',
                    url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillListPage',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
                    success: function (data1) {
WebTM/views/É豸¹ÜÀí/É豸ͣ»úµ¥/Sb_EquipStopBillList.html
@@ -217,7 +217,6 @@
            var HBillType = "3918";
            var set_HideButton_ID = "toolbarDemo_ButtonSet";//需要设置的按钮的父级节点的id
            è§¦å‘事件
            //#region ã€åŠ¨æ€èŽ·å–æ¨¡å—åç§°ã€‘
            var HModuleType = "3918";
            //通过单据类型,从数据库动态获取单据模块命名,引用js文件 PageTitle.js
WebTM/views/É豸¹ÜÀí/É豸¿ª»úµ¥/Sb_EquipBeginBillList.html
@@ -162,18 +162,18 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <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>
WebTM/views/É豸¹ÜÀí/É豸άÐÞÅɹ¤µ¥/Sb_EquipRepairSendWorkBillEdit.html
@@ -168,8 +168,6 @@
                                            <div class="layui-inline" style="width: 56%;">
                                                <label class="layui-form-label" style="width: 85px;">备注</label>
                                                <div class="layui-input-inline">
                                                    <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
                                                    <input type="hidden" class="layui-input" name="HUpDater" id="HUpDater" lay-verify="HUpDater" value="">
                                                    <textarea placeholder="请输入备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                </div>
                                            </div>
@@ -438,7 +436,7 @@
                    //制单人
                    $("#HMaker").val(sessionStorage["HUserName"]);
                    //修改人
                    $("#HUpDater").val(sessionStorage["HUserName"]);
                    //$("#HUpDater").val(sessionStorage["HUserName"]);
                    //初始化表格
                    set_InitGrid();
                    //初始化日期
@@ -607,7 +605,7 @@
                        , area: ["90%", "90%"] //窗体大小
                        , title: "维修项目表"  //标题
                        , shift: 2 //弹出动画
                        , content: ["../../基础资料/基础资料/Gy_RepairList.html?openType=2', "yes"]
                        , content: ["../../基础资料/基础资料/Gy_RepairList.html?openType=2", "yes"]
                        , btn: ["确定", "取消"]
                        , btn1: function (index) { //按钮一回调
                            var iframeWindow = window["layui-layer-iframe" + index]; //获取弹窗页面