班组职员清单删除首行控制优化；计划导入每次导入100行；工艺路线编辑列设置bug优化；工序出站汇报单隐藏单价；计划达成率报表导出功能

yusijie

2024-11-13 1cd5e3fcca7259e85f87737d1df4a7945d5684fb

班组职员清单删除首行控制优化；计划导入每次导入100行；工艺路线编辑列设置bug优化；工序出站汇报单隐藏单价；计划达成率报表导出功能

 WebTM/views/¹¤×ʹÜÀí/°à×éÖ°Ô±Çåµ¥/Gy_GroupEmpBillEdit.html

@@ -339,7 +339,7 @@
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else {
                            //obj.del();

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatFormImport.html

@@ -244,33 +244,41 @@
                    num.push(table.cache["mainTable"][i])
                }
            }
            data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
            var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
            var index = layer.load();
           
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave",
                async: true,
                data: { "sMainSub": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {

            var HDataSub = [];

            //JIT导入计划，每次导入100行数据,可修改i的自增值决定每次循环导入的行数
            for (var i = 0; i < num.length; i += 100) {
                HDataSub = num.slice(i, i + 100)

                data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(HDataSub);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
                var index = layer.load();

                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave",
                    async: false,
                    data: { "sMainSub": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            layer.close(index);
                            layer.msg("提交成功");
                        }
                        else {
                            layer.close(index);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("提交成功");
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                    else {
                        layer.close(index);
                        layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
                });
            }            
        }

        //行内删除

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -2766,8 +2766,10 @@
                                if (i >= dataCol.length) {
                                    continue;
                                }

                                var dataCols = dataCol[i].split('|');
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -2127,6 +2127,7 @@
                                        for (let i = 0; i < option.cols[0].length; i++) {
                                            if (option.cols[0][i].field == '工序工价') {
                                                option.cols[0][i].hide = true; //隐藏工价字段
                                                titleData.push("工序工价");
                                            }
                                        }
                                    }

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Mes_OrderProcFlowAllReport.html

@@ -449,7 +449,9 @@
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }                                
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Mes_OrderProcFlowAllReport_ICMO.html

@@ -104,7 +104,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "Mes_OrderProcFlowAllReport";
            var HModName = "Mes_OrderProcFlowAllReport_ICMO";
            var ins;
            //#endregion


 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_PlanAchievementRateReport.html

@@ -87,6 +87,7 @@
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_export" id="get_export" style="padding:0 5px">导出</button>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">
@@ -217,6 +218,7 @@
        var option = [];
        var HModName = "Sc_PlanAchievementRateReport";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•
        var ins;  //用于导出excel

        //#endregion

@@ -249,6 +251,23 @@
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });

        //导出
        form.on('submit(get_export)', function (data) {
            var data = option.data
            data.forEach((item) => {
                for (let itemobj in item) {
                    if (item[itemobj] == null) {
                        item[itemobj] = "";
                    }
                    if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                        item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',','，');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                    }
                }
            });

            table.exportFile(ins.config.id, option.data, "xls");
        });        

        //日期间隔下拉列表监听
        form.on('select(HInitTimeCycle)', function (data) {
@@ -416,7 +435,7 @@
                                });
                            }
                        }
                        table.render(option);
                        ins = table.render(option);
                       
                        //刷新表格数据
                        DisPlay_HideColumn();