add round dealrecord table

src/api/gambleGameBucket.js

@@ -22,10 +22,9 @@ export function fetchMemberRecords(data) {
   })
 }
 
-export function fetchDealingRecords(data) {
-  const round = 1
+export function fetchDealingRecords(data, query = { round: 1 }) {
   return request({
-    url: `/gambleGameBuckets/${data.id}/round/${round}/dealingRecords`,
+    url: `/gambleGameBuckets/${data.id}/round/${query.round}/dealingRecords`,
     method: 'get'
   })
 }

src/views/gambleGameBucket/detail/index.vue

@@ -6,27 +6,67 @@
         </el-option>
       </el-select>
   </div>
+    <el-table :data="dealing" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row
+      style="width: 100%">
+      <el-table-column label="本期開獎" align="center">      
+        <el-table-column label="第一門">
+          <template slot-scope="scope">
+            <span>{{`${scope.row.point1_0} | ${scope.row.point2_0} / ${scope.row.totalPoints_0}`}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="第二門">
+          <template slot-scope="scope">
+            <span>{{`${scope.row.point1_1} | ${scope.row.point2_1} / ${scope.row.totalPoints_1}`}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="第三門">
+          <template slot-scope="scope">
+            <span>{{`${scope.row.point1_2} | ${scope.row.point2_2} / ${scope.row.totalPoints_2}`}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="第四門">
+          <template slot-scope="scope">
+            <span>{{`${scope.row.point1_3} | ${scope.row.point2_3} / ${scope.row.totalPoints_3}`}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="第五門">
+          <template slot-scope="scope">
+            <span>{{`${scope.row.point1_4} | ${scope.row.point2_4} / ${scope.row.totalPoints_4}`}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="第六門">
+          <template slot-scope="scope">
+            <span>{{`${scope.row.point1_5} | ${scope.row.point2_5} / ${scope.row.totalPoints_5}`}}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>      
+    </el-table>
     <el-table :data="detail" :span-method="objectSpanMethod"  v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row
       style="width: 100%">
-      <el-table-column prop="MemberRecord.GambleMember.name" label="玩家" width="180">
-      </el-table-column>
-      <el-table-column  label="押">
-        <template slot-scope="scope">
-          <span>{{`${scope.row.MemberRecord.door} / ${scope.row.MemberRecord.wager}`}}</span>
-        </template>
-      </el-table-column>
-      <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="Membehips" label="輸贏合計">
-      </el-table-column>
-      <el-table-column prop="amount3" label="福利">
-      </el-table-column>
-      <el-table-column prop="MemberRecord.GambleMember.chips" label="最終積分">
-      </el-table-column>
+      <el-table-column label="此輪結果" align="center">
+        <el-table-column prop="MemberRecord.GambleMember.name" label="玩家" width="180">
+        </el-table-column>
+        <el-table-column  label="押">
+          <template slot-scope="scope">
+            <span>{{`${scope.row.MemberRecord.door} / ${scope.row.MemberRecord.wager}`}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="DealingRecord.totalPoints" label="點數">
+          <template slot-scope="scope">
+            <span>{{`${scope.row.DealingRecord.point1} | ${scope.row.DealingRecord.point2} / ${scope.row.DealingRecord.totalPoints}`}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="MemberRecord.earned" label="輸贏">
+        </el-table-column>
+        <el-table-column prop="MemberRecord.serviceFees" label="抽水">
+        </el-table-column>
+        <el-table-column prop="Membehips" label="輸贏合計">
+        </el-table-column>
+        <el-table-column prop="ass" label="福利">
+        </el-table-column>
+        <el-table-column prop="MemberRecord.GambleMember.chips" label="最終積分">
+        </el-table-column>
+      </el-table-column>      
     </el-table>
 
 
@@ -57,7 +97,7 @@
 <script>
 
 import { mapGetters, mapActions } from 'vuex'
-import { fetchDetails, fetchRoundCount } from '@/api/gambleGameBucket'
+import { fetchDetails, fetchRoundCount, fetchDealingRecords } from '@/api/gambleGameBucket'
 import { fetchList } from '@/api/gambleMember'
 import _ from 'lodash'
 
@@ -78,7 +118,8 @@ export default {
       rowIndex: 0,
       colIndex: 0,
       roundOptions: [],
-      members: []
+      members: [],
+      dealing: []
     }
   },
   props: ['bucket'],
@@ -126,10 +167,51 @@ export default {
     ]),
     getList() {
       this.listLoading = true
-      let detailTemp
+      let detailTemp, dealingTemp
       this.detail = []
-      fetchDetails(this.bucket, this.listQuery).then(reponse => {
-        detailTemp = reponse.data.rows.filter(record => {
+      fetchDealingRecords(this.bucket, this.listQuery).then(response => {
+        dealingTemp = response.data.rows.filter(record => {
+          return record.door !== -1
+        })
+        let deal = {}   
+        dealingTemp.map((record, index) => {
+          if (index % 6 === 0) {
+            deal.door_0 = record.door
+            deal.point1_0 = record.point1
+            deal.point2_0 = record.point2
+            deal.totalPoints_0 = record.totalPoints
+          } else if (index % 6 === 1) {
+            deal.door_1 = record.door
+            deal.point1_1 = record.point1
+            deal.point2_1 = record.point2
+            deal.totalPoints_1 = record.totalPoints
+          }else if (index % 6 === 2) {
+            deal.door_2 = record.door
+            deal.point1_2 = record.point1
+            deal.point2_2 = record.point2
+            deal.totalPoints_2 = record.totalPoints
+          }else if (index % 6 === 3) {
+            deal.door_3 = record.door
+            deal.point1_3 = record.point1
+            deal.point2_3 = record.point2
+            deal.totalPoints_3 = record.totalPoints
+          }else if (index % 6 === 4) {
+            deal.door_4 = record.door
+            deal.point1_4 = record.point1
+            deal.point2_4 = record.point2
+            deal.totalPoints_4 = record.totalPoints
+          } else if (index % 6 === 5) {
+            deal.door_5 = record.door
+            deal.point1_5 = record.point1
+            deal.point2_5 = record.point2
+            deal.totalPoints_5 = record.totalPoints
+            this.dealing.push(deal)
+            deal = {}
+          }
+        })
+      })
+      fetchDetails(this.bucket, this.listQuery).then(response => {
+        detailTemp = response.data.rows.filter(record => {
           return record.DealingRecord.door !== -1 &&
             record.MemberRecord.door !== -1 &&
             record.MemberRecord.door === record.DealingRecord.door
@@ -194,6 +276,7 @@ export default {
       }
     },
     handleFilter() {
+      this.dealing = []
       this.getList()
     }
   },