积分明细

packages/conv/creditScore/AppGridMemberScore/AppGridMemberScore.vue

@@ -18,7 +18,7 @@ export default {
   props: {
     instance: Function,
     dict: Object,
-    permissions: Function
+    permissions: Function,
   },
 
   computed: {

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

@@ -35,7 +35,7 @@ export default {
   props: {
     instance: Function,
     dict: Object,
-    permissions: Function
+    permissions: Function,
   },
 
   data() {

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

@@ -34,21 +34,10 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <el-select size="small" style="width: 200px;" v-model="search.girdId" placeholder="类型" clearable
+            <ai-select v-model="type" placeholder="请选择类型" @change="page.current=1,getIntegralChange()" 
-                      @change="getListInit()">
+            :selectList="dict.getDict('integralDetailType')"/>
-              <el-option
-                  v-for="(item,i) in girdList"
-                  :key="i"
-                  :label="item.girdName"
-                  :value="item.id"
-              >
-              </el-option>
-            </el-select>
           </template>
           <template #right>
-            <!-- <el-input size="small" placeholder="请输入居民名称或真实姓名" v-model="search.name" clearable
-              @clear="page.current = 1, search.name = '', getTableData()" suffix-icon="iconfont iconSearch"
-              v-throttle="() => {(page.current = 1), getTableData();}" style="margin-right: 16px;"/> -->
             <ai-download :instance="instance" url="" :params="search" fileName="网格员积分"
                          :disabled="tableData.length == 0">
               <el-button size="small">导出</el-button>
@@ -67,22 +56,25 @@
 import * as echarts from 'echarts';
 export default {
   name: "gridScoreDetail",
-  label: "网格员积分详情",
   data() {
     return {
       myChart: null,
       tableData: [],
       search: {
-        current: 1,
         name: '',
         girdId: '',
       },
-      page: {current: 1, size: 10, total: 0},
+      page: {
+        current: 1, 
+        size: 10, 
+        total: 0
+      },
       girdList: [],
       timeList: [],
       data: {},
       startTime: '',
       endTime: '',
+      type: '',
     }
   },
   props: {
@@ -101,7 +93,7 @@ export default {
     colConfigs() {
       return [
         { prop: "doTime", label: '时间', align: "left", width: "200px" },
-        { prop: "integralType", label: '类型', align: "center", width: "180px" },
+        { prop: "integralType", label: '类型', align: "center", width: "180px", dict:"integralDetailType"},
         { prop: "changeIntegral", label: '变动积分', align: "center",width: "200px" },
         { prop: "nowIntegral", label: '剩余积分', align: "center",width: "200px" },
         { prop: "eventDesc", label: '事件', align: "center", },
@@ -109,13 +101,18 @@ export default {
     }
   },
   created() {
+    this.$dict.load('integralDetailType')
     this.getDetail()
     this.getIntegralChange()
   },
   methods: {
     // 详情
     getDetail() {
-      this.instance.post(`/app/appintegraluser/girdDetail?id`).then(res=>{
+      this.instance.post(`/app/appintegraluser/girdDetail`,null,{
+        params: {
+          id: this.$route.query.id
+        }
+      }).then(res=>{
         if(res?.data) {
           this.data = res.data
         }
@@ -127,13 +124,14 @@ export default {
     // 余额变动明细
     getIntegralChange() {
       this.instance.post(`/app/appintegraluser/getChangeDetail`, null, {
-        param: { 
+        params: {
           ...this.page,
-          type: this.type  //积分类型
+          type: this.type,  //积分类型
+          id: this.$route.query.id,
         }
       }).then(res => {
         if(res?.data) {
-          this.tableData = res.data.detailList
+          this.tableData = res.data.records
         }
       })
     },

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

@@ -74,7 +74,7 @@ export default {
   props: {
     instance: Function,
     dict: Object,
-    permissions: Function
+    permissions: Function,
   },
   data() {
     return {
@@ -214,7 +214,7 @@ export default {
       this.$emit('change', {
         type: 'gridScoreDetail',
         params: {
-          id: id || ''
+          id: id
         }
       })
     }

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

@@ -120,6 +120,9 @@ export default {
         {prop: "type", label: "类型", dict: "integralRuleEventType"},
         {prop: "ruleType", label: "规则", dict: "integralRuleRuleType"},
         {prop: "scoringCycle", label: "周期范围", dict: "integralRuleScoringCycle"},
+        // {prop: "", label: "积分分值", dict: "integralRuleScoringCycle"},
+        {slot: "integral",label: "积分分值", align: "center"},
+        {prop: "", label: "有效范围", dict: "integralRuleScoringCycle"},
         {prop: "status", label: "状态", align: "center", width: 96, dict: "integralRuleStatus"},
         {slot: "options", label: "操作", align: "center"},
       ],

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

@@ -57,6 +57,11 @@
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="changeIntegral" label="积分" align="center">
+            <template slot-scope="{ row }">
+              <span>{{ row.integralCalcType == 1 ? '+' : '-' }}{{ row.changeIntegral }}</span>
+            </template>
+          </el-table-column>
           <el-table-column slot="options" label="操作"  align="center">
             <template slot-scope="{ row }">
               <el-button type="text" @click="open(row.id)">详情</el-button>
@@ -144,8 +149,15 @@ export default {
         { prop: "integralUserName", label: '姓名', align: "left", width: "200px" },
         { prop: "girdName", label: '所属网格', align: "center", width: "180px" },
         { prop: "eventDesc", label: '事件', align: "center",width: "200px" },
-        { prop: "integralType", label: '类型', align: "center",width: "200px" },
+        { prop: "integralType", label: '类型', align: "center",width: "200px", dict:"integralDetailType" },
-        { prop: "changeIntegral", label: '积分变动', align: "center", },
+        //   render: (h, {row}) => {
+        //       return h('span', {
+        //         style: {
+        //           // color: row.status === '0' ? 'red' : '#333'
+        //         }
+        //       }, (row.integralCalcType == '0' ? `- ${row.integralCalcType}` : `+ ${row.integralCalcType}`))
+        //     } },
+        { slot: "changeIntegral", label: '积分变动', align: "center", },
         { prop: "nowIntegral", label: '剩余积分', align: "center", },
         { prop: "createTime", label: '时间', align: "center", },
         { slot: "options" }