更新预报名字段

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

@@ -8,7 +8,7 @@
         :model="searchForm"
         ref="searchForm"
       >
-        <el-form-item>
+        <el-form-item prop="name">
           <el-input
             v-model.trim="searchForm.name"
             clearable
@@ -26,7 +26,35 @@
             <el-option label="否" :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="teacherRecommandSubjectId">
+          <el-select
+            clearable
+            v-model="searchForm.teacherRecommandSubjectId"
+            placeholder="老师推荐声部"
+          >
+            <el-option
+              v-for="item in selects.subjects"
+              :value="item.id"
+              :label="item.name"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="selectionSubjectId">
+          <el-select
+            clearable
+            v-model="searchForm.selectionSubjectId"
+            placeholder="选报声部"
+          >
+            <el-option
+              v-for="item in selects.subjects"
+              :value="item.id"
+              :label="item.name"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="subjectId">
           <el-select
             clearable
             v-model="searchForm.subjectId"
@@ -98,18 +126,50 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="subjectFirstName"
+            label="老师推荐声部"
+          >
+            <template slot-scope="scope">
+              {{
+                scope.row.teacherRecommandSubjectId ? scope.row.teacherRecommandSubjectName : null
+              }}
+              {{
+                !scope.row.teacherRecommandSubjectName && scope.row.teacherRecommandSubjectId == 999
+                  ? "听从老师安排"
+                  : null
+              }}
+              {{ !scope.row.teacherRecommandSubjectId && !scope.row.teacherRecommandSubjectName ? '无' : null }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
             label="选报声部"
           >
             <template slot-scope="scope">
               {{
+                scope.row.selectionSubjectId ? scope.row.selectionSubjectName : null
+              }}
+              {{
+                !scope.row.selectionSubjectName && scope.row.selectionSubjectId == 999
+                  ? "听从老师安排"
+                  : null
+              }}
+              {{ !scope.row.selectionSubjectId && !scope.row.selectionSubjectName ? '无' : null }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="subjectFirstName"
+            label="所选专业"
+          >
+            <template slot-scope="scope">
+              {{
                 scope.row.subjectFirstName ? scope.row.subjectFirstName : null
               }}
               {{
                 !scope.row.subjectFirstName && scope.row.subjectFirst == 999
                   ? "听从老师安排"
                   : null
-              }}，
+              }}{{ !scope.row.subjectFirstName && !scope.row.subjectFirst ? '无' : null }}，
               {{
                 scope.row.subjectSecondName ? scope.row.subjectSecondName : null
               }}
@@ -117,7 +177,7 @@
                 !scope.row.subjectSecondName && scope.row.subjectSecond == 999
                   ? "听从老师安排"
                   : null
-              }}
+              }}{{ !scope.row.subjectSecondName && !scope.row.subjectSecond ? '无' : null }}
               <!-- {{ scope.row.subjectFirstName }}，{{ scope.row.subjectSecondName }} -->
             </template>
           </el-table-column>
@@ -175,6 +235,8 @@ export default {
       musicGroupId: query.id,
       searchForm: {
         name: null,
+        teacherRecommandSubjectId: null,
+        selectionSubjectId: null,
         subjectId: null,
         isAllowAdjust: null,
         cloudTeacherMethod: null,

src/views/teamBuild/forecastName.vue

@@ -70,6 +70,34 @@
             <el-option label="否" :value="0"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="teacherRecommandSubjectId">
+          <el-select
+            clearable
+            v-model="searchForm.teacherRecommandSubjectId"
+            placeholder="老师推荐声部"
+          >
+            <el-option
+              v-for="item in selects.subjects"
+              :value="item.id"
+              :label="item.name"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="selectionSubjectId">
+          <el-select
+            clearable
+            v-model="searchForm.selectionSubjectId"
+            placeholder="选报声部"
+          >
+            <el-option
+              v-for="item in selects.subjects"
+              :value="item.id"
+              :label="item.name"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item prop="subjectId">
           <el-select
             clearable
@@ -359,6 +387,8 @@ export default {
       searchForm: {
         name: null,
         subjectId: null,
+        teacherRecommandSubjectId: null,
+        selectionSubjectId: null,
         isAllowAdjust: null,
         cloudTeacherMethod: null,
         kitPurchaseMethod: null,

src/views/teamBuild/signupList.vue

@@ -358,7 +358,7 @@
       <el-dialog
         title="预报名名单"
         :visible.sync="forecastVisible"
-        width="1100px"
+        width="1150px"
       >
         <forecastList v-if="forecastVisible" @close="forecastVisible = false" />
       </el-dialog>