diff --git a/application/admin/view/oa/schedule/custom_index.html b/application/admin/view/oa/schedule/custom_index.html
index 32fd4fe..991f097 100644
--- a/application/admin/view/oa/schedule/custom_index.html
+++ b/application/admin/view/oa/schedule/custom_index.html
@@ -52,9 +52,6 @@
-
-
-
diff --git a/public/assets/js/backend/oa/schedule.js b/public/assets/js/backend/oa/schedule.js
index a54c578..43fc936 100644
--- a/public/assets/js/backend/oa/schedule.js
+++ b/public/assets/js/backend/oa/schedule.js
@@ -99,18 +99,51 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
// 为表格绑定事件
Table.api.bindevent(table);
- // 指定搜索条件
$(document).on("click", ".btn-block", function () {
- var timetype = $("#c-flag").val();
- let options = $table.bootstrapTable('getOptions');
- table.bootstrapTable('refreshOptions', {
- columns: [{
+ let selectedValue = $('#c-flag').val();
+
+ let changeColumn = [];
+ if (selectedValue == 2) {
+ changeColumn = [{
"title":"username",
"field":"name",
- }],
- searchFormTemplate: options.searchFormTemplate
+ }];
+ } else {
+ changeColumn = [{
+ "title":"username",
+ "field":"name",
+ }];
+ const startDate = new Date("2025-02-22");
+ const endDate = new Date("2025-03-22");
+
+ for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) {
+ let tmpDate = d.toISOString().split('T')[0]; // 使用 d,而不是 date
+ changeColumn.push({
+ "title": tmpDate,
+ "field": tmpDate,
+ });
+ }
+ }
+
+ var options = table.bootstrapTable('getOptions');
+ var queryParams = options.queryParams;
+ options.queryParams = function (params) {
+ //这一行必须要存在,否则在点击下一页时会丢失搜索栏数据
+ params = queryParams(params);
+
+ var filter = params.filter ? JSON.parse(params.filter) : {};
+ filter.timetype = selectedValue;
+
+ params.filter = JSON.stringify(filter);
+ return params;
+ };
+
+ table.bootstrapTable('refreshOptions', {
+ columns: changeColumn,
});
+
+ $('#c-flag').val(selectedValue).change();
return false;
});
},