智云MES-UI前端
parent: ada17c64 | 补丁 | 提交 | ignore whitespace
zzr99
2021-12-01 4096cf13aeb9e5ec70a431f43ea3d1ed7d8e9a8d 
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
3个文件已修改
148 ■■■■■ 已修改文件
WebTM/views/PublicPage/SupplierInformation.html 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html 145 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/views/PublicPage/SupplierInformation.html


@@ -194,6 +194,7 @@


                    }


                });


                sWhere1 = "";//调用接口后清空sWhere缓存


                sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表


            });




            //以上是layui模块




 WebTM/views/index.html


@@ -541,7 +541,7 @@


                                    <dl class="layui-nav-child">


                                        <dd><a lay-href="模治具管理/器具报表/ReportMouldStock.html">器具库存查询</a></dd>


                                        <dd><a lay-href="模治具管理/器具报表/ReportMaterialReceipt.html">物料收发明细及汇总</a></dd>


                                        <dd><a lay-href="模治具管理/器具报表/ReportMouldStock.html">库存台账</a></dd>


                                        <dd><a lay-href="模治具管理/器具报表/ReportInventoryAccount.html">库存台账</a></dd>


                                        <dd><a lay-href="">器具履历表n</a></dd>


                                    </dl>


                                </dd>




 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sb_Add_MouldRepairWorkBillList.html


