1
zrg
2026-04-10 0c6ec5d89fa7ddd62878b260761763ea53c76922
1
3个文件已修改
36 ■■■■ 已修改文件
WebTM/views/工资管理/工资报表/Pay_WorkTimesPayMentSumReport.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/器具报表/Sc_MouldDailyUseReport.html 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/器具报表/Sc_MouldMonthUseReport.html 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/¹¤×ʹÜÀí/¹¤×ʱ¨±í/Pay_WorkTimesPayMentSumReport.html
@@ -336,6 +336,8 @@
                        , { field: 'HEmpID', title: 'HEmpID', width: 170, hide: true }
                        , { field: '员工', title: '员工', width: 160 }
                        , { field: '计时工资', title: '计时工资', width: 160 }
                        , { field: '补贴', title: '补贴', width: 160 }
                        , { field: '扣款', title: '扣款', width: 160 }
                    ]]
                };
            }
WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldDailyUseReport.html
@@ -772,11 +772,11 @@
                    if (hasData) {
                        renderAllCharts(statsData);
                    } else {
                        renderAllCharts(getMockData());
                        renderAllCharts([]);
                    }
                    layer.close(wait);
                }).catch(function() {
                    renderAllCharts(getMockData());
                    renderAllCharts([]);
                    layer.close(wait);
                });
            }
@@ -792,21 +792,7 @@
            //#region ========== æ¨¡æ‹Ÿæ•°æ® ==========
            function getMockData() {
                var mockData = {};
                for (var i = 0; i < chartConfigKeys.length; i++) {
                    var key = chartConfigKeys[i];
                    var config = ChartConfig[key];
                    mockData[key] = [];
                    for (var j = 0; j < config.statusMap.length; j++) {
                        mockData[key].push({
                            name: config.statusMap[j].name,
                            value: Math.floor(Math.random() * 20) + 5
                        });
                    }
                }
                return mockData;
            }
            //#endregion
WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldMonthUseReport.html
@@ -260,14 +260,11 @@
                }
                var HCostObjID = $("#HMouldID").val() || '0';
                var HWorkShopID = $("#HDeptID").val() || '0';
                var HWorkShopID = $("#HDeptID").val() || '0';
                var HProcID = $("#HProcID").val() || '0';
                // ä¿®æ”¹ï¼šå­˜å‚¨è¿‡ç¨‹å‚数改为开始年、开始月、结束年、结束月、车间、物料
                var spParams = "'" + HStartYear + "','" + HStartPeriod + "','" +
                    HEndYear + "','" + HEndPeriod + "','" +
                    HWorkShopID + "','" + HCostObjID + "'" + ",'" + HProcID+"'";
                    HEndYear + "','" + HEndPeriod + "'," +
                    HCostObjID
                sWhere = spParams;
                if (type == 2) {
@@ -275,16 +272,15 @@
                }
            }
            // åŠ è½½é˜¶æ¢¯è®¡ä»¶æ•°æ®
            function get_Display(params) {
                var loadIndex = layer.load(1, { shade: false });
                var sql = "exec h_p_CB_ActualItemMoneyCost" + params;
                var sql = "exec h_p_Sc_MouldMonthUseReport" + params;
                $.ajax({
                    url: GetWEBURL() + '/CB_ActualItemMoneyCostController/CB_ActualItemMoneyCostList',
                    url: GetWEBURL() + '/CommonModel/searchMethod',
                    type: "GET",
                    data: { "sWhere": sql },
                    data: { "sql": sql, "user": sessionStorage["HUserName"],"ModRightNameCheck":""},
                    success: function (data1) {
                        layer.close(loadIndex);
                        if (data1.count == 1) {