From b16b5d5e6c43f0bbc9c611a3fc6fd16793b4fea2 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 18 Apr 2022 17:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=E5=AE=8C?=
 =?UTF-8?q?=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../party/AppPartyScore/AppPartyScore.vue     |  2 +-
 packages/party/AppPartyScore/psDetail.vue     | 20 ++++++++++---------
 packages/party/AppPartyScoreFlow/psfList.vue  |  6 ++++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/packages/party/AppPartyScore/AppPartyScore.vue b/packages/party/AppPartyScore/AppPartyScore.vue
index cddd8663..deafd4ad 100644
--- a/packages/party/AppPartyScore/AppPartyScore.vue
+++ b/packages/party/AppPartyScore/AppPartyScore.vue
@@ -23,7 +23,7 @@ export default {
     }
   },
   created() {
-    this.dict.load("residentType", "householdRelation")
+    this.dict.load("partyIntegralType")
   }
 }
 </script>
diff --git a/packages/party/AppPartyScore/psDetail.vue b/packages/party/AppPartyScore/psDetail.vue
index 43ab4d33..d1e2d5bc 100644
--- a/packages/party/AppPartyScore/psDetail.vue
+++ b/packages/party/AppPartyScore/psDetail.vue
@@ -13,19 +13,20 @@
           <ai-card hideTitle class="staCard fill">
             <template #content>
               <div class="color-999" v-text="`个人积分`"/>
-              <b class="color-26f" v-text="detail.name||0"/>
+              <b class="color-26f" v-text="detail.integral||0"/>
             </template>
           </ai-card>
           <ai-card hideTitle class="staCard fill">
             <template #content>
               <div class="color-999" v-text="`家庭积分`"/>
-              <b class="color-26f" v-text="detail.name||0"/>
+              <b class="color-26f" v-text="detail.familySurplusIntegral||0"/>
             </template>
           </ai-card>
         </el-row>
         <ai-card title="余额变动明细">
           <template #content>
-            <ai-table :tableData="detail.list" :isShowPagination="false" :col-configs="colConfigs" :dict="dict"/>
+            <ai-table :tableData="detail.integralInfoList" :isShowPagination="false" :col-configs="colConfigs"
+                      :dict="dict"/>
           </template>
         </ai-card>
       </template>
@@ -45,17 +46,17 @@ export default {
       detail: {},
       colConfigs: [
         {label: "时间", prop: "createTime", width: 120},
-        {label: "类型", prop: "createTime", align: 'center'},
-        {label: "变动积分", prop: "createTime", align: 'center'},
-        {label: "剩余积分", prop: "createTime", align: 'center'},
-        {label: "调整说明", prop: "createTime"},
+        {label: "类型", prop: "integralType", align: 'center', dict: "partyIntegralType"},
+        {label: "变动积分", prop: "integral", align: 'center'},
+        {label: "剩余积分", prop: "residualIntegral", align: 'center'},
+        {label: "调整说明", prop: "remark"},
       ]
     }
   },
   methods: {
     getDetail() {
       let {id} = this.$route.query
-      this.instance.post("/app/appparty/list", null, {
+      this.instance.post("/app/appparty/getPartyIntegralDetail", null, {
         params: {id}
       }).then(res => {
         if (res?.data) {
@@ -87,10 +88,11 @@ export default {
 
   .staCard {
     font-size: 14px;
+    line-height: 28px;
 
     b {
-      margin-top: 8px;
       font-size: 24px;
+      line-height: 40px;
     }
 
     & + .staCard {
diff --git a/packages/party/AppPartyScoreFlow/psfList.vue b/packages/party/AppPartyScoreFlow/psfList.vue
index 6148424d..cceefc49 100644
--- a/packages/party/AppPartyScoreFlow/psfList.vue
+++ b/packages/party/AppPartyScoreFlow/psfList.vue
@@ -115,6 +115,12 @@ export default {
         }
       })
     },
+    handleSearchTime(v) {
+      this.page.current = 1
+      this.search.startTime = v?.[0]
+      this.search.endTime = v?.[1]
+      this.getTableData()
+    }
   },
   created() {
     this.getTableData()