TODO table

src/api/gambleGameBucket.js

@@ -29,3 +29,11 @@ export function fetchDealingRecords(data) {
     method: 'get'
   })
 }
+
+export function fetchDetails(data) {
+  const round = 1
+  return request({
+    url: `/gambleGameBuckets/${data.id}/round/${round}/detail`,
+    method: 'get'
+  })
+}

src/views/gambleGameBucket/detail/index.vue

@@ -1,22 +1,24 @@
 <template>
 <div class="app-container calendar-list-container">
   <div class="app-container">
-    <el-table :data="memberRecords" :span-method="objectSpanMethod" border style="width: 100% margin-top: 20px">
-      <el-table-column prop="GambleMember.name" label="玩家" width="180">
+    <el-table :data="detail" :span-method="objectSpanMethod" border style="width: 100% margin-top: 20px">
+      <el-table-column prop="MemberRecord.GambleMember.name" label="玩家" width="180">
       </el-table-column>
-      <el-table-column prop="door" label="押">
+      <el-table-column prop="MemberRecord.door" label="押">
       </el-table-column>
-      <el-table-column prop="totalPoints" label="點數">
+      <el-table-column prop="MemberRecord.wager" label="額度">
       </el-table-column>
-      <el-table-column prop="earned" label="輸贏">
+      <el-table-column prop="DealingRecord.totalPoints" label="點數">
+      </el-table-column>
+      <el-table-column prop="MemberRecord.earned" label="輸贏">
       </el-table-column>
       <el-table-column prop="amount3" label="抽水">
       </el-table-column>
-      <el-table-column prop="sss" label="輸贏合計">
+      <el-table-column prop="Membehips" label="輸贏合計">
       </el-table-column>
       <el-table-column prop="amount3" label="福利">
       </el-table-column>
-      <el-table-column prop="GambleMember.chips" label="最終積分">
+      <el-table-column prop="MemberRecord.GambleMember.chips" label="最終積分">
       </el-table-column>
     </el-table>
   </div>
@@ -24,7 +26,7 @@
 </template>
 
 <script>
-import { fetchList, fetchMemberRecords, fetchDealingRecords } from '@/api/gambleGameBucket'
+import { fetchDetails, fetchMemberRecords, fetchDealingRecords } from '@/api/gambleGameBucket'
 import _ from 'lodash'
 
 export default {
@@ -36,7 +38,7 @@ export default {
       memberRecords: [],
       dealingRecords: [],
       groupMember: [],
-      // Marray: [],
+      detail: [],
     }
   },
   props: [ 'bucket' ],
@@ -46,7 +48,19 @@ export default {
   methods: {
     getList() {
       this.listLoading = true
-      let memberTemp ,dealingTemp ,group 
+      let memberTemp ,dealingTemp ,group ,detailTemp
+      fetchDetails(this.bucket).then(reponse => {
+        dealingTemp = reponse.data.rows.filter(record => {
+          return  record.DealingRecord.door !== -1 && 
+            record.MemberRecord.door !== -1 &&
+            record.MemberRecord.door === record.DealingRecord.door
+        })
+        dealingTemp = _.sortBy(dealingTemp, 'MemberRecord.GambleMember.name');
+        dealingTemp.map(record => {
+          this.detail.push(record)
+        })
+        console.log(this.detail)
+      })
       fetchMemberRecords(this.bucket).then(response => {
         memberTemp = response.data.rows.filter(record => {
           return record.door !== -1
@@ -74,8 +88,9 @@ export default {
       this.listLoading = false
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0 || columnIndex === 4|| columnIndex === 5|| columnIndex === 6|| columnIndex === 7) {
+      if (columnIndex === 0 || columnIndex === 5|| columnIndex === 6|| columnIndex === 7|| columnIndex === 8) {
         this.groupMember
+        console.log(rowIndex)
         if (rowIndex % 6 === 0) {
           return {
             rowspan: 6,