From 59804f5891d119208fbfab266bd51044fa917bbf Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 16 Aug 2022 17:36:44 +0800
Subject: [PATCH] 30802

---
 .../AppGridMemberScore/components/gridScoreManage.vue    | 6 ++++--
 .../AppGridMemberScore/components/gridScoreRules.vue     | 4 +++-
 .../components/gridScoreStatistics.vue                   | 9 +++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
index e2e24878..0be409da 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
@@ -5,7 +5,7 @@
         <ai-search-bar>
           <template #left>
             <el-button type="primary" size="small" icon="iconfont iconAdd" @click="changeIntegral('',0)">&nbsp;批量调整积分</el-button>
-            <el-cascader ref="cascader1" clearable v-model="search.girdId" :options="girdOptions" placeholder="所属网格" size="small" 
+            <el-cascader ref="cascader1" clearable v-model="girdIdList" :options="girdOptions" placeholder="所属网格" size="small" 
               :props="defaultProps" :show-all-levels="false" @change="gridChange"></el-cascader>
           </template>
           <template #right>
@@ -86,6 +86,7 @@ export default {
         sortFiled: '',
         sortRule: '',
       },
+      girdIdList: [],
       tableData: [],
       page: {size: 10, total: 0},
       current: 1,
@@ -204,6 +205,7 @@ export default {
     },
 
     gridChange(val) {
+      this.girdIdList = val
       this.search.girdId = val?.[val.length - 1]
       this.$refs.cascader1.dropDownVisible = false;
       this.getTableData()
@@ -257,7 +259,7 @@ export default {
             integralCalcType: this.form.integralCalcType,
             integral: this.form.integral,
           }).then(res => {
-            if(res.code == 0) {
+            if(res?.code == 0) {
               this.$message.success('调整积分成功')
               setTimeout(() =>{
                 this.dialog = false
diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
index a5864da5..dde7ac51 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
@@ -7,7 +7,7 @@
         <ai-search-bar>
           <template #left>
             <el-button type="primary" icon="iconfont iconAdd" @click="dialog = true">&nbsp;添加</el-button>
-            <el-cascader size="small" v-model="search.systemRuleId" :options="rulesOps" placeholder="请选择事件/类型" clearable :props="rulesProps" @change="handleTypeSearch" ref="eventTypeSearch"/>
+            <el-cascader size="small" v-model="systemRuleIdList" :options="rulesOps" placeholder="请选择事件/类型" clearable :props="rulesProps" @change="handleTypeSearch" ref="eventTypeSearch"/>
             <ai-select v-model="search.status" @change="(page.current = 1), getList()" placeholder="请选择状态" :selectList="$dict.getDict('integralRuleStatus')">
             </ai-select>
           </template>
@@ -151,6 +151,7 @@ export default {
         systemRuleId: "",
         ruleName: ""
       },
+      systemRuleIdList: [],
       page: { current: 1, size: 10, total: 0 },
       colConfigs: [
         {
@@ -349,6 +350,7 @@ export default {
       });
     },
     handleTypeSearch(v) {
+      this.systemRuleIdList = v
       this.search.systemRuleId = v?.[v.length - 1];
       this.search.ruleName = this.$refs.eventTypeSearch.getCheckedNodes()[0]?.label
       this.page.current = 1;
diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
index b93a32dc..6ba8dc6e 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
@@ -8,7 +8,7 @@
             <span v-for="(item,index) in timeCheck" :key="index" :class="type == index? 'active':''"
              @click="timeChange(index)">{{ item }}</span>
           </div>
-            <el-cascader ref="cascader1" v-model="girdId" :options="girdOptions" placeholder="所属网格" size="small" 
+            <el-cascader ref="cascader1" v-model="girdArr" :options="girdOptions" placeholder="所属网格" size="small" 
               :props="defaultProps" :show-all-levels="false" @change="gridChange" clearable></el-cascader>
         </div>
       </div>
@@ -56,7 +56,7 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <el-cascader ref="cascader2" v-model="search.girdId" :options="girdOptions" placeholder="所属网格" size="small" 
+            <el-cascader ref="cascader2" v-model="girdIdArr" :options="girdOptions" placeholder="所属网格" size="small" 
               :props="defaultProps" :show-all-levels="false" clearable @change="gridChangeOpt"></el-cascader>
             <ai-select v-model="search.integralType" placeholder="请选择类型" @change="current=1, getTableData()" 
             :selectList="dict.getDict('integralType')"/>
@@ -140,6 +140,7 @@ export default {
         startTime: '',
         endTime: '',
       },
+      girdIdArr:[],
       page: {
         size: 10,
         total: 0,
@@ -156,10 +157,12 @@ export default {
       endTime: '',
       data: {},
       girdId: '',
+      girdArr: [],
       girdOptions: [],
       defaultProps: {
         label: 'girdName',
         value: 'id',
+        children: 'children',
         checkStrictly: true,
       },
       details: {},
@@ -247,6 +250,7 @@ export default {
     },
 
     gridChangeOpt(val) {
+      this.girdIdArr = val
       this.search.girdId = val?.[val.length - 1]
       this.$refs.cascader2.dropDownVisible = false;
       this.getTableData()
@@ -387,6 +391,7 @@ export default {
       this.myChart2.resize()
     },
     gridChange(val) {
+      this.girdArr = val
       this.girdId = val?.[val.length - 1]
       this.$refs.cascader1.dropDownVisible = false;
       this.getStatistics()