From ab09a3365264cf730cfd7b1d6dbec8964e7e356a Mon Sep 17 00:00:00 2001
From: appleyou <appleyou@gmail.com>
Date: Thu, 17 Apr 2025 10:59:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(sourceBonus):=20=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=AF=E8=A7=81=E6=9D=83=E9=99=90=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settlementCenter/sourceBonus/index.vue    | 266 ++++--------------
 1 file changed, 49 insertions(+), 217 deletions(-)

diff --git a/src/views/settlementCenter/sourceBonus/index.vue b/src/views/settlementCenter/sourceBonus/index.vue
index 214d469..6bd86a5 100644
--- a/src/views/settlementCenter/sourceBonus/index.vue
+++ b/src/views/settlementCenter/sourceBonus/index.vue
@@ -220,7 +220,7 @@
       <div class="maintable">
         <div>
           <el-table
-            v-if="flag"
+            v-if="dataRole.length > 0"
             ref="table"
             v-loading="loading"
             :height="isActive ? '615px' : '655px'"
@@ -234,56 +234,56 @@
           >
             <el-table-column type="selection" width="100" />
             <el-table-column
-              v-if="dataList[0].key"
+              v-if="dataRole.includes('period')"
               align="center"
               prop="period"
               width="130"
               :label="'结算期数'"
             />
             <el-table-column
-              v-if="dataList[1].key"
+              v-if="dataRole.includes('settleDate')"
               align="center"
               prop="settleDate"
               width="130"
               :label="'结算日期'"
             />
             <el-table-column
-              v-if="dataList[2].key"
+              v-if="dataRole.includes('orderCode')"
               align="center"
               prop="orderCode"
               width="200"
               :label="'订单编号'"
             />
             <el-table-column
-              v-if="dataList[3].key"
+              v-if="dataRole.includes('orderTypeVal')"
               align="center"
               prop="orderTypeVal"
               width="130"
               :label="'订单类型'"
             />
             <el-table-column
-              v-if="dataList[4].key"
+              v-if="dataRole.includes('sourceCountryName')"
               align="center"
               prop="sourceCountryName"
               width="130"
               :label="'来源国家'"
             />
             <el-table-column
-              v-if="dataList[5].key"
+              v-if="dataRole.includes('sourceMemberCode')"
               align="center"
               prop="sourceMemberCode"
               width="130"
               :label="'来源编号'"
             />
             <el-table-column
-              v-if="dataList[6].key"
+              v-if="dataRole.includes('sourceMemberName')"
               align="center"
               prop="sourceMemberName"
               width="130"
               :label="'来源姓名'"
             />
             <el-table-column
-              v-if="dataList[7].key"
+              v-if="dataRole.includes('orderAmount')"
               align="center"
               prop="orderAmount"
               width="130"
@@ -291,7 +291,7 @@
               :formatter="stateFormat"
             />
             <el-table-column
-              v-if="dataList[8].key"
+              v-if="dataRole.includes('orderAchieveOri')"
               align="center"
               prop="orderAchieveOri"
               width="130"
@@ -315,35 +315,35 @@
               :formatter="stateFormat"
             /> -->
             <el-table-column
-              v-if="dataList[11].key"
+              v-if="dataRole.includes('settleCountry')"
               align="center"
               prop="settleCountry"
               width="130"
               :label="'结算国家'"
             />
             <el-table-column
-              v-if="dataList[12].key"
+              v-if="dataRole.includes('memberCode')"
               align="center"
               prop="memberCode"
               width="130"
               :label="'收益编号'"
             />
             <el-table-column
-              v-if="dataList[13].key"
+              v-if="dataRole.includes('memberName')"
               align="center"
               prop="memberName"
               width="130"
               :label="'收益姓名'"
             />
             <el-table-column
-              v-if="dataList[14].key"
+              v-if="dataRole.includes('pkSettleGradeVal')"
               align="center"
               prop="pkSettleGradeVal"
               width="130"
               :label="'结算等级'"
             />
             <el-table-column
-              v-if="dataList[15].key"
+              v-if="dataRole.includes('pkAwardsVal')"
               align="center"
               prop="pkAwardsVal"
               width="130"
@@ -359,49 +359,49 @@
             <!--              :label="item.text"-->
             <!--            />-->
             <el-table-column
-              v-if="menuList[9].checked == true && dataList[16].key"
+              v-if="menuList[9].checked == true && dataRole.includes('round')"
               align="center"
               prop="round"
               width="130"
               :label="'直推轮数'"
             />
             <el-table-column
