From ac6d877af9d5b082f4927931725b002dc394eb11 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 16 Aug 2022 16:54:54 +0800
Subject: [PATCH] 30836

---
 .../components/gridScoreManage.vue            | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
index 47047a36..e2e24878 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
@@ -9,8 +9,8 @@
               :props="defaultProps" :show-all-levels="false" @change="gridChange"></el-cascader>
           </template>
           <template #right>
-            <el-input size="small" placeholder="姓名" v-model="search.name" clearable
-              @clear="current = 1, search.name = '', getTableData()" suffix-icon="iconfont iconSearch"
+            <el-input size="small" placeholder="姓名" v-model="search.userName" clearable
+              @clear="current = 1, search.userName = '', getTableData()" suffix-icon="iconfont iconSearch"
               v-throttle="() => {(current = 1), getTableData();}"/>
             <ai-download :instance="instance" url="`/app/appintegraluser/girdIntegralExport" :params="search" fileName="网格员积分"
                          :disabled="tableData.length == 0">
@@ -39,8 +39,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="选择人员" prop="ids">
           <ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseUserList"
-                            :url="'/app/appgirdmemberinfo/list?size=10'" headerTitle="网格员列表"
-                            :isMultiple="true" dialogTitle="选择" @selectPerson="selectPerson" class="aipersonselect">
+              :url="'/app/appgirdmemberinfo/list?size=10'" headerTitle="网格员列表"
+              :isMultiple="true" dialogTitle="选择" @selectPerson="selectPerson" class="aipersonselect">
             <template name="option" v-slot:option="{ item }">
               <span class="iconfont iconProlife">{{ item.name }}</span>
               <ai-id mode="show" :show-eyes="false" :value="item.idNumber"/>
@@ -79,7 +79,7 @@ export default {
   data() {
     return {
       search: {
-        name: '',
+        userName: '',
         girdId: '',
         current: 1, 
         size: 10,
@@ -211,36 +211,30 @@ export default {
 
     changeTableSort(col) {
       if(col.prop === 'integral') { // 剩余积分
+        this.search.sortFiled = 0
         if(col.order === 'ascending') {
-          this.search.sortFiled = 0
           this.search.sortRule = true
         } else if(col.order === 'descending') {
-          this.search.sortFiled = 0
           this.search.sortRule = false
         } else if(col.order === null) {
-          this.search.sortFiled = ''
           this.search.sortRule = ''
         }
       } else if(col.prop === 'totalIntegral') {  // 累计积分
+        this.search.sortFiled = 1
         if(col.order === 'ascending') {
-          this.search.sortFiled = 1
           this.search.sortRule = true
         } else if(col.order === 'descending') {
-          this.search.sortFiled = 1
           this.search.sortRule = false
         } else if(col.order === null) {
-          this.search.sortFiled = ''
           this.search.sortRule = ''
         }
       } else if(col.prop === 'usedIntegral') {  // 已用积分
+        this.search.sortFiled = 2
         if(col.order === 'ascending') {
-          this.search.sortFiled = 2
           this.search.sortRule = true
         } else if(col.order === 'descending') {
-          this.search.sortFiled = 2
           this.search.sortRule = false
         } else if(col.order === null) {
-          this.search.sortFiled = ''
           this.search.sortRule = ''
         }
       }
@@ -266,14 +260,12 @@ export default {
             if(res.code == 0) {
               this.$message.success('调整积分成功')
               setTimeout(() =>{
-                this.getTableData()
                 this.dialog = false
-              })
+                this.getTableData()
+              }, 600)
             } else {
               this.flag = false
             }
-          }).catch(() => {
-            this.flag = false
           })
         }
       })