|  | @@ -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()
 |