@@ -354,7 +354,7 @@


                var checkStatus = table.checkStatus('mainTable')


                    , data = checkStatus.data;;


                var AddRow = table.cache['mainTable'];


                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };


                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  "};


                switch (obj.event) {


                    //增加一行


                    case 'btn-AddLine': set_AddLine(NewRow);


@@ -650,14 +650,10 @@


                    content: ['../../PublicPage/PurchOrder.html', 'yes'],


                    btn: ['确定', '取消']


                    , btn1: function (index, layero) {


                        var checkStatus = "";


                        $.ajax({


                            success:


                                checkStatus = data;


                        })


                     


                        //option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " }];


                        //table.render(option);


                        var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };


                        //var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };


                        //按钮【按钮一】的回调


                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面


                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"


@@ -672,69 +668,70 @@


                        $("#HMainSourceBillNo").val(checkStatus.data[0].单据号);


                        $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);


                        $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);


                        var list = [];


                        for (var i = 0; i < checkStatus.data.length; i++) {


                            list.push(checkStatus.data[i].单据号)


                        }


                        if (isAllEqual(list))  //相同单号


                        {


                            var rowdate = layui.table.cache["mainTable"];


                            if (rowdate.length == 0)  //表体数据为空时


                            {


                                buttonArr = [];//清空数组


                                for (var i = 0; i < checkStatus.data.length; i++) {


                                    var checkrow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid, "HSourceBillNo": checkStatus.data[i].单据号, "HSourceBillType": checkStatus.data[i].单据类型 };


                                    buttonArr.push(checkrow);  //将之前的数据存储


                                }


                                //buttonArr.push(NewRow);  //在尾部加一行


                                table.reload("mainTable", {


                                    data: buttonArr    //将数据重新载入表格


                                })


                            }


                            if (rowdate.length > 0 && rowdate.length <= checkStatus.data.length) //表体数据不为空,且表体数据行数小于等于选中带回数据行数


                            {


                                buttonArr = [];//清空数组


                                for (var i = 0; i < rowdate.length; i++) {


                                    var checkrow = {


                                        "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,


                                        "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,


                                        "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,


                                        "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid,


                                        "HSourceBillNo": checkStatus.data[i].单据号, "HSourceBillType": checkStatus.data[i].单据类型


                                    };


                                    buttonArr.push(checkrow);  //将之前的数据存储


                                }


                                //buttonArr.push(NewRow);  //在尾部加一行


                                table.reload("mainTable", {


                                    data: buttonArr    //将数据重新载入表格


                                })


                            }


                            if (rowdate.length > 0 && rowdate.length > checkStatus.data.length) //表体数据不为空,且表体数据行数大于选中带回数据行数


                            {


                                console.log(checkStatus.data.length);


                                buttonArr = [];//清空数组


                                for (var i = 0; i < rowdate.length; i++) {


                                    var checkrow = {


                                        "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,


                                        "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,


                                        "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,


                                        "HSourceInterID": checkStatus.data[0].hmainid, "HSourceEntryID": checkStatus.data[0].hsubid,


                                        "HSourceBillNo": checkStatus.data[0].单据号, "HSourceBillType": checkStatus.data[0].单据类型


                                    };


                                    buttonArr.push(checkrow);  //将之前的数据存储


                                }


                                //buttonArr.push(NewRow);  //在尾部加一行


                                table.reload("mainTable", {


                                    data: buttonArr    //将数据重新载入表格


                                })


                            }


                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的


                        //var list = [];


                        //for (var i = 0; i < checkStatus.data.length; i++) {


                        //    list.push(checkStatus.data[i].单据号)


                        //}


                        //if (isAllEqual(list))  //相同单号


                        //{


                        //    var rowdate = layui.table.cache["mainTable"];


                        //    if (rowdate.length == 0)  //表体数据为空时


                        //    {


                        //        buttonArr = [];//清空数组


                        //        for (var i = 0; i < checkStatus.data.length; i++) {


                        //            var checkrow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid, "HSourceBillNo": checkStatus.data[i].单据号, "HSourceBillType": checkStatus.data[i].单据类型 };


                        //            buttonArr.push(checkrow);  //将之前的数据存储


                        //        }


                        //        //buttonArr.push(NewRow);  //在尾部加一行


                        //        table.reload("mainTable", {


                        //            data: buttonArr    //将数据重新载入表格


                        //        })


                        //    }


                        //    if (rowdate.length > 0 && rowdate.length <= checkStatus.data.length) //表体数据不为空,且表体数据行数小于等于选中带回数据行数


                        //    {


                        //        buttonArr = [];//清空数组


                        //        for (var i = 0; i < rowdate.length; i++) {


                        //            var checkrow = {


                        //                "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,


                        //                "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,


                        //                "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,


                        //                "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid,


                        //                "HSourceBillNo": checkStatus.data[i].单据号, "HSourceBillType": checkStatus.data[i].单据类型


                        //            };


                        //            buttonArr.push(checkrow);  //将之前的数据存储


                        //        }


                        //        //buttonArr.push(NewRow);  //在尾部加一行


                        //        table.reload("mainTable", {


                        //            data: buttonArr    //将数据重新载入表格


                        //        })


                        //    }


                        //    if (rowdate.length > 0 && rowdate.length > checkStatus.data.length) //表体数据不为空,且表体数据行数大于选中带回数据行数


                        //    {


                        //        console.log(checkStatus.data.length);


                        //        buttonArr = [];//清空数组


                        //        for (var i = 0; i < rowdate.length; i++) {


                        //            var checkrow = {


                        //                "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,


                        //                "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,


                        //                "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,


                        //                "HSourceInterID": checkStatus.data[0].hmainid, "HSourceEntryID": checkStatus.data[0].hsubid,


                        //                "HSourceBillNo": checkStatus.data[0].单据号, "HSourceBillType": checkStatus.data[0].单据类型


                        //            };


                        //            buttonArr.push(checkrow);  //将之前的数据存储


                        //        }


                        //        //buttonArr.push(NewRow);  //在尾部加一行


                        //        table.reload("mainTable", {


                        //            data: buttonArr    //将数据重新载入表格


                        //        })


                        //    }




                            //console.log(rowdate.length);


                            layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的


                        }


                        else {


                            layer.msg("请选择相同单号!", { time: 1 * 2000, icon: 5 });


                        }


                        //    //console.log(rowdate.length);


                        //    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的


                        //}


                        //else {


                        //    layer.msg("请选择相同单号!", { time: 1 * 2000, icon: 5 });


                        //}




                    }


                    , btn2: function (index, layero) {


@@ -838,10 +835,10 @@


                    , { field: 'HManagerName', title: '负责人', edit: 'text' }


                    , { field: 'HMoney', title: '维修费用', event: "", edit: 'text' }


                    , { field: 'HRemark', title: '备注', event: "", edit: 'text' }


                    , { field: 'HSourceInterID', title: '源单主内码' }


                    , { field: 'HSourceEntryID', title: '源单子内码' }


                    , { field: 'HSourceBillNo', title: '源单单号' }


                    , { field: 'HSourceBillType', title: '源单类型' }


                    //, { field: 'HSourceInterID', title: '源单主内码' }


                    //, { field: 'HSourceEntryID', title: '源单子内码' }


                    //, { field: 'HSourceBillNo', title: '源单单号' }


                    //, { field: 'HSourceBillType', title: '源单类型' }


                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }


                ];


                option = {


@@ -886,7 +883,7 @@


            function set_EditFromGrid() {


                set_EditForm(linterid);  //编辑获取表头


                set_EditGrid(linterid);  //编辑获取表体


                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " }];


                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  " }];


                table.render(option);


            }


            //编辑加载表头