Merge branch 'phyzasrs-erp' into phyzasrs-erp-4

zhangc

2024-12-23 dcc9b7294a7f47c00445d2b8dec0097b6b3b0e5e

 src/main/webapp/static/js/report/workCountIn.js

@@ -99,7 +99,7 @@
                        exportData[this.name] = this.value;
                        param += this.name + '=' + this.value + '&';
                    });
                    window.location.href = baseUrl + "/report/download/in" + param;
                    window.location.href = baseUrl + "/report/download/countIn" + param;
                    layer.closeAll();
                    // var param = {
                    //     fields: fields,