|  | @@ -1,10 +1,6 @@
 | 
	
		
			
			| 1 | 1 |  <template >
 | 
	
		
			
			| 2 | 2 |  <div class="app-container calendar-list-container">
 | 
	
		
			
			| 3 |  | - <el-dialog
 | 
	
		
			
			| 4 |  | -    :visible.sync="dialogVisible"
 | 
	
		
			
			| 5 |  | -    fullscreen="true"
 | 
	
		
			
			| 6 |  | -    :before-close="handleClose">
 | 
	
		
			
			| 7 |  | -    <div class="app-container">
 | 
	
		
			
			|  | 3 | +  <div class="app-container">
 | 
	
		
			
			| 8 | 4 |       <div class="block">
 | 
	
		
			
			| 9 | 5 |        <el-row :gutter="20">
 | 
	
		
			
			| 10 | 6 |          <el-col :span="6">
 | 
	
	
		
			
			|  | @@ -13,13 +9,14 @@
 | 
	
		
			
			| 13 | 9 |            <el-option v-for="item in roundOptions" :key="item.label" :label="item.label" :value="item.key">
 | 
	
		
			
			| 14 | 10 |            </el-option>
 | 
	
		
			
			| 15 | 11 |          </el-select>
 | 
	
		
			
			| 16 |  | -          </el-col >
 | 
	
		
			
			| 17 |  | -          <el-col :offset="10" :span="8">
 | 
	
		
			
			| 18 |  | -            <span @click="dialogVisible = false" class="demonstration">時間 : {{moment(this.roundTime)}}</span>
 | 
	
		
			
			| 19 |  | -          </el-col>
 | 
	
		
			
			| 20 |  | -        </el-row>
 | 
	
		
			
			| 21 |  | -      </div>
 | 
	
		
			
			|  | 12 | +        </el-col >
 | 
	
		
			
			|  | 13 | +        <el-col :offset="10" :span="8">
 | 
	
		
			
			|  | 14 | +          <span @click="dialogVisible = true" class="demonstration">時間 : {{moment(this.roundTime)}}</span>
 | 
	
		
			
			|  | 15 | +        </el-col>
 | 
	
		
			
			|  | 16 | +      </el-row>
 | 
	
		
			
			| 22 | 17 |      </div>
 | 
	
		
			
			|  | 18 | +  </div>
 | 
	
		
			
			|  | 19 | +  
 | 
	
		
			
			| 23 | 20 |      <el-table header-row-class-name="init" :data="bookie" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row
 | 
	
		
			
			| 24 | 21 |        style="width: 100%">      
 | 
	
		
			
			| 25 | 22 |        <el-table-column label="本期開獎" lable-className="title" align="center">   
 | 
	
	
		
			
			|  | @@ -189,10 +186,11 @@
 | 
	
		
			
			| 189 | 186 |          </el-table-column>
 | 
	
		
			
			| 190 | 187 |          </el-table-column>      
 | 
	
		
			
			| 191 | 188 |      </el-table>
 | 
	
		
			
			| 192 |  | -    </el-dialog>
 | 
	
		
			
			| 193 | 189 |  
 | 
	
		
			
			| 194 |  | -
 | 
	
		
			
			| 195 |  | -  <div class="app-container">
 | 
	
		
			
			|  | 190 | +  <el-dialog
 | 
	
		
			
			|  | 191 | +    :visible.sync="dialogVisible"
 | 
	
		
			
			|  | 192 | +    :fullscreen="true">
 | 
	
		
			
			|  | 193 | +    <div class="app-container">
 | 
	
		
			
			| 196 | 194 |       <div class="block">
 | 
	
		
			
			| 197 | 195 |        <el-row :gutter="20">
 | 
	
		
			
			| 198 | 196 |          <el-col :span="6">
 | 
	
	
		
			
			|  | @@ -201,14 +199,13 @@
 | 
	
		
			
			| 201 | 199 |            <el-option v-for="item in roundOptions" :key="item.label" :label="item.label" :value="item.key">
 | 
	
		
			
			| 202 | 200 |            </el-option>
 | 
	
		
			
			| 203 | 201 |          </el-select>
 | 
	
		
			
			| 204 |  | -        </el-col >
 | 
	
		
			
			| 205 |  | -        <el-col :offset="10" :span="8">
 | 
	
		
			
			| 206 |  | -          <span @click="dialogVisible = true" class="demonstration">時間 : {{moment(this.roundTime)}}</span>
 | 
	
		
			
			| 207 |  | -        </el-col>
 | 
	
		
			
			| 208 |  | -      </el-row>
 | 
	
		
			
			|  | 202 | +          </el-col >
 | 
	
		
			
			|  | 203 | +          <el-col :offset="10" :span="8">
 | 
	
		
			
			|  | 204 | +            <span @click="dialogVisible = false" class="demonstration">時間 : {{moment(this.roundTime)}}</span>
 | 
	
		
			
			|  | 205 | +          </el-col>
 | 
	
		
			
			|  | 206 | +        </el-row>
 | 
	
		
			
			|  | 207 | +      </div>
 | 
	
		
			
			| 209 | 208 |      </div>
 | 
	
		
			
			| 210 |  | -  </div>
 | 
	
		
			
			| 211 |  | -  
 | 
	
		
			
			| 212 | 209 |      <el-table header-row-class-name="init" :data="bookie" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row
 | 
	
		
			
			| 213 | 210 |        style="width: 100%">      
 | 
	
		
			
			| 214 | 211 |        <el-table-column label="本期開獎" lable-className="title" align="center">   
 | 
	
	
		
			
			|  | @@ -378,8 +375,7 @@
 | 
	
		
			
			| 378 | 375 |          </el-table-column>
 | 
	
		
			
			| 379 | 376 |          </el-table-column>      
 | 
	
		
			
			| 380 | 377 |      </el-table>
 | 
	
		
			
			| 381 |  | -
 | 
	
		
			
			| 382 |  | -
 | 
	
		
			
			|  | 378 | +    </el-dialog>
 | 
	
		
			
			| 383 | 379 |  </div>
 | 
	
		
			
			| 384 | 380 |  </template>
 | 
	
		
			
			| 385 | 381 |  
 | 
	
	
		
			
			|  | @@ -395,7 +391,7 @@ export default {
 | 
	
		
			
			| 395 | 391 |    data() {
 | 
	
		
			
			| 396 | 392 |      return {
 | 
	
		
			
			| 397 | 393 |        list: null,
 | 
	
		
			
			| 398 |  | -      listLoading: true,
 | 
	
		
			
			|  | 394 | +      listLoading: false,
 | 
	
		
			
			| 399 | 395 |        listQuery: { 
 | 
	
		
			
			| 400 | 396 |          round: 1 
 | 
	
		
			
			| 401 | 397 |        }, 
 | 
	
	
		
			
			|  | @@ -452,7 +448,7 @@ export default {
 | 
	
		
			
			| 452 | 448 |        // 'SetQuery'
 | 
	
		
			
			| 453 | 449 |      ]),
 | 
	
		
			
			| 454 | 450 |      async getList() {
 | 
	
		
			
			| 455 |  | -      this.listLoading = true
 | 
	
		
			
			|  | 451 | +      // this.listLoading = true
 | 
	
		
			
			| 456 | 452 |        let detailTemp, dealingTemp, memberRecordTemp
 | 
	
		
			
			| 457 | 453 |        this.detail = []
 | 
	
		
			
			| 458 | 454 |        fetchWagerRecord(this.data.secondLayer, this.listQuery).then(response => {
 | 
	
	
		
			
			|  | @@ -496,7 +492,7 @@ export default {
 | 
	
		
			
			| 496 | 492 |              record.MemberRecord.door === -1 &&
 | 
	
		
			
			| 497 | 493 |              record.MemberRecord.door === record.DealingRecord.door
 | 
	
		
			
			| 498 | 494 |          })
 | 
	
		
			
			| 499 |  | -        // console.log('this', this.memberRecord)
 | 
	
		
			
			|  | 495 | +        console.log('this', this.bookie[0])
 | 
	
		
			
			| 500 | 496 |          // this.bidChips ? this.bookie[0].bidChips = this.bidChips : false        
 | 
	
		
			
			| 501 | 497 |          this.group = _.groupBy(detailTemp, record => {
 | 
	
		
			
			| 502 | 498 |            return record.MemberRecord.GambleMember.name
 | 
	
	
		
			
			|  | @@ -592,7 +588,7 @@ export default {
 | 
	
		
			
			| 592 | 588 |          })
 | 
	
		
			
			| 593 | 589 |        })
 | 
	
		
			
			| 594 | 590 |  
 | 
	
		
			
			| 595 |  | -      this.listLoading = false
 | 
	
		
			
			|  | 591 | +      // this.listLoading = false
 | 
	
		
			
			| 596 | 592 |      },
 | 
	
		
			
			| 597 | 593 |      objectSpanMethod({ row, column, rowIndex, columnIndex }) {
 | 
	
		
			
			| 598 | 594 |        if (columnIndex === 0 || columnIndex === 5 || columnIndex === 6 || columnIndex === 7 || columnIndex === 8) {
 |