1

llj

2026-02-28 c400bea36ba1906d31fbb9e1736f22681d6725ca

1

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -10,7 +10,7 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置*/
    //var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/
    var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_DepartmentList.html

@@ -1297,7 +1297,8 @@
                if (typeof(openType) != "undefined") {
                    if (openType == 1) {
                        /*addSWhere = " and ç¦ç”¨æ ‡è®° = '' å®¡æ ¸äºº !='' and è½¦é—´æ ‡è®° = 'Y' " ;*/
                        addSWhere = " and ç¦ç”¨æ ‡è®° = ' ' and è½¦é—´æ ‡è®° = 'Y' ";
                        //addSWhere = " and ç¦ç”¨æ ‡è®° = ' ' and è½¦é—´æ ‡è®° = 'Y' ";
                        addSWhere = " ";
                    } else {
                        addSWhere = " and ç¦ç”¨æ ‡è®° = '' and ISNULL(审核人,'') <> '' ";
                    }

 WebTM/views/³É±¾¹ÜÀí/ÆÚ³õÔÚ²úÆ·±í/Gy_WIPBal_Excel.html

@@ -110,22 +110,47 @@

        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

      

        //文件上传
        upload.render({
            elem: '#UpLoad',
            url: GetWEBURL() + '/Kf_WIPBal/Kf_WIPBal_Excel',
            contentType: 'application/json',
            exts: 'xls|xlsx', //允许上传的类型
            before: function (obj) { // ä¸Šä¼ å‰
                layer.load(1, {
                    shade: [0.3, '#000'] // 0.3透明度黑色遮罩
                });
            },
            done: function (data1) {
                layer.closeAll('loading'); // å…³é—­åŠ è½½å±‚
                if (data1.count == 1) {
                    option.data = data1.data;

                    // èŽ·å–当前年月
                    var now = new Date();
                    var year = now.getFullYear();
                    var month = (now.getMonth() + 1).toString().padStart(2, '0');
                    var currentYearMonth = year + '-' + month;

                    // è®¾ç½®å¹´æœˆè¾“入框的值
                    $('#ID-laydate-type-month').val(currentYearMonth);

                    // ä¸ºå¯¼å…¥çš„数据添加年和月字段
                    for (var i = 0; i < option.data.length; i++) {
                        option.data[i]['å¹´'] = year.toString();
                        option.data[i]['月'] = month;
                    }

                    table.render(option);

                } else {
                    layer.alert(data1.code + data1.Message, { icon: 5 });
                }
            },
            error: function (err) {
                debugger
                layer.closeAll('loading'); // å…³é—­åŠ è½½å±‚
                layer.alert('导入出现异常', { icon: 2 });
            }
        });
@@ -137,6 +162,8 @@

        //导入  ä¿å­˜æ•°æ®
        form.on('submit(btnSave)', function (data) {

          
            if (table.cache["mainTable"] != null) {
                set_AddNew(data);
            }

 WebTM/views/³É±¾¹ÜÀí/ÆÚ³õÔÚ²úÆ·±í/Kf_WIPBal.html

@@ -39,7 +39,7 @@
                                            <!-- åŠ¨æ€æ¸²æŸ“车间 -->
                                        </select>
                                    </div>
                                </div>             
                                </div>
                                <!-- ç‰©æ–™ -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料</label>
@@ -51,18 +51,19 @@
                                        </button>
                                    </div>
                                </div>
                                <!-- å¼€å§‹æ—¥æœŸ -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="HBDate" id="HBDate" style="width:150px;">
                                <!-- å¼€å§‹å¹´æœˆ -->
                                <div class="layui-inline" style="margin-left: 20px;">
                                    <label class="layui-form-label">开始年月</label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" id="ID-laydate-start-month" placeholder="选择开始年月" readonly>
                                    </div>
                                </div>
                                <!-- ç»“束日期 -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="HEDate" id="HEDate" style="width:150px;">

                                <!-- ç»“束年月 -->
                                <div class="layui-inline" style="margin-left: 20px;">
                                    <label class="layui-form-label">结束年月</label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" id="ID-laydate-end-month" placeholder="选择结束年月" readonly>
                                    </div>
                                </div>
                                <!-- æŸ¥è¯¢æŒ‰é’® -->
@@ -128,14 +129,40 @@
            // å…¨å±€æŸ¥è¯¢æ¡ä»¶å­—符串
            var sWhere = "";

            // ---------- åˆå§‹åŒ– ----------
            
            function initPage() {
                // æ¸²æŸ“车间下拉框
                loadDeptSelect();
                // è®¾ç½®é»˜è®¤æ—¥æœŸ: å¼€å§‹æ—¥æœŸä¸º7天前，结束日期为今天
                $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
               

                // è®¾ç½®é»˜è®¤æ—¥æœŸ: å¼€å§‹å¹´æœˆä¸º7个月前，结束年月为今天
                var currentDate = new Date();
                var lastMonth = new Date(currentDate);
                lastMonth.setMonth(currentDate.getMonth() - 12);

                // æ–°å¢žï¼šæ¸²æŸ“开始年月选择器
                laydate.render({
                    elem: '#ID-laydate-start-month',
                    type: 'month',
                    format: 'yyyy-MM',
                    value: lastMonth,
                    done: function (value, date) {
                        // å¯ä»¥é€‰æ‹©åœ¨è¿™é‡Œè§¦å‘查询
                        // getFastQuery(2);
                    }
                });

                // æ–°å¢žï¼šæ¸²æŸ“结束年月选择器
                laydate.render({
                    elem: '#ID-laydate-end-month',
                    type: 'month',
                    format: 'yyyy-MM',
                    value: currentDate,
                    done: function (value, date) {
                        // å¯ä»¥é€‰æ‹©åœ¨è¿™é‡Œè§¦å‘查询
                        // getFastQuery(2);
                    }
                });

                getFastQuery(2);
                // é‡æ–°æ¸²æŸ“表单元素（select等）
                form.render('select');
@@ -167,15 +194,51 @@

           

            // æŸ¥è¯¢å¹¶æ¸²æŸ“阶梯报表
            // ä¿®æ”¹åŽçš„getFastQuery函数
            function getFastQuery(type) {
                var HBeginDate = $("#HBDate").val();
                var HEndDate = $("#HEDate").val();
                // ä¿®æ”¹ï¼šä»Žå¹´æœˆé€‰æ‹©å™¨èŽ·å–值，而不是从日期输入框
                var HStartYearMonth = $("#ID-laydate-start-month").val();
                var HEndYearMonth = $("#ID-laydate-end-month").val();

                // æ–°å¢žï¼šéªŒè¯æ˜¯å¦é€‰æ‹©äº†å¼€å§‹å¹´æœˆ
                if (!HStartYearMonth) {
                    layer.msg('请选择开始年月', { icon: 2 });
                    return;
                }

                // æ–°å¢žï¼šéªŒè¯æ˜¯å¦é€‰æ‹©äº†ç»“束年月
                if (!HEndYearMonth) {
                    layer.msg('请选择结束年月', { icon: 2 });
                    return;
                }

                // æ–°å¢žï¼šè§£æžå¼€å§‹å¹´æœˆä¸ºå¹´å’Œæœˆ
                var startParts = HStartYearMonth.split('-');
                var HStartYear = startParts[0];
                var HStartPeriod = startParts[1];

                // æ–°å¢žï¼šè§£æžç»“束年月为年和月
                var endParts = HEndYearMonth.split('-');
                var HEndYear = endParts[0];
                var HEndPeriod = endParts[1];

                // æ–°å¢žï¼šéªŒè¯å¹´æœˆèŒƒå›´æ˜¯å¦æœ‰æ•ˆ
                var startValue = parseInt(HStartYear) * 100 + parseInt(HStartPeriod);
                var endValue = parseInt(HEndYear) * 100 + parseInt(HEndPeriod);

                if (startValue > endValue) {
                    layer.msg('开始年月不能大于结束年月', { icon: 2 });
                    return;
                }

                var HCostObjID = $("#HMaterID").val() || '0';
                var HWorkShopID = $("#HDeptID").val() || '0';

                var spParams = "'" + HBeginDate + "','" + HEndDate + "','" + HWorkShopID + "','" + HCostObjID+ "'";
                sWhere = spParams; // ç”¨äºŽå†…部
                // ä¿®æ”¹ï¼šå­˜å‚¨è¿‡ç¨‹å‚数改为开始年、开始月、结束年、结束月、车间、物料
                var spParams = "'" + HStartYear + "','" + HStartPeriod + "','" +
                    HEndYear + "','" + HEndPeriod + "','" +
                    HWorkShopID + "','" + HCostObjID + "'";
                sWhere = spParams;

                if (type == 2) {
                    get_Display(spParams);
@@ -273,16 +336,33 @@
            }

            // é‡ç½®è¿‡æ»¤æ¡ä»¶
            // ä¿®æ”¹åŽçš„clearQuery函数
            function clearQuery() {
                $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
                var currentDate = new Date();
                var lastMonth = new Date(currentDate);
                lastMonth.setMonth(currentDate.getMonth() - 7);

                // ä¿®æ”¹ï¼šé‡æ–°è®¾ç½®å¼€å§‹å¹´æœˆé€‰æ‹©å™¨çš„值
                laydate.render({
                    elem: '#ID-laydate-start-month',
                    type: 'month',
                    format: 'yyyy-MM',
                    value: lastMonth,
                    show: false  // ä¸æ˜¾ç¤ºé¢æ¿
                });

                // ä¿®æ”¹ï¼šé‡æ–°è®¾ç½®ç»“束年月选择器的值
                laydate.render({
                    elem: '#ID-laydate-end-month',
                    type: 'month',
                    format: 'yyyy-MM',
                    value: currentDate,
                    show: false  // ä¸æ˜¾ç¤ºé¢æ¿
                });

                $("#HDeptID").val(0);
                $("#HEmpID").val(0);
                $("#HEmpName").val("");
                $("#HGroupID").val(0);
                $("#HGroupName").val("");
                $("#HMaterID").val("0");     
                $("#HMaterName").val("");   
                $("#HMaterID").val("0");
                $("#HMaterName").val("");
                form.render('select');
            }


 WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldDotCheckTaskReport.html

@@ -33,6 +33,7 @@
                                <li lay-id="1" class="layui-this">今日待点检</li>
                                <li lay-id="2">今日已点检</li>
                                <li lay-id="3">今天全部任务</li>
                                <li lay-id="4">逾期未点检</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
@@ -46,6 +47,10 @@
                                <div class="layui-tab-item">
                                    <!--今天全部任务-->
                                    <table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--今天全部任务-->
                                    <table class="layui-hide" id="mainTable_outTime" lay-filter="mainTable_outTime"></table>
                                </div>
                            </div>
                        </div>
@@ -78,6 +83,7 @@
            var option_waitCheck = "";  //今日待点检
            var option_finishCheck = ""; //今日已点检
            var option_task = ""; //今天全部任务
            var option_outTime = ""; // é€¾æœŸæœªç‚¹æ£€ä»»åŠ¡
            var ins;
            var TableTab = "mainTable_waitCheck";  //初始化页面时默认为 â€œä»Šæ—¥å¾…点检” é¡µç­¾
            var cur_title = "今日待点检"; //当前选中页签
@@ -116,6 +122,8 @@
                    TableTab = "mainTable_finishCheck";
                } else if (cur_title == "今天全部任务") {
                    TableTab = "mainTable_task";
                } else if (cur_title == "逾期未点检") {
                    TableTab = "mainTable_outTime";
                }
            })
            //#endregion
@@ -170,6 +178,18 @@
            function set_InitGrid_task() {
                option_task = {
                    elem: '#mainTable_task'
                    , page: false
                    , height: 500
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                };
            }

            // åˆå§‹åŒ–逾期未点检列表
            function set_InitGrid_outTime() {
                option_outTime = {
                    elem: '#mainTable_outTime'
                    , page: false
                    , height: 500
                    , cellMinWidth: 90
@@ -321,6 +341,42 @@
                            }
                            table.render(option_task);

                            
                            var HBillNo_outTime = "";
                            var HRowBackgroundColor_outTime = "#E0F5F7";
                            option_outTime = {
                                elem: '#mainTable_outTime'
                                //, toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data.h_p_Sc_MouldDotCheckTaskReport3
                                , height: 'full-120'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                                , done: function (res, curr, count) {
                                    var that = this.elem.next();
                                    res.data.forEach(function (item, index) {
                                        if (HBillNo_outTime == "") {
                                            HBillNo_outTime = item.器具点检计划单号
                                            var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
                                        } else if (HBillNo_outTime == item.器具点检计划单号) {
                                            var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
                                        } else if (HBillNo_outTime != item.器具点检计划单号 && HBillNo_outTime != "") {
                                            if (HRowBackgroundColor_outTime == "#E0F5F7") {
                                                HRowBackgroundColor_outTime = "#E8E5FA"
                                            } else {
                                                HRowBackgroundColor_outTime = "#E0F5F7"
                                            }
                                            HBillNo_outTime = item.器具点检计划单号
                                            var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
                                        }

                                    })
                                }
                            }
                            table.render(option_outTime);

                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "器具点检任务";

 WebTM/views/É豸¹ÜÀí/É豸±¨±í/Sb_EquipDotCheckTaskReport.html

@@ -33,6 +33,7 @@
                                <li lay-id="1" class="layui-this">今日待点检</li>
                                <li lay-id="2">今日已点检</li>
                                <li lay-id="3">今天全部任务</li>
                                <li lay-id="4">逾期未点检</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
@@ -46,6 +47,10 @@
                                <div class="layui-tab-item">
                                    <!--今天全部任务-->
                                    <table class="layui-hide" id="mainTable_task" lay-filter="mainTable_task"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--逾期未点检-->
                                    <table class="layui-hide" id="mainTable_outTime" lay-filter="mainTable_outTime"></table>
                                </div>
                            </div>
                        </div>
@@ -78,6 +83,7 @@
            var option_waitCheck = "";  //今日待点检
            var option_finishCheck = ""; //今日已点检
            var option_task = ""; //今天全部任务
            var option_outTime = ""; //逾期未点检任务
            var ins;
            var TableTab = "mainTable_waitCheck";  //初始化页面时默认为 â€œä»Šæ—¥å¾…点检” é¡µç­¾
            var cur_title = "今日待点检"; //当前选中页签
@@ -116,6 +122,8 @@
                    TableTab = "mainTable_finishCheck";
                } else if (cur_title == "今天全部任务") {
                    TableTab = "mainTable_task";
                } else if (cur_title == "逾期未点检") {
                    TableTab = "mainTable_outTime";
                }
            })
            //#endregion
