From c4b6b382ad48ae808b0299f09be83b444b69f065 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 8 Apr 2022 19:16:48 +0800
Subject: [PATCH] BUG 28974

---
 .../creditScore/scoreManage/pointsDetails.vue | 43 ++++++-------------
 .../creditScore/scoreRules/AppScoreRules.vue  |  1 +
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue b/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue
index eb160f27..b96f2b64 100644
--- a/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue
+++ b/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue
@@ -26,18 +26,13 @@
             :total="total"
             ref="aitableex"
             :current.sync="search.current"
-            :size.sync="search.size"
+            :size.sync="search.size" :dict="dict"
             @getList="getList">
           <el-table-column slot="changeIntegral" label="积分" align="center">
             <template slot-scope="{ row }">
               <span>{{ row.changeIntegral > 0 ? '+' : '' }}{{ row.changeIntegral }}</span>
             </template>
           </el-table-column>
-          <el-table-column slot="doType" label="类型" align="center">
-            <template slot-scope="{ row }">
-              <span>{{ dict.getLabel('integralDetailType', row.bizType) }}</span>
-            </template>
-          </el-table-column>
           <el-table-column slot="options" label="操作" align="center" fixed="right" width="120">
             <template slot-scope="{ row }">
               <el-button
@@ -76,7 +71,7 @@
           </div>
           <!-- <div>
             <span class="form_label">途径：</span>
-          <span class="form_value">{{$dict.getLabel("integralDetailBizType", dialogInfo.bizType)}}</span>
+          <span class="form_value">{{dict.getLabel("integralDetailBizType", dialogInfo.bizType)}}</span>
           </div> -->
         </div>
         <!-- <div class="form_info">
@@ -123,17 +118,8 @@ export default {
       total: 10,
       colConfigs: [
         {prop: "portalUserPhone", label: "用户账号", align: "center", width: 160},
-        {
-          prop: "ruleName",
-          label: "事件类型",
-          "show-overflow-tooltip": true,
-          width: 420
-        },
-        {
-          prop: "doTime",
-          label: "时间",
-          width: 200
-        },
+        {prop: "bizType", label: "积分来源", dict: "integralDetailType", width: 420},
+        {prop: "doTime", label: "时间", width: 200},
         // {
         //   prop: "doType",
         //   label: "类型",
@@ -145,11 +131,11 @@ export default {
         //       {
         //         class: "status-" + params.row.doType,
         //       },
-        //       this.$dict.getLabel("integralIntegralType", params.row.doType)
+        //       this.dict.getLabel("integralIntegralType", params.row.doType)
         //     );
         //   },
         // },
-        {slot: "doType", label: "类型", width: 100},
+        {prop: "doType", label: "类型", dict: "integralDoType", width: 100},
         {slot: "changeIntegral", label: "积分", width: 100},
         // {
         //   prop: "bizType",
@@ -157,7 +143,7 @@ export default {
         //   align: "center",
         //   width: 100,
         //   formart: (bizType) =>
-        //   this.$dict.getLabel("integralDetailBizType", bizType) || '-',
+        //   this.dict.getLabel("integralDetailBizType", bizType) || '-',
         // },
         {slot: "options", label: "操作", align: "center"},
       ],
@@ -169,14 +155,13 @@ export default {
     };
   },
 
-  mounted() {
-    this.$dict
-    .load([
-      "integralDeclareDoType",
-      "integralDetailType",
-      "integralDetailBizType"
-    ])
-    .then(() => {
+  created() {
+    this.dict.load(
+        "integralDoType",
+        "integralDeclareDoType",
+        "integralDetailType",
+        "integralDetailBizType",
+    ).then(() => {
       this.getList();
     });
   },
diff --git a/project/xiushan/apps/creditScore/scoreRules/AppScoreRules.vue b/project/xiushan/apps/creditScore/scoreRules/AppScoreRules.vue
index bb73a3f0..e61b80eb 100644
--- a/project/xiushan/apps/creditScore/scoreRules/AppScoreRules.vue
+++ b/project/xiushan/apps/creditScore/scoreRules/AppScoreRules.vue
@@ -41,6 +41,7 @@
             ref="aitableex"
             :current.sync="search.current"
             :size.sync="search.size"
+            :dict="dict"
             @getList="getList">
           <el-table-column slot="integral" label="分值" align="center">
             <template slot-scope="{ row }">