detail modify

src/api/gambleGameBucket.js

@@ -64,3 +64,10 @@ export function fetchRoundRecord(data, query = { round: 1 }) {
     method: 'get'
   })
 }
+
+// export function fetchRoundRecord(data) {
+//   return request({
+//     url: `/gambleGameBuckets/${data.id}/initDoor`,
+//     method: 'get'
+//   })
+// }

src/views/gambleGameBucket/detail/index.vue

@@ -4,7 +4,7 @@
      <div class="block">
       <el-row :gutter="20">
         <el-col :span="6">
-          <span class="demonstration">關數選擇</span>
+          <span class="demonstration">關數</span>
           <el-select @change='handleFilter' style="width: 120px" class="filter-item" v-model="query.secondLayer.round" placeholder="關">
           <el-option v-for="item in roundOptions" :key="item.label" :label="item.label" :value="item.key">
           </el-option>
@@ -16,40 +16,63 @@
       </el-row>
     </div>
   </div>
-    <el-table :data="dealing" v-loading.body="listLoading" :summary-method="getSummaries" show-summary  element-loading-text="Loading" border fit highlight-current-row
+    <el-table header-row-class-name="init" :data="bookie" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row
+      style="width: 100%">      
+      <el-table-column label="本期開獎" lable-className="title" align="center">   
+        <el-table-column label="莊家結果" align="center">            
+                  
+          <el-table-column label="莊家" prop="MemberRecord.GambleMember.name"></el-table-column>
+          <el-table-column label="點數">
+            <template slot-scope="scope">
+              <span>{{`${scope.row.DealingRecord.point1} | ${scope.row.DealingRecord.point2} / ${point(scope.row.DealingRecord)}`}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="上莊分數" prop="bidChips"></el-table-column>      
+          <el-table-column label="莊輸贏">
+            <template slot-scope="scope">
+              <div :style="moneyColor(scope.row.MemberRecord.earned)">{{scope.row.MemberRecord.earned}}</div>
+            </template>
+          </el-table-column>      
+          <el-table-column label="抽水" prop="MemberRecord.serviceFees"></el-table-column>
+          <el-table-column prop="ass" label="服務費">
+          </el-table-column>     
+        </el-table-column>             
+      </el-table-column>                   
+    </el-table>
+    <el-table :header-cell-style="initDoor" :data="dealing" v-loading.body="listLoading" :summary-method="getSummaries" show-summary  element-loading-text="Loading" border fit highlight-current-row
       style="width: 100%">
-      <el-table-column label="本期開獎" align="center"> 
+      <el-table-column label="各門結果" align="center"> 
         <el-table-column label="名稱">
           <template slot-scope="scope">
             <span>{{scope.$index === 0 ?"點數":"門主"}}</span>
           </template>
         </el-table-column>   
-        <el-table-column label="第一門" :label-class-name="initDoor(1)">
+        <el-table-column label="第一門">
           <template slot-scope="scope">
             <span>{{doorTableSwitch(scope.$index, 0)}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="第二門" :label-class-name="initDoor(2)">
+        <el-table-column label="第二門">
           <template slot-scope="scope">
             <span>{{doorTableSwitch(scope.$index, 1)}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="第三門" :label-class-name="initDoor(3)">
+        <el-table-column label="第三門">
           <template slot-scope="scope">
             <span>{{doorTableSwitch(scope.$index, 2)}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="第四門" :label-class-name="initDoor(4)">
+        <el-table-column label="第四門">
           <template slot-scope="scope">
             <span>{{doorTableSwitch(scope.$index, 3)}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="第五門" :label-class-name="initDoor(5)">
+        <el-table-column label="第五門">
           <template slot-scope="scope">
             <span>{{doorTableSwitch(scope.$index, 4)}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="第六門" :label-class-name="initDoor(6)">
+        <el-table-column label="第六門">
           <template slot-scope="scope">
             <span>{{doorTableSwitch(scope.$index, 5)}}</span>
           </template>
@@ -138,7 +161,7 @@
 <script>
 
 import { mapGetters, mapActions } from 'vuex'
-import { fetchDetails, fetchRoundCount, fetchDealingRecords, fetchMemberRecords, fetchRoundRecord } from '@/api/gambleGameBucket'
+import { fetchDetails, fetchRoundCount, fetchDealingRecords, fetchMemberRecords, fetchRoundRecord, fetchGameBid } from '@/api/gambleGameBucket'
 import { fetchGambleMemberList } from '@/api/gambleMember'
 import { ponitTransform } from '@/utils/point'
 import _ from 'lodash'
@@ -162,10 +185,17 @@ export default {
       dealing: [],
       bookie: [],
       memberRecord: [],
-      initialDoor: 0,
+      door: 0,
+      bidChips: 0,
     }
   },
   created() {
+    fetchRoundRecord(this.data.secondLayer, this.query.secondLayer).then(response => {
+      this.door = response.data.initialDoor
+    })
+    fetchGameBid(this.data.secondLayer).then(response => {
+      this.bidChips = response.data
+    })
     fetchRoundCount(this.data.secondLayer).then((response) => {
       for (let i = 1; i <= response.data; i++) {
         this.roundOptions.push({ label: `第 ${i} 關`, key: i })
@@ -253,7 +283,7 @@ export default {
             record.MemberRecord.door === -1 &&
             record.MemberRecord.door === record.DealingRecord.door
         })
-        this.data.secondLayer.bidChips ? this.bookie[0].bidChips = this.data.secondLayer.bidChips : false
+        this.bidChips ? this.bookie[0].bidChips = this.bidChips : false        
         this.group = _.groupBy(detailTemp, record => {
           return record.MemberRecord.GambleMember.name
         })
@@ -297,10 +327,6 @@ export default {
         this.func = eval(`(function() {${this.statement}})`)
       })
 
-      fetchRoundRecord(this.data.secondLayer, this.query.secondLayer).then(response => {
-        this.initialDoor = response.data.initialDoor
-      })
-
       this.listLoading = false
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
@@ -329,6 +355,9 @@ export default {
       return sums
     },
     handleFilter() {
+      fetchRoundRecord(this.data.secondLayer, this.query.secondLayer).then(response => {
+        this.door = response.data.initialDoor
+      })
       this.SetQuery({layer:2, query: {round: this.query.secondLayer.round}})      
       this.dealing = []
       this.getList()
@@ -345,7 +374,7 @@ export default {
         return `${this.dealing[0][`point1_${colIndex}`]} | ${this.dealing[0][`point2_${colIndex}`]} / ${this.point({point1: this.dealing[0][`point1_${colIndex}`] ,point2: this.dealing[0][`point2_${colIndex}`] ,totalPoints: this.dealing[0][`totalPoints_${colIndex}`]})}`
       }
       if (rowIndex === 1) {
-        return this.dealing[1][`member_${colIndex}`] ? `${this.dealing[1][`member_${colIndex}`]}` : 'N/A'
+        return this.dealing[1][`member_${colIndex+1}`] ? `${this.dealing[1][`member_${colIndex+1}`]}` : '從缺'
       }
     },
     _sum(i) {
@@ -358,9 +387,8 @@ export default {
     point(dealingRecord) {
       return ponitTransform(dealingRecord)
     },
-    initDoor(index) {
-      console.log(index===this.initialDoor)
-      return this.initialDoor === index ? `init` : ''
+    initDoor({row, column, rowIndex, columnIndex}) {
+      return  columnIndex === this.door ? { color: '#F56C6C' } : ``
     }
   },
   destroyed() {
@@ -369,7 +397,8 @@ export default {
 }
 </script>
 <style>
-  .el-table-column .init {
-    color: #F56C6C;
-  }
+div{
+  font-weight: bold;
+  font-size: 25px
+}
 </style>

src/views/gambleGameBucket/index.vue

@@ -54,7 +54,7 @@
 <script>
 
 import { mapGetters, mapActions } from 'vuex'
-import { fetchList, fetchGameBid } from '@/api/gambleGameBucket'
+import { fetchList, fetchGameBid, fetchRoundRecord } from '@/api/gambleGameBucket'
 import waves from '@/directive/waves' // 水波纹指令
 import moment from 'moment-timezone'
 
@@ -75,7 +75,7 @@ export default {
       //   endAt: null,
       //   bookie: null
       // },
-      temp: {},
+      // temp: {},
       pickerOptions: {
         shortcuts: [{
           text: '本週',
@@ -125,12 +125,16 @@ export default {
       })
     },
     handlePage(row) {
-      this.temp = Object.assign({}, row) // copy obj
-      fetchGameBid(row).then(response => {
-        this.temp.bidChips = response.data
-      })
+      let temp = Object.assign({}, row) // copy obj
+      // fetchRoundRecord(row).then(response => {
+      //   temp.door = response.data
+      // })
+      // fetchGameBid(row).then(response => {
+      //   temp.bidChips = response.data
+      // })
+      console.log('eeeee', temp)
       this.SetVisible(2)
-      this.SetData({layer:2, data: this.temp})
+      this.SetData({layer:2, data: temp})
     },
     handleFilter() {
       if (this.p_date) {