1

沈泽

2021-09-06 966b4c5902f5848ad4372f6337e49bf748286a0e

1

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -1,11 +1,11 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_EmployeeList.html

@@ -49,9 +49,6 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-circle"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_WorkCenter_Add_Edit.html

@@ -294,7 +294,7 @@
                var sMainStr = JSON.stringify(data.field);
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_WorkCenter/EditBill", //方法所在页面和方法名
                    url: GetWEBURL() + "Gy_WorkCenter/ModifyByID", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr },
                    dataType: "json",

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group_Add_Edit.html

@@ -289,7 +289,7 @@
                var sMainStr = JSON.stringify(data.field);
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_Group/EditBill", //方法所在页面和方法名
                    url: GetWEBURL() + "Gy_Group/ModifyByID", //方法所在页面和方法名
                    //url:"http://localhost:30552/Gy_Group/EditBill", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr },

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Process.html

@@ -412,7 +412,7 @@
                var sMainStr = JSON.stringify(data.field);
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_Process/EditBill", //方法所在页面和方法名
                    url: GetWEBURL() + "Gy_Process/ModifyByID", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr },
                    dataType: "json",

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -328,26 +328,33 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hmainid = data[0].hmainid;
                    var ajaxLoad = layer.load();
                    //逻辑删除方法
                    $.ajax({
                        url: GetWEBURL() + '/Sc_ICMOBill/DeltetSc_ICMOReportBill',
                        type: "GET",
                        data: { "HInterID": hmainid },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
                                get_Display(sWhere);
                                layer.close(ajaxLoad);
                            } else {
                                layer.close(ajaxLoad);
                                layer.alert(result.Message, { icon: 5 });
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + '/Sc_ICMOBill/DeltetSc_ICMOReportBill',
                            type: "GET",
                            data: { "HInterID": hmainid },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(wait);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.close(ajaxLoad);
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                        });
                    })
                }
                else {
                    layer.msg('请选择一行数据删除！');

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

@@ -680,12 +680,6 @@
                // }
            });

            form.on('submit(Cancel)', function () {
                //sessionStorage["SourceFlag"] = false;
                parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
            })

            form.on('submit(Saver)', function (data) {//保存
                //debugger;
                var sMainStr = JSON.stringify(data.field);

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillList.html

@@ -8,7 +8,12 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>

@@ -54,10 +59,12 @@
                            </div>
                                 <table class="" id="mainTable" lay-filter="mainTable"></table>
                                 <script type="text/html" id="toolbarDemo">
                                 <div class="layui-btn-container">
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>
                        </div>
                                     <div class="layui-btn-container">
                                         <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                         <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>
                                         <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                         <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                     </div>
                    </script>
                    </form>
                </div>
@@ -66,10 +73,10 @@
    </div>

    <!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <!--<script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
    <script>
        var _cur_page = 1;
        var sql = " ";
@@ -138,6 +145,8 @@
            //layui.code();
            RoadHBillNo(sql);
            layer.load(3)
            $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
            $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
            //方法级渲染
            table.render({
                elem: '#mainTable'
@@ -187,10 +196,34 @@
            }
            });


            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            //#endregion

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HBillNo").val("");
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
                sqlWhere = "";
            }
            //#endregion
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
            
                    case 'btn-getCheckData':
                        var data = checkStatus.data;
                        layer.alert(JSON.stringify(data));
