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

wtt

2024-05-28 5503d91087c16312da33bbc6e9d3c70921813297

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

 WebTM/views/IpadIndex.html

@@ -44,6 +44,7 @@
        var HEmpName = "";      //操作员
        var HManagerName = "";      //负责人
        var HGroupName = "";      //班组
        var HProcID = 0;      //工序

        //注意：选项卡 ä¾èµ– element æ¨¡å—，否则无法进行功能性操作
        layui.config({
@@ -166,7 +167,7 @@
            HManagerName = $("#" + us + "").html(); //通过样式ID获取html内容(资源ID)
            HGroupName = $("#" + gro + "").html(); //通过样式ID获取html内容(资源ID)
            HManagerID = "HManagerID" + i;
            HGroupID= "HGroupID" + i;
            HGroupID = "HGroupID" + i;
            HManagerID = $("#" + HManagerID + "").html();
            HGroupID = $("#" + HGroupID + "").html();

@@ -211,6 +212,7 @@

                                html1 += '<h1><span>工单号：</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span><span style="margin-left:25px;">日期：</span><span>' + LoadData1[i].计划日期 + '</span></h1>';
                                html1 += '<h1 style="display:none;"><span>产品ID：</span><span id="materid' + (i + 1) + '">' + LoadData1[i].HMaterID + '</span></h1>';
                                html1 += '<h1 style="display:none;"><span>工序ID：</span><span id="procid' + (i + 1) + '">' + LoadData1[i].HProcID + '</span></h1>';
                                html1 += '<h1><span>产品名称：</span><span id="ptn' + (i + 1) + '">[' + LoadData1[i].HMaterNumber + ']-[' + LoadData1[i].HMaterName + ']</span></h1>';
                                html1 += '<h1><span>产品型号：</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
                                html1 += '<h1><span>计划数量：</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">汇报总数：</span><span>' + LoadData1[i].HDateFinishQty + '</span></h1>';
@@ -405,7 +407,7 @@
                $.ajax({
                    url: GetWEBURL() + "/ReportPlatForm/DeleteGetLineBindBillList",
                    type: "GET",
                    data: { "HSourceID": HSourceID ,"user": sessionStorage["HUserName"]},
                    data: { "HSourceID": HSourceID, "user": sessionStorage["HUserName"] },
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    success: function (data) {
                        if (data.count > 0) {
@@ -441,6 +443,7 @@
            HICMOBillNo = $("#wk" + i + "").html();     //生产订单号
            HMaterName = $("#ptn" + i + "").html();     //产品名称
            HMaterID = $("#materid" + i + "").html();     //产品ID
            HProcID = $("#procid" + i + "").html();     //工序ID

            if (workcode != "" && workcode != null) {
                $('.cns').removeClass('check1');  //删除不同父级clss样式相同的所有元素
@@ -705,7 +708,7 @@
                shift: 2,
                area: ['95%', '95%'],
                maxmin: true,
                content: '生产管理/作业指导书/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID,
                content: '生产管理/作业指导书/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID + '&HProcID=' + HProcID,
                end: function () {

                },

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_SOPBillEdit.html

@@ -490,8 +490,8 @@
                    data: { "oMain": sMainSub },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = arr;
                            table.render(option);
                            //option.data = arr;
                            //table.render(option);
                            //layer.close(wait);
                            $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                            $('#ChoseFile').removeClass("layui-btn-disabled").attr("disabled", false);

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldDotCheckPlanBillList.html

@@ -127,12 +127,17 @@
                            </div>

                            <div class="layui-tab layui-tab-card" lay-filter="TabTest">
                                <ul class="layui-tab-title">
                                    <li class="layui-this">点检项信息</li>
                                    <li>点检计划</li>
                                </ul>
                                <div class="layui-tab-content">
                                    <div class="layui-tab-item layui-show">
                                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                    </div>
                                    <div class="layui-tab-item">
                                        <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                        <!--保养计划-->
                                        <table class="layui-hide" id="mainTable_plan" lay-filter="mainTable_plan"></table>
                                    </div>
                                </div>
                            </div>
@@ -188,6 +193,7 @@
                , element = layui.element;

            var option = [];//点检
            var option_plan = [];//计划

            //#region è¿›å…¥é¡µé¢å³åŠ è½½

@@ -423,6 +429,32 @@

                    }
                };

                //点检计划
                columns_plan = [
                    { type: 'checkbox', fixed: 'left', totalRowText: '合计行' }
                    , { templet: '#xuhao', title: '序号', sort: true, event: "qwe" }
                    , { field: 'HPlanDate', title: '计划日期' }
                    , { field: 'HPlanBeginTime', title: '计划开始时间点' }
                    , { field: 'HPlanEndTime', title: '计划结束时间点' }
                    , { field: 'HRelationFlag', title: '关联标记' }
                    , { field: 'DiffDate', title: '相差间隔' }
                ];
                option_plan = {
                    id: 'mainTable_plan'
                    , elem: '#mainTable_plan'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , totalRow: true
                    , limit: 500
                    , limits: [50, 200, 500, 1000, 3000]
                    , cellMinWidth: 120
                    , height: 500
                    , cols: [columns_plan]
                    , done: function (res, curr, count) {

                    }
                };
            }

            // ç‚¹æ£€ä¿¡æ¯ é…ä»¶ä¿¡æ¯
@@ -500,6 +532,10 @@
                set_EditGrid(linterid);  //编辑获取表体
                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
                table.render(option);

                set_EditGrid_Plan(linterid);  //编辑获取表体--点检计划
                option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "未点检", "DiffDate": 0 }];
                table.render(option_plan);
            }
            //编辑加载表头
            function set_EditForm(linterid) {
@@ -516,7 +552,7 @@
                                "HBillNo": data.单据号
                                , "HDate": data.日期
                                , "HInnerBillNo": data.内部单据号
                                , "HBeginDate": data.保养开始日期
                                , "HBeginDate": Pub_Format(data.保养开始日期, "yyyy-MM-dd")
                                , "HEndDate": data.保养结束日期
                                , "HExplanation": data.摘要
                                , "HRemark": data.备注
@@ -524,8 +560,8 @@
                                , "HMouldName": data.产品模具
                                , "HCycleUnit": data.周期单位
                                , "HCheckCycle": data.保养周期
                                , "HBeginDate": data.计划开始日期
                                , "HEndDate": data.计划结束日期
                                , "HBeginDate": Pub_Format(data.计划开始日期, "yyyy-MM-dd")
                                , "HEndDate": Pub_Format(data.计划结束日期, "yyyy-MM-dd")
                                , "HMouldDotCheckRuleName": data.HMouldDotCheckRuleNo
                                , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID

@@ -567,6 +603,41 @@
                    }
                });
            }

            // ç¼–辑获取表体--点检计划
            function set_EditGrid_Plan(linterid) {
                $("#HInterID").val(linterid);//修改时主表ID
                //编辑加载数据
                $.ajax({
                    url: GetWEBURL() + 'Sc_MouldDotCheckPlanBill/GetPlanList',
                    type: "GET",
                    data: { "sqlWhere": "and hmainid=" + linterid },
                    success: function (result) {
                        if (result.count == 1) {
                            var rowdata = [];
                            var data = result.data;
                            for (let i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HPlanDate": Pub_Format(data[i].计划日期, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].计划开始时间点, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].计划结束时间点, "yyyy-MM-dd hh:mm:ss")
                                        , "HRelationFlag": data[i].关联标记, "DiffDate": data[i].相差间隔
                                    }
                                )
                            }

                            option_plan.data = rowdata;
                            table.render(option_plan);

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index0);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            // ç¼–辑获取表头时时间格式矫正方式
            function formatDate(date) {
                var d = new Date(date),

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainPlanBillList.html

@@ -535,6 +535,7 @@
                    , { field: 'HPlanDate', title: '计划日期' }
                    , { field: 'HPlanBeginTime', title: '计划开始时间点' }
                    , { field: 'HPlanEndTime', title: '计划结束时间点' }
                    , { field: 'HSafeEndTime', title: '安全结束时间点' }
                    , { field: 'HRelationFlag', title: '关联标记' }
                    , { field: 'DiffDate', title: '相差间隔' }
                ];
@@ -575,7 +576,7 @@
                table.render(option1);

                set_EditGrid_Plan(linterid);  //编辑获取表体--点检计划
                option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "未点检", "DiffDate": 0 }];
                option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "","HRelationFlag": "未点检", "DiffDate": 0 }];
                table.render(option_plan);
            }

