Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

ruoyi-ui/src/api/smartSchool/openRecruitment/index.js

@@ -473,4 +473,3 @@ export function checkEnd(examId) {
   }).then(() => {
   })
 }
-

ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/InfoReview.vue

@@ -141,9 +141,25 @@
             <div style="flex: 1">
               <el-descriptions :column="1" border>
                 <el-descriptions-item label="姓名">
-                  <div style="width: 500px">{{ form.studentName }}</div>
+                  <template v-if="isHandle">
+                    <div style="width: 700px">{{ form.studentName }}</div>
+                  </template>
+                  <template v-else>
+                    <el-form-item prop="studentName" style="min-width: 700px;">
+                      <el-input v-model="form.studentName"></el-input>
+                    </el-form-item>
+                  </template>
+                </el-descriptions-item>
+                <el-descriptions-item label="身份证号码">
+                  <template v-if="isHandle">
+                    {{ form.idCard }}
+                  </template>
+                  <template v-else>
+                    <el-form-item prop="idCard">
+                      <el-input v-model="form.idCard"></el-input>
+                    </el-form-item>
+                  </template>
                 </el-descriptions-item>
-                <el-descriptions-item label="身份证号码">{{ form.idCard }}</el-descriptions-item>
                 <el-descriptions-item label="性别">
                   <dict-tag :options="dict.type.sys_user_sex" :value="form.sex"/>
                 </el-descriptions-item>
@@ -449,6 +465,9 @@ export default {
       },
       // 表单校验
       rules: {
+        studentName: [
+          {required: true, message: "姓名不能为空", trigger: "blur"}
+        ],
         idCard: [
           {required: true, message: "身份证号不能为空", trigger: "blur"}
         ],