Merge branch 'wxl_01_15' into online

src/views/teamBuild/components/forecast-list.vue

@@ -89,7 +89,11 @@
                         label="选报声部"
                     >
                         <template slot-scope="scope">
-                            {{ scope.row.subjectFirstName }}，{{ scope.row.subjectSecondName }}
+                            {{ scope.row.subjectFirstName ? scope.row.subjectFirstName : null }}
+                            {{ !scope.row.subjectFirstName && scope.row.subjectFirst == 999 ? '听从老师安排' : null }}，
+                            {{ scope.row.subjectSecondName ? scope.row.subjectSecondName : null }}
+                            {{ !scope.row.subjectSecondName && scope.row.subjectFirst == 999 ? '听从老师安排' : null }}
+                            <!-- {{ scope.row.subjectFirstName }}，{{ scope.row.subjectSecondName }} -->
                         </template>
                     </el-table-column>
                     <el-table-column

src/views/teamBuild/forecastName.vue

@@ -112,12 +112,22 @@
                         align="center"
                         prop="subjectFirstName"
                         label="选报声部1"
-                    ></el-table-column>
+                    >
+                        <template slot-scope="scope">
+                            {{ scope.row.subjectFirstName ? scope.row.subjectFirstName : null }}
+                            {{ !scope.row.subjectFirstName && scope.row.subjectFirst == 999 ? '听从老师安排' : null }}
+                        </template>
+                    </el-table-column>
                     <el-table-column
                         align="center"
                         prop="subjectSecondName"
                         label="选报声部2"
-                    ></el-table-column>
+                    >
+                        <template slot-scope="scope">
+                            {{ scope.row.subjectSecondName ? scope.row.subjectSecondName : null }}
+                            {{ !scope.row.subjectSecondName && scope.row.subjectFirst == 999 ? '听从老师安排' : null }}
+                        </template>
+                    </el-table-column>
                     <el-table-column
                         align="center"
                         prop="isAllowAdjust"