wtt
2024-11-28 5b2a67613180ee371f07865880c249aa77fc6889
异常工时单导出,工艺路线批量多级审批,采购订单子表删除刷新
3个文件已修改
177 ■■■■■ 已修改文件
WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBillList.html 122 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/¹¤×ʹÜÀí/Òì³£¹¤Ê±ÉêÇëµ¥/Pay_ErrWorkTimesRequestBillList.html
@@ -557,7 +557,127 @@
            //#region å¯¼å‡ºExecel
            function btn_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
                var data;
                //设置sWhere
                var ajaxLoad = layer.load();
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                if (HBeginDate) {
                    sWhere += " and æ—¥æœŸ >= '" + HBeginDate + "'";
                }
                if (HEndDate) {
                    sWhere += " and æ—¥æœŸ <= '" + HEndDate + "'";
                }
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/Pay_ErrWorkTimesRequestBillController/GetPay_ErrWorkTimesRequestBillList_Json',
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "sWhere": sWhere, "HMaker": HMaker },
                    success: function (data1) {
                        if (data1.count == 1) {
                            data = data1.data
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    },
                    error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";
                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, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                        }
                    }
                });
                table.exportFile(ins.config.id, data, "xls");
            }
            //#endregion
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -1679,16 +1679,53 @@
            //#endregion
            //#region å¤šçº§ åå®¡æ ¸/审核数据
            //function set_CheckBill_Flow(num) {
            //    var checkStatus = table.checkStatus('mainTable')
            //        , data = checkStatus.data;
            //    if (checkStatus.data.length === 1) {
            //        var InterID = data[0].hmainid.toString();
            //        //逻辑审核方法
            //        $.ajax({
            //            type: "GET",
            //            url: GetWEBURL() + "/Gy_Routing/AuditFlow", //方法所在页面和方法名
            //            data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
            //            success: function (result) {
            //                if (result.count == 1) {
            //                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
            //                        // å¾—到frame索引
            //                        var index = layer.getFrameIndex(window.name);
            //                        //关闭当前frame
            //                        layer.close(index);
            //                        //修改为功后刷新界面
            //                        $("#btnSearch").trigger('click');
            //                    });
            //                } else {
            //                    layer.alert(result.code + result.Message, { icon: 5 });
            //                }
            //            }, error: function () {
            //                layer.alert("接口请求失败!", { icon: 5 });
            //            }
            //        });
            //    }
            //    else {
            //        layer.msg('请选择一行数据审核!');
            //    }
            //}
            //#endregion
            //#region å¤šçº§ åå®¡æ ¸/审核数据
            function set_CheckBill_Flow(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                if (checkStatus.data.length != 0) {
                    var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//将对象数组id提取去重
                    var queryString = uniqueIds.join(",");//将ids变成数组
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/AuditFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
                        url: GetWEBURL() + "/Gy_Routing/CheckAllFlow", //方法所在页面和方法名
                        data: { "HInterIDS": queryString, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -1698,6 +1735,7 @@
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                });
                            } else {
@@ -1709,7 +1747,7 @@
                    });
                }
                else {
                    layer.msg('请选择一行数据审核!');
                    layer.msg('请选择至少一行数据审核!');
                }
            }
            //#endregion
WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html
@@ -1885,9 +1885,10 @@
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除!!!');
                        } else {
                            obj.del();
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            var oldData = table.cache["mainTable"];
                            oldData.splice(obj.tr.data('index'), 1)
                            option.data = oldData;//将数据绑定到data上
                            table.render(option);
                            layer.close(index);
                        }
                    });