-              v-if="menuList[10].checked == true && dataList[17].key"
+              v-if="menuList[10].checked == true && dataRole.includes('second')"
               align="center"
               prop="second"
               width="130"
               :label="'直推次数'"
             />
             <el-table-column
-              v-if="menuList[11].checked == true && dataList[18].key"
+              v-if="menuList[11].checked == true && dataRole.includes('currentTouch')"
               align="center"
               prop="currentTouch"
               width="130"
               :label="'当前碰次'"
             />
             <el-table-column
-              v-if="menuList[12].checked == true && dataList[19].key"
+              v-if="menuList[12].checked == true && dataRole.includes('expandTouch')"
               align="center"
               prop="expandTouch"
               width="130"
               :label="'拓展碰次'"
             />
             <el-table-column
-              v-if="menuList[13].checked == true && dataList[20].key"
+              v-if="menuList[13].checked == true && dataRole.includes('currentGeneration')"
               align="center"
               prop="currentGeneration"
               width="130"
               :label="'当前代数'"
             />
             <el-table-column
-              v-if="menuList[14].checked == true && dataList[21].key"
+              v-if="menuList[14].checked == true && dataRole.includes('coachGeneration')"
               align="center"
               prop="coachGeneration"
               width="130"
               :label="'辅导代数'"
             />
             <el-table-column
-              v-if="menuList[1].checked == true && dataList[22].key"
+              v-if="menuList[1].checked == true && dataRole.includes('expandNoCappingOri')"
               align="center"
               prop="expandNoCappingOri"
               width="130"
@@ -409,7 +409,7 @@
               :formatter="stateFormat"
             />
             <el-table-column
-              v-if="menuList[2].checked == true && dataList[23].key"
+              v-if="menuList[2].checked == true && dataRole.includes('expandCappingOri')"
               align="center"
               prop="expandCappingOri"
               width="130"
@@ -417,7 +417,7 @@
               :formatter="stateFormat"
             />
             <el-table-column
-              v-if="menuList[3].checked == true && dataList[24].key"
+              v-if="menuList[3].checked == true && dataRole.includes('expandNormalHalfOri')"
               align="center"
               prop="expandNormalHalfOri"
               width="130"
@@ -425,7 +425,7 @@
               :formatter="stateFormat"
             />
             <el-table-column
-              v-if="menuList[4].checked == true && dataList[25].key"
+              v-if="menuList[4].checked == true && dataRole.includes('expandNormalRealOri')"
               align="center"
               prop="expandNormalRealOri"
               width="130"
@@ -433,7 +433,7 @@
               :formatter="stateFormat"
             />
             <el-table-column
-              v-if="dataList[26].key"
+              v-if="dataRole.includes('pretaxIncomeOri')"
               align="center"
               prop="pretaxIncomeOri"
               width="130"
@@ -441,7 +441,7 @@
               :formatter="stateFormat"
             />
             <el-table-column
-              v-if="dataList[27].key"
+              v-if="dataRole.includes('realIncomeOri')"
               align="center"
               prop="realIncomeOri"
               width="130"
@@ -466,35 +466,35 @@
               :formatter="stateFormat"
             /> -->
             <el-table-column
-              v-if="dataList[34].key"
+              v-if="dataRole.includes('bonusName')"
               align="center"
               prop="bonusName"
               width="130"
               :label="'收益类型'"
             />
             <el-table-column
-              v-if="dataList[35].key"
+              v-if="dataRole.includes('incomeStatusVal')"
               align="center"
               prop="incomeStatusVal"
               width="130"
               :label="'收益状态'"
             />
             <el-table-column
-              v-if="dataList[36].key"
+              v-if="dataRole.includes('vertexName')"
               align="center"
               prop="vertexName"
               width="130"
               :label="'隶属体系'"
             />
             <el-table-column
-              v-if="dataList[37].key"
+              v-if="dataRole.includes('teamName')"
               align="center"
               prop="teamName"
               width="130"
               :label="'隶属团队'"
             />
             <el-table-column
-              v-if="dataList[38].key"
+              v-if="dataRole.includes('remark')"
               align="center"
               prop="remark"
               width="350"
@@ -502,21 +502,21 @@
               :show-overflow-tooltip="true"
             />
             <el-table-column
-              v-if="dataList[39].key"
+              v-if="dataRole.includes('incomeRatio')"
               align="center"
               prop="incomeRatio"
               width="130"
               :label="'收益占比' + '(%)'"
             />
             <el-table-column
-              v-if="dataList[40].key"
+              v-if="dataRole.includes('incomeDialRatio')"
               align="center"
               prop="incomeDialRatio"
               width="130"
               :label="'收益拨比' + '(%)'"
             />
             <el-table-column
