lex 2 years ago
parent
commit
3755f883e7

+ 4 - 9
src/views/levelManager/levelManager.vue

@@ -162,13 +162,13 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
-                    <el-form-item label="证件号码">
-                      <span>{{ props.row.idcard }}</span>
+                    <el-form-item label="性别">
+                      <span>{{ props.row.gender == 1 ? "男" : "女" }}</span>
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
-                    <el-form-item label="性别">
-                      <span>{{ props.row.gender == 1 ? "男" : "女" }}</span>
+                    <el-form-item label="备注">
+                      <span>{{ props.row.memo }}</span>
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
@@ -183,11 +183,6 @@
                       <span>{{ props.row.school }}</span>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="备注">
-                      <span>{{ props.row.memo }}</span>
-                    </el-form-item>
-                  </el-col>
                 </el-row>
               </el-form>
             </template>

+ 18 - 17
src/views/levelManager/model/levelSettingUpdate.vue

@@ -15,9 +15,27 @@
       label-width="100px"
     >
       <el-form-item
+        label="报考项目"
+        :rules="[{ required: true, message: '请输入报考项目' }]"
+        prop="degreeType"
+      >
+        <el-select
+          class="multiple"
+          v-model.trim="forms.degreeType"
+          filterable
+          clearable
+          placeholder="报考项目"
+          @change="onChangeDegreeType"
+        >
+          <el-option value="GRADE" label="专业考级"></el-option>
+          <el-option value="THEORY" label="乐理考级"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
         label="声部"
         :rules="[{ required: true, message: '请选择声部' }]"
         prop="subjectId"
+        v-if="forms.degreeType === 'GRADE'"
       >
         <el-select
           style="width: 100% !important;"
@@ -35,23 +53,6 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        label="报考项目"
-        :rules="[{ required: true, message: '请输入报考项目' }]"
-        prop="level"
-      >
-        <el-select
-          class="multiple"
-          v-model.trim="forms.degreeType"
-          filterable
-          clearable
-          placeholder="报考项目"
-          @change="onChangeDegreeType"
-        >
-          <el-option value="GRADE" label="专业考级"></el-option>
-          <el-option value="THEORY" label="乐理考级"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item
         label="级别"
         :rules="[{ required: true, message: '请输入级别' }]"
         prop="level"