@@ -225,76 +258,125 @@
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                            var InterID = data[0].hmainid.toString();
                            //逻辑删除方法
                            $.ajax({
                                url: GetWEBURL() + 'DeltetQC_FirstPieceCheck',
                                type: "GET",
                                data: { "HInterID": InterID },
                                success: function (result) {
                                    console.log('gouba' + result);
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                        });
                            layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                                var index = layer.load();
                                //逻辑删除方法
                                $.ajax({
                                    url: GetWEBURL() + 'DeltetQC_FirstPieceCheck',
                                    type: "GET",
                                    data: { "HInterID": InterID },
                                    success: function (result) {
                                        console.log('gouba' + result);
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { icon: 1 }, function () {
                                                // å¾—到frame索引
                                                var index = layer.getFrameIndex(window.name);
                                                //关闭当前frame
                                                layer.close(index);
                                                //修改为功后刷新界面
                                                window.location.reload();
                                            });

                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                        } else {
                                            layer.alert(result.code + result.Message, { icon: 5 });
                                            layer.close(index);
                                        }
                                    }, error: function () {
                                        layer.alert("接口请求失败!", { icon: 5 });
                                        layer.close(index);
                                    }
                                }, error: function () {
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                            });
                                });
                            })
                        }
                        else {
                            layer.msg('请选择一行数据删除！');
                        }
                        break;
                        break; 
                    case 'get_Refresh':
                        set_ClearQuery();
                        RoadHBillNo(sqlWhere);
                        break; 
                    case 'get_Exit':
                        Pub_Close(2);
                        break; 
                };
            });



            ///加载显示数据
            //#region æŸ¥è¯¢
            function RoadHBillNo(sqlWhere) {
                where = sqlWhere;
                var ajaxLoad = layer.load();
                $.ajax({
                    type: "get",
                    url: GetWEBURL() +"/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
                    url: GetWEBURL() + "/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
                    async: true,
                    data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
                    success: function (result) {
                        if (result.count == 1) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , page: {
                                curr: _cur_page //必须从第 1 é¡µå¼€å§‹
                            }
                            , loading: false
                            , done: function (index, res) {
                            ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                            table.reload('mainTable', {
                                data: ajaxReturnData
                                , height: 'full-10'
                                , page: {
                                    curr: _cur_page // å¿…须从第 1 é¡µå¼€å§‹
                                }
                                , loading: false
                                , done: function (index, res) {

                            }
                        });
                        layer.close(index0);
                    } else {
                            layer.close(index0);
                                }
                            });
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(result.code + result.Message, { icon: 5 });
                    }
                        }

                    },
                    error: function (result) {
                        layer.close(index0);
                    layer.alert("接口请求失败!", { icon: 5 });
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            };
            form.on('submit(f_Query)', function (data) {//查询
            }
            //#endregion

            ///加载显示数据
            //function RoadHBillNo(sqlWhere) {
            //    where = sqlWhere;
            //    var ajaxLoad = layer.load();
            //    $.ajax({
            //        type: "get",
            //        url: GetWEBURL() +"/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
            //        async: true,
            //        data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
            //        success: function (result) {
            //            if (result.count == 1) {
            //            ajaxReturage /nData = JSON.parse(JSON.stringify(result)).data;
            //            table.reload('mainTable', {
            //                data: ajaxReturnData
            //                , height: 'full-10'
            //                , page: {
            //                    curr: _cur_p/必须从第 1 é¡µå¼€å§‹
            //                }
            //                , loading: false
            //                , done: function (index, res) {

            //                }
            //            });
            //                layer.close(ajaxLoad);
            //        } else {
            //                layer.close(ajaxLoad);
            //                layer.alert(result.code + result.Message, { icon: 5 });
            //        }

            //        },
            //        error: function (result) {
            //            layer.close(ajaxLoad);
            //        layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    });
            //};
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var sqlWhere = " and 1=1 ";
                //if ($("#HStatus").val() != "")
                //    sqlWhere += " and çŠ¶æ€ like ^^%" + $("#HStatus").val() + "%^^";
@@ -306,34 +388,19 @@
                var HDate2 = $("#HDate2").val();//结束日期

                if (HBillNo)
                    sqlWhere += " and å•æ®å· like '%" + HBillNo+ "%'";
                    sqlWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                if (HNumber)
                    sqlWhere += " and ç‰©æ–™ä»£ç  like '%" + HNumber + "%'";
                if (HName)
                    sqlWhere += " and ç‰©æ–™åç§° like '%" + HName + "%'";
                if (HModel)
                    sqlWhere += " and è§„格型号 like '%" + HModel + "%'";
                //if ($("#HClStatus").val() != "")
                //    sqlWhere += " and å…³é—­çŠ¶æ€ like ^^%" + $("#HClStatus").val() + "%^^";
                //if ($("#HPURCHASEORGID").val() != "")
                //    sqlWhere += " and é‡‡è´­ç»„织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
                if (HDate1) {
                    sqlWhere += " and æ—¥æœŸ >= '" + HDate1 + "'";
                }
                if (HDate2) {
                    sqlWhere += " and æ—¥æœŸ <= '" + HDate2 + "'";
                }
                //if ($("#HISGenerate").val() != "") {
                //    if ($("#HISGenerate").val() == "是")
                //    {
                //        sqlWhere += " and æœªå…³è”数量 <= 0";
                //    }
                //    else if ($("#HISGenerate").val() == "否") {
                //        sqlWhere += " and æœªå…³è”数量 > 0";
                //    }
                //}


                var Time = $("#Time").val();
                var dd = new Date();
                var dt;
@@ -367,7 +434,85 @@
                //从第一页开始
                _cur_page = 1;
                RoadHBillNo(sqlWhere);
            });
                sqlWhere = "";
            }
            //#endregion

         
            //form.on('submit(f_Query)', function (data) {//查询
            //    var sqlWhere = " and 1=1 ";
            //    //if ($("#HStatus").val() != "")
            //    //    sqlWhere += " and çŠ¶æ€ like ^^%" + $("#HStatus").val() + "%^^";
            //    var HBillNo = $("#HBillNo").val();//单据号
            //    var HNumber = $("#HNumber").val();//物料代码
            //    var HName = $("#HName").val();//物料名称
            //    var HModel = $("#HModel").val();//规格型号
            //    var HDate1 = $("#HDate1").val();//开始日期
            //    var HDate2 = $("#HDate2").val();//结束日期

            //    if (HBillNo)
            //        sqlWhere += " and å•æ®å· like '%" + HBillNo+ "%'";
            //    if (HNumber)
            //        sqlWhere += " and ç‰©æ–™ä»£ç  like '%" + HNumber + "%'";
            //    if (HName)
            //        sqlWhere += " and ç‰©æ–™åç§° like '%" + HName + "%'";
            //    if (HModel)
            //        sqlWhere += " and è§„格型号 like '%" + HModel + "%'";
            //    //if ($("#HClStatus").val() != "")
            //    //    sqlWhere += " and å…³é—­çŠ¶æ€ like ^^%" + $("#HClStatus").val() + "%^^";
            //    //if ($("#HPURCHASEORGID").val() != "")
            //    //    sqlWhere += " and é‡‡è´­ç»„织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
            //    if (HDate1) {
            //        sqlWhere += " and æ—¥æœŸ >= '" + HDate1 + "'";
            //    }
            //    if (HDate2) {
            //        sqlWhere += " and æ—¥æœŸ <= '" + HDate2 + "'";
            //    }
            //    //if ($("#HISGenerate").val() != "") {
            //    //    if ($("#HISGenerate").val() == "是")
            //    //    {
            //    //        sqlWhere += " and æœªå…³è”数量 <= 0";
            //    //    }
            //    //    else if ($("#HISGenerate").val() == "否") {
            //    //        sqlWhere += " and æœªå…³è”数量 > 0";
            //    //    }
            //    //}


            //    var Time = $("#Time").val();
            //    var dd = new Date();
            //    var dt;
            //    switch (Time) {
            //        case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
            //        case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
            //        case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
            //        case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
            //        case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
            //        case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
            //        case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
            //        default: dd = new Date(dd.setDate(dd.getDate()));
            //    }
            //    dt = dd.getFullYear().toString();
            //    if (dd.getMonth() + 1 < 10) {
            //        dt = dt + "-0" + (dd.getMonth() + 1).toString();
            //    }
            //    else {
            //        dt = dt + "-0" + (dd.getMonth() + 1).toString();
            //    }
            //    if (dd.getDate() < 10) {
            //        dt = dt + "-0" + dd.getDate().toString();
            //    }
            //    else {
            //        dt = dt + "-" + dd.getDate().toString();
            //    }
            //    //if (Time != 8) {
            //    //    sqlWhere += " and äº¤è´§æ—¥æœŸ <= ^^" + dt + "^^";
            //    //}
            //    sql = sqlWhere;
            //    //从第一页开始
            //    _cur_page = 1;
            //    RoadHBillNo(sqlWhere);
            //});
            var $ = layui.$, active = {
                f_Query: function () { //查询

@@ -393,6 +538,15 @@
                //    });
                //}
            };
            //退出按钮
            form.on('submit(get_Exit)', function () {
                if (OperationType == 1) {
                    Pub_Close(2);
                }
                else if (OperationType == 2) {
                    Pub_Close(1);
                }
            })
            $('.test-table-reload-btn .layui-btn').on('click', function () {
                var type = $(this).data('type');
                active[type] ? active[type].call(this) : '';

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

@@ -73,9 +73,9 @@
                                        </div>
                                    </div>
                                </div>
                                </div>
                            </div>
                        </div>
                       
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">