From d0b9c6e89c914140b09f83b98ce2207344620adb Mon Sep 17 00:00:00 2001
From: chenruiye <862859104@qq.com>
Date: Tue, 22 Apr 2025 10:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=96=E5=8A=B1=E9=85=8D=E7=BD=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=A5=96=E5=8A=B1=E5=8F=91=E6=94=BE=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=20-=E4=BF=AE=E6=94=B9=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ssGuild/rewardConfiguration.vue      | 18 ++++++++++++++----
 src/views/ssGuild/rewardDistributionRecord.vue | 18 ++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/views/ssGuild/rewardConfiguration.vue b/src/views/ssGuild/rewardConfiguration.vue
index 3fe961a..d14e1a3 100644
--- a/src/views/ssGuild/rewardConfiguration.vue
+++ b/src/views/ssGuild/rewardConfiguration.vue
@@ -14,7 +14,7 @@
         <div class="inquire" v-if="levelList.length > 0 && formData.type !=''">
             <span>等级</span>
             <el-select v-model="formData.level" placeholder="请选择">
-                <el-option v-for="item in levelList" :key="item.level" :label="item.name" :value="item.level">
+                <el-option v-for="item in levelList" :key="item.level" :label="item.level + '('+item.name + ')'" :value="item.level">
                 </el-option>
             </el-select>
         </div>
@@ -46,7 +46,7 @@
             </el-table-column>
         </el-table>
         <!-- 分页 -->
-        <el-pagination style="margin-top: 10px" class="paginationClass" :current-page="formData.page"
+        <el-pagination style="margin-top: 10px" class="paginationClass" :current-page="formData.pageNo"
             :page-size="formData.pageSize" :page-sizes="[10, 20, 50, 100, 200]" layout="sizes, prev, pager, next"
             :total="tableData.total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
 
@@ -68,7 +68,7 @@
                 <span style="display: inline-block; margin-right: 20px; width: 100px"
                     class="col-sm-2 control-label">等级</span>
                 <el-select v-model="addFormData.level" placeholder="请选择">
-                    <el-option v-for="item in addlevelList" :key="item.level" :label="item.name" :value="item.level">
+                    <el-option v-for="item in addlevelList" :key="item.level" :label="item.level + '('+item.name + ')'" :value="item.level">
                     </el-option>
                 </el-select>
             </div>
@@ -234,6 +234,14 @@ export default {
                 }
             })
         }
+        const handleSizeChange = (val) => {
+            formData.pageSize = val;
+            getData();
+        };
+        const handleCurrentChange = (val) => {
+            formData.pageNo = val;
+            getData();
+        };
         onMounted(() => {
             getActivitylList().then(res => {
                 if (res.code == 200) {
@@ -263,7 +271,9 @@ export default {
             addchangeLevel,
             addlevelList,
             dialogType,
-            resetAddFormData
+            resetAddFormData,
+            handleSizeChange,
+            handleCurrentChange
         }
     }
 }
diff --git a/src/views/ssGuild/rewardDistributionRecord.vue b/src/views/ssGuild/rewardDistributionRecord.vue
index 8ea5629..ea7ddeb 100644
--- a/src/views/ssGuild/rewardDistributionRecord.vue
+++ b/src/views/ssGuild/rewardDistributionRecord.vue
@@ -18,7 +18,7 @@
         <div class="inquire" v-if="levelList.length > 0 && formData.type !=''">
             <span>等级</span>
             <el-select v-model="formData.level" placeholder="请选择">
-                <el-option v-for="item in levelList" :key="item.level" :label="item.name" :value="item.level">
+                <el-option v-for="item in levelList" :key="item.level" :label="item.level + '('+item.name + ')'" :value="item.level">
                 </el-option>
             </el-select>
         </div>
@@ -53,7 +53,7 @@
 
         </el-table>
         <!-- 分页 -->
-        <el-pagination style="margin-top: 10px" class="paginationClass" :current-page="formData.page"
+        <el-pagination style="margin-top: 10px" class="paginationClass" :current-page="formData.pageNo"
             :page-size="formData.pageSize" :page-sizes="[10, 20, 50, 100, 200]" layout="sizes, prev, pager, next"
             :total="tableData.total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </div>
@@ -62,7 +62,7 @@
 <script>
 import { ref, onMounted, reactive } from 'vue'
 import PartitionSelect from "@/views/common/partitionSelect.vue";
-import { getActivitylList, getLevelList, getAwardList, getAwardTypeList, saveAwardList, delAwardList, updateAwardList ,getAwardRecordList} from "@/api/SsGuild/rewardConfiguration.js";
+import { getActivitylList, getLevelList,getAwardRecordList} from "@/api/SsGuild/rewardConfiguration.js";
 import { ElMessage, ElMessageBox } from "element-plus";
 export default {
     name: 'rewardDistributionRecord',
@@ -115,6 +115,14 @@ export default {
             const date = new Date(row);
              return date.format("yyyy-MM-dd hh:mm:ss");
         }
+        const handleSizeChange = (val) => {
+            formData.pageSize = val;
+            getData();
+        };
+        const handleCurrentChange = (val) => {
+            formData.pageNo = val;
+            getData();
+        };
         onMounted(() => {
             getActivitylList().then(res => {
                 if (res.code == 200) {
@@ -129,7 +137,9 @@ export default {
             activitylList,
             levelList,
             changeLevel,
-            dateFormat
+            dateFormat,
+            handleSizeChange,
+            handleCurrentChange
         }
     }
 }