智云MES-UI前端
parent: 31027ccc | 补丁 | 提交 | show whitespace
zrg
2024-11-14 80abe55214667f5e39ef570d076cd31274801f8a 
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
3个文件已修改
12 ■■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/layuiadmin/Scripts/webConfig.js


@@ -10,7 +10,7 @@


    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置


    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置


    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器


   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置*/


    var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置


    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)


    //var WEBURL = "http://localhost/API/";             //潘浙游本地配置


    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦




 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html


@@ -599,6 +599,15 @@


                $('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//生成按钮禁用


                for (var i = 0; i < table.cache['mainTable'].length; i++) {


                    table.cache['mainTable'][i]["HDate"] = $("#HDate").val();


                    if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {


                        table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "”").replaceAll(";", "；")


                    }


                    if (table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1) {


                        table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replaceAll("\"", "”").replaceAll(";", "；")


                    }


                    if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 || table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {


                        table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "”").replaceAll(";", "；")


                    }


                }


                var sSubStr = JSON.stringify(table.cache['mainTable']);


                HMaterInfo = table.cache['mainTable'];




 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html


@@ -697,6 +697,7 @@


                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {


                                //layer.close(layer.index);


                                //window.parent.location.reload();


                                $('#VerIfySaver').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮禁用


                            });


                        }


                        else {