diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
index 7fef63d4b..66b8c6f6e 100644
--- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue
+++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
@@ -962,6 +962,11 @@ export default {
this.innerQuery = attrs
return this.getList()
},
+ searchDate(attrs) {
+ this.extraQuery = attrs
+ return this.getList()
+ },
+
/**
* 重置查询,相当于点击「重置」按钮
*
diff --git a/src/components/DataTable/index.vue b/src/components/DataTable/index.vue
index a2ccc75b8..96033f9c3 100644
--- a/src/components/DataTable/index.vue
+++ b/src/components/DataTable/index.vue
@@ -95,6 +95,9 @@ export default {
getData() {
return this.$refs.table.data
},
+ searchDate(attrs) {
+ return this.$refs.table.searchDate(attrs)
+ },
search(attrs) {
return this.$refs.table.search(attrs)
},
diff --git a/src/components/DateTimePicker/index.vue b/src/components/DateTimePicker/index.vue
new file mode 100644
index 000000000..c98e7c96f
--- /dev/null
+++ b/src/components/DateTimePicker/index.vue
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
diff --git a/src/components/ListTable/TableAction/index.vue b/src/components/ListTable/TableAction/index.vue
index f33cf3930..ef3cae653 100644
--- a/src/components/ListTable/TableAction/index.vue
+++ b/src/components/ListTable/TableAction/index.vue
@@ -3,11 +3,13 @@
@@ -18,21 +20,24 @@