-              v-if="dataList[41].key"
+              v-if="dataRole.includes('orderDialRatio')"
               align="center"
               prop="orderDialRatio"
               width="130"
@@ -746,176 +746,7 @@ export default {
       pkMemberTeam: [],
       pkVertex: [],
       typeId: '',
-      dataList: [
-        {
-          name: 'period',
-          key: ''
-        },
-        {
-          name: 'settleDate',
-          key: ''
-        },
-        {
-          name: 'orderCode',
-          key: ''
-        },
-        {
-          name: 'orderTypeVal',
-          key: ''
-        },
-        {
-          name: 'sourceCountryName',
-          key: ''
-        },
-        {
-          name: 'sourceMemberCode',
-          key: ''
-        },
-        {
-          name: 'sourceMemberName',
-          key: ''
-        },
-        {
-          name: 'orderAmount',
-          key: ''
-        },
-        {
-          name: 'orderAchieveOri',
-          key: ''
-        },
-        {
-          name: 'orderAmountDollar',
-          key: ''
-        },
-        {
-          name: 'orderAchieve',
-          key: ''
-        },
-        {
-          name: 'settleCountry',
-          key: ''
-        },
-        {
-          name: 'memberCode',
-          key: ''
-        },
-        {
-          name: 'memberName',
-          key: ''
-        },
-        {
-          name: 'pkSettleGradeVal',
-          key: ''
-        },
-        {
-          name: 'pkAwardsVal',
-          key: ''
-        },
-        {
-          name: 'round',
-          key: ''
-        },
-        {
-          name: 'second',
-          key: ''
-        },
-        {
-          name: 'currentTouch',
-          key: ''
-        },
-        {
-          name: 'expandTouch',
-          key: ''
-        },
-        {
-          name: 'currentGeneration',
-          key: ''
-        },
-        {
-          name: 'coachGeneration',
-          key: ''
-        },
-        {
-          name: 'expandNoCappingOri',
-          key: ''
-        },
-        {
-          name: 'expandCappingOri',
-          key: ''
-        },
-        {
-          name: 'expandNormalHalfOri',
-          key: ''
-        },
-        {
-          name: 'expandNormalRealOri',
-          key: ''
-        },
-        {
-          name: 'pretaxIncomeOri',
-          key: ''
-        },
-        {
-          name: 'realIncomeOri',
-          key: ''
-        },
-        {
-          name: 'expandNoCapping',
-          key: ''
-        },
-        {
-          name: 'expandCapping',
-          key: ''
-        },
-        {
-          name: 'expandNormalHalf',
-          key: ''
-        },
-        {
-          name: 'expandNormalReal',
-          key: ''
-        },
-        {
-          name: 'pretaxIncome',
-          key: ''
-        },
-        {
-          name: 'realIncome',
-          key: ''
-        },
-        {
-          name: 'bonusName',
-          key: ''
-        },
-        {
-          name: 'incomeStatusVal',
-          key: ''
-        },
-        {
-          name: 'vertexName',
-          key: ''
-        },
-        {
-          name: 'teamName',
-          key: ''
-        },
-        {
-          name: 'remark',
-          key: ''
-        },
-        {
-          name: 'incomeRatio',
-          key: ''
-        },
-        {
-          name: 'incomeDialRatio',
-          key: ''
-        },
-        {
-          name: 'orderDialRatio',
-          key: ''
-        }
-      ],
+      dataRole: [],
       flag: false
     }
   },
@@ -931,11 +762,13 @@ export default {
     // this.select.endDate = s2
     // this.creationTime = [s1, s1]
 
-    setTimeout(() => {
-      this.getDataList()
-    }, 50)
+    // setTimeout(() => {
+    //   this.getDataList()
+    // }, 50)
 
-    this.getUserRole()
+    this.getUserRole().then(() => {
+      this.getDataList()
+    })
   },
   methods: {
     getPayTime() {
@@ -992,15 +825,14 @@ export default {
     },
     isLocalSymbol,
     getUserRole() {
-      getRoleMenu('sourceBonus').then((res) => {
-        this.dataList.forEach((item) => {
-          res.data.forEach((items) => {
-            if (item.name == items) {
-              item.key = items
-            }
-          })
+      return new Promise((resolve, reject) => {
+        getRoleMenu('sourceBonus').then((res) => {
+          this.dataRole = res.data || []
+          this.flag = true
+          resolve(true)
+        }).catch((err) => {
+          reject(err)
         })
-        this.flag = true
       })
     },
     stateFormat,