From f3efe0973bf36bd41eb0ca053046afd5f165b8b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com>
Date: Mon, 25 Dec 2023 11:45:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E9=85=8D=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/asset/AssetAllocation.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/pages/asset/AssetAllocation.vue b/src/pages/asset/AssetAllocation.vue
index d7e6d0c..b2aeae6 100644
--- a/src/pages/asset/AssetAllocation.vue
+++ b/src/pages/asset/AssetAllocation.vue
@@ -73,7 +73,7 @@
             </el-table-column>
             <el-table-column prop="messageAcceptState" header-align="center" align="center" label="操作" width="120">
               <template slot-scope="scope">
-                <el-link type="primary" :underline="false" disabled @click="">确定</el-link>
+                <el-link type="primary" :underline="false" @click="">确定</el-link>
               </template>
             </el-table-column>
           </el-table>
@@ -147,7 +147,7 @@
             </el-table-column>
             <el-table-column prop="messageAcceptState" header-align="center" align="center" label="操作" width="120">
               <template slot-scope="scope">
-                <el-link type="primary" :underline="false" disabled @click="">确定</el-link>
+                <el-link type="primary" :underline="false" disabled @click="allOpenAccount">确定</el-link>
               </template>
             </el-table-column>
           </el-table>
@@ -280,14 +280,21 @@ export default {
       }
     },
     getInfo(){ //获取数据
-      this.$get("/api/studentAccountAssetAllocation/getList.do",{studentId:this.identityInfo.studentId}).then((ret) =>{
+      this.$get("/api/studentAccountAssetAllocation/getList.do",{studentId:this.identityInfo.studentId,isInstitution:1}).then((ret) =>{
         if(ret.code == 0){
           this.tableData = ret.data;
-          this.noticeList = ret.data;
         }else{
           this.$message({message: ret.msg,type: 'error'});
         }
       });
+      this.$get("/api/studentAccountAssetAllocation/getList.do",{studentId:this.identityInfo.studentId,isInstitution:2}).then((ret) =>{
+        if(ret.code == 0){
+          this.noticeList= ret.data;
+        }else{
+          this.$message({message: ret.msg,type: 'error'});
+        }
+      });
+
     },
     allOpenAccount(){ //转账
       let param = {