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

chenhaozhe

2025-07-17 f2e1cd96163ce0aeff624eb1ebd325d12f3cade1

 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html

@@ -2050,7 +2050,7 @@
                        success: function (data1) {
                            if (data1.count == 1) {
                                ds = data1.data
                                option.data[i]["HMouldID"] = data1.data[0].HMouldID;
                                option.data[i]["HMouldID"] = data1.data[0].HMouldID == undefined ? 0 : data1.data[0].HMouldID;
                                option.data[i]["浣跨敤宸ヨ"] = data1.data[0].浣跨敤宸ヨ;
                            } else {
                                layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -2072,7 +2072,7 @@
                        success: function (data1) {
                            if (data1.count == 1) {
                                ds = data1.data
                                option.data[i]["HMouldID"] = data1.data[0].HMouldID;
                                option.data[i]["HMouldID"] = data1.data[0].HMouldID == undefined ? 0 : data1.data[0].HMouldID;
                                option.data[i]["浣跨敤宸ヨ"] = data1.data[0].浣跨敤宸ヨ;
                            } else {
                                layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -2526,17 +2526,18 @@

                        //鍓旈櫎涓婃柟鎺掍骇鍒楄〃涓凡缁忓姞鍏ョ殑鐢熶骇璁㈠崟
                        var tables = [];
                        for (var i = 0; i < option2.data.length; i++) {
                            var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
                            if ($.inArray(temp, compareList) == -1) {
                                tables.push(option2.data[i]);
                        if (option2.data != undefined) {
                            for (var i = 0; i < option2.data.length; i++) {
                                var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
                                if ($.inArray(temp, compareList) == -1) {
                                    tables.push(option2.data[i]);
                                }
                            }
                        }
                        option2.data = tables;
                            option2.data = tables;

                        //閲嶆柊娓叉煋瀛愯〃2
                        table.render(option2);

                            //閲嶆柊娓叉煋瀛愯〃2
                            table.render(option2);
                        }                       
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);