Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/views/finance/assetsRealFundStat.vue

@@ -92,6 +92,11 @@
                             <span>{{ row.principalName }}</span>
                         </template>
                     </el-table-column>
+                    <el-table-column label="参与人" width="100" align="center">
+                        <template slot-scope="{row}">
+                            <span>{{ row.joiner }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="付款方" width="150" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.payer }}</span>

src/views/finance/settleAssets.vue

@@ -106,11 +106,11 @@
                                 <span>{{ row.principal }}</span>
                             </template>
                         </el-table-column>
-                        <!-- <el-table-column label="参与人"  align="center">
-                  <template slot-scope="{row}">
-                    <span>{{ row.principal }}</span>
-                  </template>
-                </el-table-column> -->
+                        <el-table-column label="参与人"  align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.joiner }}</span>
+                            </template>
+                        </el-table-column>
                         <el-table-column label="结算金额(元)" align="center">
                             <template slot-scope="{row}">
                                 <span style="color:red;font-weight: bold;">{{ row.claimAmount }}</span>
@@ -240,11 +240,11 @@
                                 <span>{{ row.principal }}</span>
                             </template>
                         </el-table-column>
-                        <!-- <el-table-column label="参与人"  align="center">
-                  <template slot-scope="{row}">
-                    <span>{{ row.principal }}</span>
-                  </template>
-                </el-table-column> -->
+                        <el-table-column label="参与人"  align="center">
+                            <template slot-scope="{row}">
+                                <span>{{ row.joiner }}</span>
+                            </template>
+                        </el-table-column>
                         <el-table-column label="结算金额(元)" align="center">
                             <template slot-scope="{row}">
                                 <span style="color:red;font-weight: bold;">{{ row.claimAmount }}</span>