Merge remote-tracking branch 'origin/dev' into dev

packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue

@@ -155,7 +155,6 @@ export default {
         }
       }).then(res => {
         if(res?.data) {
-          console.log(res.data.records);
           this.tableData = res.data.records
           this.page.total = res.data.total
         }

packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue

@@ -14,7 +14,14 @@
       </div>
       <div class="card_list">
         <div class="card">
-          <h2>剩余积分汇总<i class="el-icon-warning-outline"></i></h2>
+          <h2>剩余积分汇总
+            <el-tooltip
+              placement="right"
+              style="width: 240px;"
+              content="截止目前所有网格员剩余可用积分余额的总和">
+              <i class="iconfont iconModal_Warning"></i>
+            </el-tooltip>
+          </h2>
           <p class="color1">{{ data.nowIntegral || 0 }}</p>
         </div>
         <div class="card">
@@ -43,8 +50,8 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <el-cascader ref="cascader1" v-model="girdId" :options="girdOptions" placeholder="所属网格" size="small" 
-              :props="defaultProps" :show-all-levels="false" @change="gridChange"></el-cascader>
+            <el-cascader ref="cascader2" v-model="search.girdId" :options="girdOptions" placeholder="所属网格" size="small" 
+              :props="defaultProps" :show-all-levels="false" @change="gridChangeOpt"></el-cascader>
             <!-- <el-date-picker v-model="time" size="small" type="daterange" value-format="yyyy-MM-dd" 
               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker> -->
@@ -75,13 +82,15 @@
       <ai-detail>
         <template #content>
           <ai-wrapper>
-            <ai-info-item label="户主"/>
-            <ai-info-item label="对象"/>
-            <ai-info-item label="事件" isLine/>
-            <ai-info-item label="时间" isLine/>
-            <ai-info-item label="积分"/>
-            <ai-info-item label="积分余额"/>
-            <ai-info-item label="凭证" isLine></ai-info-item>
+            <ai-info-item label="姓名" :value="details.integralUserName" />
+            <ai-info-item label="所属网格" :value="details.girdName"/>
+            <ai-info-item label="事件" isLine :value="details.eventDesc"/>
+            <ai-info-item label="时间" isLine :value="details.createTime"/>
+            <ai-info-item label="积分">{{ details.integralCalcType==0? '-' : '+' }}{{ details.changeIntegral }}</ai-info-item>
+            <ai-info-item label="积分余额" :value="details.nowIntegral"/>
+            <ai-info-item label="凭证" isLine v-if="fileDownLoad.length">
+              <ai-file-list :fileList="fileDownLoad" style="width: 200px;"></ai-file-list>
+            </ai-info-item>
           </ai-wrapper>
         </template>
       </ai-detail>
@@ -119,9 +128,9 @@ export default {
       search: {
         current: 1,
         name: '',
-        girdId: '',
+        girdId: ''
       },
-      page: {current: 1, size: 10, total: 0},
+      page: {current: 1, size: 10,total: 0,},
       girdList: [],
       time: '',
       timeCheck: ['昨日','近7天','近30天','自定义'],
@@ -139,7 +148,12 @@ export default {
         value: 'id',
         checkStrictly: true,
         expandTrigger: 'hover',
-      }
+      },
+      details: {},
+      fileDownLoad: [],
+      girdSortList: [],
+      userSortList: [],
+      
     }
   },
   computed: {
@@ -198,7 +212,9 @@ export default {
           endTime: this.endTime
         }
       }).then((res) => {
-        console.log(res);
+        console.log(res, '积分排行');
+        this.userSortList = res.data.userSortList
+        this.girdSortList = res.data.girdSortList
       })
     },
     // 积分明细
@@ -206,11 +222,10 @@ export default {
       this.instance.post('/app/appintegraluser/girdIntegralDetail',null,{
         params: {
           ...this.page,
-          girdId: this.girdIdUser,
+          ...this.search,
           integralType: this.integralType,
           startTime: this.startTime,
           endTime: this.endTime,
-          name: this.search.name,
         }
       }).then(res => {
         if(res?.data) {
@@ -220,6 +235,12 @@ export default {
       })
     },
 
+    gridChangeOpt() {
+      this.search.girdId = val?.[val.length - 1]
+      this.$refs.cascader2.dropDownVisible = false;
+      this.getTableData()
+    },
+
     getColEcherts1() {
       let chartDom1 = document.getElementById('chart1');
       chartDom1.style.width = (window.innerWidth - 435) / 2 + "px";
@@ -399,7 +420,10 @@ export default {
     getDetail(id) {
       this.instance.post(`/app/appintegraldetail/queryDetailById?id=${id}`).then(res=> {
         if(res?.data) {
-          console.log(res.data);
+          this.details = res.data
+          if(res.data.enclosure) {
+            this.fileDownLoad = [{ url:res.data.enclosure }]
+          }
         }
       })
     },