From a39b7b7282024665add41d111f2d47fb1ddd42cf Mon Sep 17 00:00:00 2001
From: zhushengzhe <zhushengzhe@hanbangtang.com>
Date: Wed, 6 Sep 2023 16:56:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hiddenDanger/rules/rules.component.html          | 2 +-
 src/views/hiddenDanger/rules/rulesManager.component.vue    | 4 ++++
 src/views/reward/rewardsRecord/rewardsRecord.component.vue | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/hiddenDanger/rules/rules.component.html b/src/views/hiddenDanger/rules/rules.component.html
index 36fb548..be2cf6e 100644
--- a/src/views/hiddenDanger/rules/rules.component.html
+++ b/src/views/hiddenDanger/rules/rules.component.html
@@ -2,7 +2,7 @@
     <div class="common-content-box dis-flex flex-col flex-1">
         <div class="search-box">
             <FormComponent :options="formOptions" :data.sync="params" @actionCallback="callback" :actions="formActions"
-                :full-btn="false" @change="change" btn-position="end"></FormComponent>
+                :full-btn="false" @change="callback" btn-position="end"></FormComponent>
         </div>
         <div class="table-box flex-1">
             <TableComponent :tableData="tableData" :tableColumn="tableColumn" @actionCallback="callback($event)"
diff --git a/src/views/hiddenDanger/rules/rulesManager.component.vue b/src/views/hiddenDanger/rules/rulesManager.component.vue
index fd46438..caa4e70 100644
--- a/src/views/hiddenDanger/rules/rulesManager.component.vue
+++ b/src/views/hiddenDanger/rules/rulesManager.component.vue
@@ -42,6 +42,10 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
         value:"search",
         icon:"el-icon-search",
         type:"primary"
+    }, {
+        name: "清空",
+        icon: "el-icon-tickets",
+        value: "reset"
     }];
 
     public tableActions = [{
diff --git a/src/views/reward/rewardsRecord/rewardsRecord.component.vue b/src/views/reward/rewardsRecord/rewardsRecord.component.vue
index dd1d2c4..d215a10 100644
--- a/src/views/reward/rewardsRecord/rewardsRecord.component.vue
+++ b/src/views/reward/rewardsRecord/rewardsRecord.component.vue
@@ -105,6 +105,10 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
         key: "postName",
         datas: this.$store.state.postList,
         width: "270px",
+    }, {
+        name: "职务",
+        type: "text",
+        key: "dutyName",
     }];
 
     public subActions = [{
@@ -346,6 +350,9 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
     }
     // 分页数据
     public getTableData() {
+        if(this.params.postName){
+            this.params.postName = this.$store.state.postList.find((item: any) => item.value === this.params.postName)?.name??""
+        }
         this.tableService.selectByPage(this.params).then(res => {
             this.tableData = res.data as any;
         })