@@ -618,8 +619,8 @@
                                , "HInnerBillNo": data.内部单据号
                                , "HCycleUnit": data.周期单位
                                , "HCheckCycle": data.保养周期
                                , "HBeginDate": data.计划开始日期
                                , "HEndDate": data.计划结束日期
                                , "HBeginDate": formatDate(data.计划开始日期)        //开始日期
                                , "HEndDate": formatDate(data.计划结束日期)         //结束日期
                                , "HExplanation": data.摘要
                                , "HRemark": data.备注
                                , "HMouldMaintainRuleID": data.HMouldMaintainRuleID
@@ -690,7 +691,7 @@
                            for (let i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HPlanDate": Pub_Format(data[i].计划日期, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].计划开始时间点, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].计划结束时间点, "yyyy-MM-dd hh:mm:ss")
                                        "HPlanDate": Pub_Format(data[i].计划日期, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].计划开始时间点, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].计划结束时间点, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].安全结束时间点, "yyyy-MM-dd hh:mm:ss")
                                        , "HRelationFlag": data[i].关联标记, "DiffDate": data[i].相差间隔
                                    }
                                )

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldDotCheckPlanBillList.html

@@ -76,6 +76,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></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" style="display:none;" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
@@ -166,14 +168,11 @@
                    case 'get_Exit':
                        Pub_Close(2);
                        break;

                    //审核按钮
                    case 'btn-Audit':
                        set_CheckBill();
                    //审核
                    case 'set_CheckBill': set_CheckBill(1);
                        break;
                    //反审核按钮
                    case 'btn-DeAudit':
                        set_AbandonCheck();
                    //反审核
                    case 'set_AbandonCheck': set_CheckBill(2);
                        break;
                    //预览按钮
                    case 'btn-Print':
