Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -546,7 +546,9 @@ export default {
     searchListShop() {
       this.shopList = [];
     },
-    searchList() {
+    searchList(e) {
+      console.log(e);
+
       this.pageParam.pageNo = 1;
       this.getTableList();
     },
@@ -557,6 +559,9 @@ export default {
         this.inFields.endTime = this.dateTime ? this.dateTime[1] + ' 23:59:59' : '';
         this.inFields.startTime = Date.parse(new Date(this.inFields.startTime).toString());
         this.inFields.endTime = Date.parse(new Date(this.inFields.endTime).toString());
+      } else {
+        this.inFields.startTime = '';
+        this.inFields.endTime = '';
       }
       if (this.currentGroupId) {
         this.inFields.hmGroupId = this.currentGroupId;