合并分支

chenhaozhe

2025-05-21 e50265de5ae4e5e4c8b8852e777216adab7c4ce4

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportPODemandPlanBillList.html

@@ -254,7 +254,8 @@
                }
            }
          
            columns.push({ field: '提料计划合计', title: '提料计划合计', filter: true });
            columns.push({
                field: '提料计划合计', title: '提料计划合计', filter: true });

            option = {
                elem: '#mainTable'
@@ -306,7 +307,7 @@
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (result) {
                    if (result.count == 1) {
                        option.data = result.data;
                        option.data = addTotalField(result.data);
                        //列设置
                        DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
                        ins = table.render(option);
@@ -458,6 +459,32 @@

            form.render('select');
        }
        function addTotalField(arr) {
            return arr.map(obj => {
                // åˆ›å»ºæ–°å¯¹è±¡ï¼Œé¿å…ä¿®æ”¹åŽŸå¯¹è±¡
                const newObj = { ...obj };

                // è®¡ç®—符合日期格式的字段值的合计
                let total = 0;
                for (const [key, value] of Object.entries(obj)) {
                    if (isValidDate(key)) {
                        // ç¡®ä¿å€¼æ˜¯æ•°å­—类型
                        const numValue = Number(value);
                        if (!isNaN(numValue)) {
                            total += numValue;
                        }
                    }
                }
                // å¤„理浮点数精度问题
                const roundedTotal = parseFloat(total.toFixed(2));

                // æ·»åŠ ææ–™è®¡åˆ’合计字段
                newObj['提料计划合计'] = roundedTotal;

                return newObj;
            });
        }

        //#endregion
        //以上是layui模块
    });