Encore лет назад: 6
Родитель
Сommit
cc04f28aa3

+ 17 - 17
src/views/agnetManagement/gambleMemberManagement/index.vue

@@ -1,10 +1,10 @@
1 1
 <template>
2 2
   <div  class="app-container">
3 3
     <div v-show="visible.secondLayer">
4
-      <div  class="app-container">
5
-          <div class="block">
4
+      <!-- <div  class="app-container"> -->
5
+          <!-- <div class="block"> -->
6 6
               <!-- <span class="demonstration">時間篩選</span> -->
7
-              <el-date-picker
7
+              <!-- <el-date-picker
8 8
               v-model="date"
9 9
               type="datetimerange"
10 10
               :picker-options="pickerOptions"
@@ -15,7 +15,7 @@
15 15
               </el-date-picker>
16 16
               <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">搜尋</el-button>
17 17
           </div>
18
-      </div>
18
+      </div> -->
19 19
       <el-table :data="allCombine" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row>
20 20
           <el-table-column label="代理商名稱"  align="center">
21 21
             <template slot-scope="scope">
@@ -131,8 +131,8 @@ export default {
131 131
       listQuery: {
132 132
         // page: 1,
133 133
         // limit: 20,
134
-        startAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
135
-        endAt: moment.utc(moment().day('sunday').hour(12).day(7).hour(11).minute(59).second(59)).format()
134
+        // startAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
135
+        // endAt: moment.utc(moment().day('sunday').hour(12).day(7).hour(11).minute(59).second(59)).format()
136 136
       },
137 137
       pickerOptions: {
138 138
         shortcuts: [{
@@ -296,17 +296,17 @@ export default {
296 296
       this.SetVisible(3)
297 297
       this.SetData({layer:3, data: temp})
298 298
     },
299
-    handleFilter() {
300
-      this.listQuery.page = 1
301
-      if (this.date) {
302
-        this.listQuery.startAt = moment.utc(this.date[0]).format()
303
-        this.listQuery.endAt = moment.utc(this.date[1]).format()
304
-      } else {
305
-        this.listQuery.startAt = null
306
-        this.listQuery.endAt = null
307
-      }
308
-      this.getList()
309
-    },
299
+    // handleFilter() {
300
+    //   this.listQuery.page = 1
301
+    //   if (this.date) {
302
+    //     this.listQuery.startAt = moment.utc(this.date[0]).format()
303
+    //     this.listQuery.endAt = moment.utc(this.date[1]).format()
304
+    //   } else {
305
+    //     this.listQuery.startAt = null
306
+    //     this.listQuery.endAt = null
307
+    //   }
308
+    //   this.getList()
309
+    // },
310 310
     handleSizeChange(val) {
311 311
       this.listQuery.limit = val
312 312
       this.getList()

+ 2 - 2
src/views/agnetManagement/index.vue

@@ -84,8 +84,8 @@ export default {
84 84
       listQuery: {
85 85
         page: 1,
86 86
         limit: 20,
87
-        startAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
88
-        endAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)).format()
87
+        // startAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
88
+        // endAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)).format()
89 89
       },
90 90
       dialogCreateFormVisible: false,
91 91
       dialogStatus: '',

+ 15 - 15
src/views/studio/index.vue

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
 <div class="app-container calendar-list-container">
3 3
   <div class="app-container" v-show="visible.firstLayer">
4
-    <div class="app-container">
4
+    <!-- <div class="app-container">
5 5
       <el-date-picker
6 6
         v-model="date"
7 7
         type="datetimerange"
@@ -12,7 +12,7 @@
12 12
         align="right">
13 13
       </el-date-picker>
14 14
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">搜尋</el-button>
15
-    </div>
15
+    </div> -->
16 16
     <el-table :data="list" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row
17 17
       style="width: 100%">
18 18
       <el-table-column label="工作室上繳金額" align="center">
@@ -50,8 +50,8 @@ export default {
50 50
       listLoading: true,
51 51
       bucket: '',
52 52
       listQuery: {
53
-        startAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
54
-        endAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)).format()
53
+        // startAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
54
+        // endAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)).format()
55 55
       },
56 56
       temp: {},
57 57
       pickerOptions: {
@@ -122,17 +122,17 @@ export default {
122 122
         this.listLoading = false
123 123
       })
124 124
     },
125
-    handleFilter() {
126
-      this.listQuery.page = 1
127
-      if (this.date) {
128
-        this.listQuery.startAt = moment.utc(this.date[0]).format()
129
-        this.listQuery.endAt = moment.utc(this.date[1]).format()
130
-      } else {
131
-        this.listQuery.startAt = null
132
-        this.listQuery.endAt = null
133
-      }
134
-      this.getList()
135
-    },
125
+    // handleFilter() {
126
+    //   this.listQuery.page = 1
127
+    //   if (this.date) {
128
+    //     this.listQuery.startAt = moment.utc(this.date[0]).format()
129
+    //     this.listQuery.endAt = moment.utc(this.date[1]).format()
130
+    //   } else {
131
+    //     this.listQuery.startAt = null
132
+    //     this.listQuery.endAt = null
133
+    //   }
134
+    //   this.getList()
135
+    // },
136 136
     handleSizeChange(val) {
137 137
       this.listQuery.limit = val
138 138
       this.getList()