@@ -170,6 +178,18 @@
            function set_InitGrid_task() {
                option_task = {
                    elem: '#mainTable_task'
                    , page: false
                    , height: 500
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                };
            }

            // åˆå§‹åŒ–逾期任务列表
            function set_InitGrid_outTime() {
                option_outTime = {
                    elem: '#mainTable_outTime'
                    , page: false
                    , height: 500
                    , cellMinWidth: 90
@@ -321,6 +341,41 @@
                            }
                            table.render(option_task);

                            var HBillNo_outTime = "";
                            var HRowBackgroundColor_outTime = "#E0F5F7";
                            option_outTime = {
                                elem: '#mainTable_outTime'
                                //, toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data.h_p_Sb_EquipDotCheckTaskReport3
                                , height: 'full-120'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                                , done: function (res, curr, count) {
                                    var that = this.elem.next();
                                    res.data.forEach(function (item, index) {
                                        if (HBillNo_outTime == "") {
                                            HBillNo_outTime = item.设备点检计划单号
                                            var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
                                        } else if (HBillNo_outTime == item.设备点检计划单号) {
                                            var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
                                        } else if (HBillNo_outTime != item.设备点检计划单号 && HBillNo_outTime != "") {
                                            if (HRowBackgroundColor_outTime == "#E0F5F7") {
                                                HRowBackgroundColor_outTime = "#E8E5FA"
                                            } else {
                                                HRowBackgroundColor_outTime = "#E0F5F7"
                                            }
                                            HBillNo_outTime = item.设备点检计划单号
                                            var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']").css("background-color", HRowBackgroundColor_outTime)
                                        }

                                    })
                                }
                            }
                            table.render(option_outTime);

                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "设备点检任务";