@@ -436,6 +435,40 @@
                    layer.msg('请选择一行数据删除！');
                }
            }

            //审核/反审核
            function set_CheckBill(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;

                if (data.length == 1) {
                    layer.confirm("确认要审核吗?", function (index) {
                        var wait = layer.load();
                        var HInterID = data[0].hmainid;
                        $.ajax({
                            url: GetWEBURL() + '/Sc_MouldDotCheckPlanBill/CheckSc_MouldDotCheckPlanBill',
                            type: "GET",
                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    get_FastQuery();
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                } else {
                    layer.msg("请选择一条数据!");
                }
            }

            //预览
            function get_ViewReport() {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldMaintainPlanBillList.html

@@ -183,15 +183,7 @@
                    //删除
                    case 'btn-Delete':
                        set_DeleteBill();
                        break;
                    //审核按钮
                    case 'btn-Audit':
                        set_CheckBill();
                        break;
                    //反审核按钮
                    case 'btn-DeAudit':
                        set_AbandonCheck();
                        break;
                        break;                  
                    //预览按钮
                    case 'btn-Print':
                        get_PrintReport();

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldMaintainRuleBillEdit.html

@@ -89,9 +89,21 @@
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
                                                </div>
                                            </div>                                           
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">保养冲刺数</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HUseQtys" id="HUseQtys" class="layui-input" value="0">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">保养安全天数</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="0">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">摘要</label>
                                                <div class="layui-input-inline">
@@ -198,7 +210,7 @@
            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js
            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
            $("h1").html('<b>' + HPageTitle + '</b>');
                //#endregion
            //#endregion

            //初始化表单插件
            set_InitFrom();
@@ -523,6 +535,8 @@
                                , "HCheckCycle": data.保养周期
                                , "HMaintainLevID": data.HMaintainLevID
                                , "HMaintainLevName": data.保养级别名称
                                , "HUseQtys": data.保养冲刺数
                                , "HSafeDays": data.保养安全天数
                            });

                        } else {

 WebTM/views/Éú²ú¹ÜÀí/×÷ÒµÖ¸µ¼Êé/Gy_SOPBill_Video.html

@@ -196,7 +196,9 @@
                HMaterID = params[params[1]]; //物料ID
                HSourceNo = params[params[2]]; //工单号
                HSourceEntryID = params[params[3]]; //源单子内码
                get_SopFile(HMaterID, HSourceNo);
                HProcID = params[params[4]]; //工序ID
                //get_SopFile(HMaterID, HSourceNo);// ç‰©æ–™
                get_SopFile2(HMaterID, HProcID); //物料+工序
                return;
            }
            else {
@@ -365,6 +367,72 @@
            }
            //#endregion

            //#region æ ¹æ®ç‰©æ–™+工序获取作业指导书
            function get_SopFile2(HMaterID, HProcID) {
                var wait = layer.load();//遮罩
                $("#file").html("");
                $(".layui-carousel-ind").html("");

                $.ajax({
                    url: GetWEBURL() + '/Gy_SopBill/getListByMaterProc',
                    type: "GET",
                    data: { "HMaterID": HMaterID, "HProcID": HProcID },

                    success: function (data1) {
                        if (data1.count == 1) {
                            if (data1.data[0]) {
                                HInterID = data1.data[0].HInterID
                            }
                            option.data = data1.data;
                            table.render(option);
                            //支持播放的视频格式
                            var videoExtensions = ['.mp4', '.webm', '.Ogg'];

                            for (let i = 0; i < data1.data.length; i++) {
                                var html = '';
                                if (data1.data[i].文件类型 == '.jpeg' || data1.data[i].文件类型 == '.jpg') {
                                    var FileName = data1.data[i].文件名称;
                                    var FilePath = data1.data[i].文件地址;
                                    //html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
                                    html += '<div><img src=../../../' + FilePath + ' alt="" style="width:100%;height:100%"></div>'
                                    $("#file").append(html);
                                }
                                if (data1.data[i].文件类型 == '.pdf') {
                                    var FileName2 = data1.data[i].文件名称;
                                    var FilePath2 = data1.data[i].文件地址;
                                    //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
                                    html += '<div><embed src="../../../' + FilePath2 + '"' + ' type="application/pdf" style="width:100%;height:100%"  internalinstanceid="81" /></div>'
                                    $("#file").append(html);
                                }
                                if (videoExtensions.includes(data1.data[i].文件类型)) {
                                    var FileName3 = data1.data[i].文件名称;
                                    var FilePath3 = data1.data[i].文件地址;
                                    var vvv = '';
                                    vvv += '<source src=../../../' + FilePath3 + ' type="video/webm" />'
                                    $("#video").append(vvv);
                                }

                            }

                            if (data1.data.length == 0) {
                                var html2 = '<h1 style="text-align:center;line-height:570px;color:red;font-weight:bolder;">暂未上传文件</h1>';
                                $("#file").append(html2);
                            }
                            ins.reload({ autoplay: false })

                            layer.close(wait);
                        } else {
                            layer.close(wait);
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region åŠ è½½ç½‘æ ¼
            function get_Display(HSourceID, HID) {
                var wait = layer.load();//遮罩

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

@@ -10,8 +10,8 @@
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../layuiadmin/PageTitle.js"></script>

    <style type="text/css">
        input.layui-input.layui-unselect {

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

@@ -11,8 +11,8 @@
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../layuiadmin/PageTitle.js"></script>

    <style type="text/css">
        input.layui-input.layui-unselect {

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

@@ -10,8 +10,8 @@
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../layuiadmin/PageTitle.js"></script>

    <style type="text/css">
        input.layui-input.layui-unselect {

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

@@ -10,8 +10,8 @@
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../layuiadmin/PageTitle.js"></script>

    <style type="text/css">
        input.layui-input.layui-unselect {

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

@@ -10,8 +10,8 @@
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../layuiadmin/PageTitle.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;

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

@@ -10,8 +10,8 @@
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../layuiadmin/PageTitle.js"></script>

    <style type="text/css">
        input.layui-input.layui-unselect {

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

@@ -589,6 +589,7 @@
                    , { field: 'HPlanDate', title: '计划日期' }
                    , { field: 'HPlanBeginTime', title: '计划开始时间点' }
                    , { field: 'HPlanEndTime', title: '计划结束时间点' }
                    , { field: 'HSafeEndTime', title: '安全结束时间点' }
                    , { field: 'HRelationFlag', title: '关联标记' }
                    , { field: 'DiffDate', title: '相差间隔' }
                ];
@@ -648,7 +649,7 @@
                table.render(option1);

                set_EditGrid_Plan(linterid);  //编辑获取表体--点检计划
                option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "未点检", "DiffDate": 0 }];
                option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "","HRelationFlag": "未点检", "DiffDate": 0 }];
                table.render(option_plan);
            }
            //编辑获取表头
@@ -789,7 +790,7 @@
                            for (let i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HPlanDate": Pub_Format(data[i].计划日期, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].计划开始时间点, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].计划结束时间点, "yyyy-MM-dd hh:mm:ss")
                                        "HPlanDate": Pub_Format(data[i].计划日期, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].计划开始时间点, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].计划结束时间点, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].安全结束时间点, "yyyy-MM-dd hh:mm:ss")
                                        , "HRelationFlag": data[i].关联标记, "DiffDate": data[i].相差间隔
                                    }
                                )
@@ -937,7 +938,7 @@
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }                                   
                                    }
                                    if (checkStatus.data.length === 1) {
                                        //同步更新表格和缓存对应的值
                                        obj.update({

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

@@ -10,8 +10,8 @@
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../layuiadmin/PageTitle.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;

 WebTM/views/É豸¹ÜÀí/É豸¹æ³Ìµ¥/Sb_EquipMaintainRuleEdit.html

@@ -53,6 +53,14 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">
                                                    ä¿å…»å®‰å…¨å¤©æ•°
                                                </label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="1">
                                                </div>
                                            </div>
                                            <div class="layui-inline" style="display:none;">
                                                <label class="layui-form-label">内部单据号</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
@@ -524,6 +532,7 @@
                                , "HCheckCycle": data.保养周期
                                , "HMaintainLevID": data.HMaintainLevID
                                , "HMaintainLevName": data.保养级别名称
                                , "HSafeDays": data.保养安全天数
                            });

                        } else {

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBillList.html

@@ -293,7 +293,7 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , height: 'full-180'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50