From 5d2c1279d8e4a7274db928497b539b991176091e Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 30 Jun 2022 18:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/AppPartyMemberScore/psDetail.vue     | 30 ++++++++++++++-----
 .../apps/AppPartyMemberScore/psList.vue       |  8 +++--
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue b/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue
index 57e8c652..b5213a81 100644
--- a/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue
+++ b/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue
@@ -2,25 +2,30 @@
   <section class="psDetail">
     <ai-detail>
       <ai-title slot="title" title="积分详情" isShowBottomBorder isShowBack @onBackClick="back"/>
+      <template #right>
+        <ai-download :instance="instance" url="/app/apppartyintegralinfo/exportListByOrg" :params="search" fileName="党员积分" :disabled="tableData.length == 0">
+          <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
+        </ai-download>
+      </template>
       <template #content>
         <el-row type="flex">
           <ai-card hideTitle class="staCard fill">
             <template #content>
               <div class="color-999" v-text="`姓名`"/>
-              <b v-text="detail.name"/>
+              <b v-text="name"/>
             </template>
           </ai-card>
           <ai-card hideTitle class="staCard fill">
             <template slot="content">
               <div class="color-999" v-text="`党员积分`"/>
-              <b class="color-26f" v-text="detail.integral||0"/>
+              <b class="color-26f" v-text="nowIntegral || 0"/>
             </template>
           </ai-card>
         </el-row>
         <ai-card title="余额变动明细">
           <template #content>
-            <ai-table :tableData="detail.integralInfoList" :isShowPagination="false" :col-configs="colConfigs"
-                      :dict="dict"/>
+            <ai-table :tableData="detail.integralInfoList" isShowPagination :total="page.total" :current.sync="page.current"
+                :size.sync="page.size" :col-configs="colConfigs" :dict="dict"/>
           </template>
         </ai-card>
       </template>
@@ -62,17 +67,26 @@ export default {
           {required: true, message: "请输入学习强国积分"},
           {pattern: /^\d+$/g, message: "请输入正整数"}
         ]
-      }
+      },
+      name: '',
+      nowIntegral: '',
+      page: {current: 1, size: 10, total: 0},
     }
   },
   methods: {
     getDetail() {
-      let {id} = this.$route.query
-      this.instance.post("/app/appparty/getPartyIntegralDetail", null, {
-        params: {id}
+      let { id, name, nowIntegral } = this.$route.query
+      this.instance.post("/app/apppartyintegralinfo/list", null, {
+        params: {
+          partyId: id,
+          ...this.page
+        }
       }).then(res => {
         if (res?.data) {
           this.detail = res.data
+          this.page.total = res.data.total
+          this.name = name
+          this.nowIntegral = nowIntegral
         }
       })
     },
diff --git a/project/sanjianxi/apps/AppPartyMemberScore/psList.vue b/project/sanjianxi/apps/AppPartyMemberScore/psList.vue
index be1c3608..2e5bac9b 100644
--- a/project/sanjianxi/apps/AppPartyMemberScore/psList.vue
+++ b/project/sanjianxi/apps/AppPartyMemberScore/psList.vue
@@ -8,6 +8,7 @@
           <ai-party-tree
               :filter-node-method="filterNode"
               ref="tree"
+              default-first-option
               :instance="instance"
               :root="user.info.organizationId"
               :current-node-key="user.info.id"
@@ -33,7 +34,7 @@
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict">
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{row}">
-              <el-button type="text" @click="showDetail(row.partyId)">详情</el-button>
+              <el-button type="text" @click="showDetail(row)">详情</el-button>
             </template>
           </el-table-column>
         </ai-table>
@@ -133,8 +134,9 @@ export default {
       return data.name.indexOf(value) !== -1
     },
 
-    showDetail(id) {
-      this.$router.push({query: {id}})
+    showDetail(row) {
+      console.log(row);
+      this.$router.push({query: { id: row.partyId, name: row.name, nowIntegral: row.nowIntegral}})
     },
   },
   created() {