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

zrg

2024-07-10 20d76c8f9447cca600b13c80179ab4445efae249

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

@@ -325,13 +325,13 @@
                $("#HBillNo").val("");//单据号
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                $("#Comparator").val("0");       
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                form.render('select');
                sWhere = "";
                get_Display(sWhere);
@@ -372,33 +372,33 @@
                });
            })
            //#endregion
            //#region
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '单据号') {
                    var linterid = data.hmainid.toString();
                    layer.open({
                        type: 2,
                        area: ['100%', '100%'],
                        title: '编辑器具保养' + HPageTitle,
                        closeBtn: 1,
                        shade: 0.7,
                        maxmin: true,
                        anim: 0,
                        content: '../模治具管理/Sc_Add_MouldMaintainPlanBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=&closeType=1',
                        resize: false,
            ////#region
            //table.on('tool(mainTable)', function (obj) {
            //    var data = obj.data;
            //    if (obj.event == '单据号') {
            //        var linterid = data.hmainid.toString();
            //        layer.open({
            //            type: 2,
            //            area: ['100%', '100%'],
            //            title: '编辑器具保养' + HPageTitle,
            //            closeBtn: 1,
            //            shade: 0.7,
            //            maxmin: true,
            //            anim: 0,
            //            content: '../模治具管理/Sc_Add_MouldMaintainPlanBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=&closeType=1',
            //            resize: false,

                        end: function () {
                            get_FastQuery(table, option);
                        },
                        cancel: function () {
            //            end: function () {
            //                get_FastQuery(table, option);
            //            },
            //            cancel: function () {

                        }
                    })
            //            }
            //        })

                }
            });
            //#endregion
            //    }
            //});
            ////#endregion
            //快速过滤
            function get_FastQuery(table, option) {

@@ -776,9 +776,9 @@
                                }
                                else if ($inArray(data[i].name, totalArray) - 1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, table: true, width: 120 })
                                } else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, event:'单据号' })
                                }
                                }/* else if (data[i].name == '单据号') {*/
                                //    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, event:'单据号' })
                                //}
                                else {
                                    switch (data[i].Type) {
                                        //int