Merge branch 'main' of https://git.dlongt.com/yangdj001/tianze_web

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>
@@ -88,7 +88,7 @@
               <template slot-scope="scope">
                 <p style="writing-mode: lr-tb;width: 20px;margin: 0 auto;">
                   <el-image class="user_img" :src="jigou"></el-image>
-                  机构投资账户
+                  企业投资账户
                 </p>
               </template>
             </el-table-column>
@@ -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>
@@ -213,7 +213,7 @@ export default {
         label: '现金账户'
       }, {
         value: '选项2',
-        label: 'p2p账户'
+        label: '网络融资账户'
       }, {
         value: '选项3',
         label: '众筹账户'
@@ -237,7 +237,7 @@ export default {
       accountTypeMap:{
         CASH_ACCOUNT:"现金账户",
         BANK_ACCOUNT:"银行账户",
-        P2P_ACCOUNT:"P2P账户",
+        P2P_ACCOUNT:"网络融资账户",
         CROWDFUNDING_ACCOUNT:"众筹账户",
         EQUITY_FUND_INVESTMENT_ACCOUNT:"股票基金投资账户",
         FUTURES_INVESTMENT_ACCOUNT:"期货投资账户",
@@ -251,6 +251,7 @@ export default {
         TRUST_ACCOUNT:"信托账户",
         INSURANCE_ACCOUNT:"保险账户",
         SUPPLY_CHAIN_ASSET_ACCOUNT:"供应链资产账户",
+        FINANCIAL_ACCOUNT:"理财账户",
       }
     };
   },
@@ -280,14 +281,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;
+        }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 = {