审核完成

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

@@ -135,19 +135,32 @@
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <el-dialog :visible.sync="open" width="1200px" append-to-body @close="cancel">
+      <el-form ref="form" :model="form" :rules="rules">
         <el-descriptions title="报名信息" border>
           <el-descriptions-item label="照片" span="3">
-          <ListImage
-            :image-url="isEmptyAvatar(form.photo, form.sex)"
-            :self-style="{ width: '150px', height: 'auto'}"
-          ></ListImage>
+            <el-image :src="baseUrl + form.photo" style="width: 150px;height: auto" fit="fill"></el-image>
           </el-descriptions-item>
           <el-descriptions-item label="姓名">{{ form.studentName }}</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>
+          <template v-if="isHandle">
+            <el-descriptions-item label="姓名（教育部）">{{ form.eduStudentName }}</el-descriptions-item>
+          </template>
+          <template v-else>
+              <el-descriptions-item label="姓名（教育部）">
+                <el-form-item prop="eduStudentName">
+                  <el-input v-model="form.eduStudentName"></el-input>
+                </el-form-item>
+              </el-descriptions-item>
+<!--              <el-descriptions-item label="身份证号（教育部）" :span="2">-->
+<!--                <el-form-item prop="eduIdCard">-->
+<!--                  <el-input v-model="form.eduIdCard"></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-descriptions-item>-->
+          </template>
+          <el-descriptions-item label="身份证号（教育部）" :span="2">{{ form.eduIdCard }}</el-descriptions-item>
           <el-descriptions-item label="测试项目">{{ form.project }}</el-descriptions-item>
           <el-descriptions-item label="联系方式1">{{ form.telephone1 }}</el-descriptions-item>
           <el-descriptions-item label="联系方式2">{{ form.telephone2 }}</el-descriptions-item>
@@ -184,14 +197,15 @@
           </el-descriptions-item>
           <el-descriptions-item label="资料" :span="3">
             <template v-for="item in form.fileList">
-            <ListImage
-              :image-url="baseUrl + item.fjlj"
-              :is-user="false"
-              :self-style="{ width: '150px', height: 'auto'}"
-            ></ListImage>
+              <el-image :src="baseUrl + item.fjlj" style="width: 150px;height: auto" fit="fill"></el-image>
             </template>
           </el-descriptions-item>
         </el-descriptions>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button v-if="!isHandle" type="primary" @click="submitForm">提 交</el-button>
+      </span>
     </el-dialog>
     <!--导入文件对话框 -->
     <el-dialog :title="title" :visible.sync="uploadOpen" width="520px" append-to-body inline @close="cancel">
@@ -406,53 +420,15 @@ export default {
       },
       // 表单校验
       rules: {
-        sex: [
-          {required: true, message: "性别不能为空", trigger: "blur"}
-        ],
-        project: [
-          {required: true, message: "测试项目不能为空", trigger: "blur"}
-        ],
-        schoolName: [
-          {required: true, message: "初中学校不能为空", trigger: "blur"}
-        ],
-        studentNumber: [
-          {required: true, message: "学籍号不能为空", trigger: "blur"}
-        ],
         idCard: [
           {required: true, message: "身份证号不能为空", trigger: "blur"}
         ],
-        studentName: [
-          {required: true, message: "学生姓名不能为空", trigger: "blur"}
-        ],
-        telephone1: [
-          {required: true, message: "联系电话1不能为空", trigger: "blur"}
-        ],
-        height: [
-          {required: true, message: "身高不能为空", trigger: "blur"}
-        ],
-        weight: [
-          {required: true, message: "体重不能为空", trigger: "blur"}
-        ],
-        telephone2: [
-          {required: true, message: "联系电话2不能为空", trigger: "blur"}
-        ],
-        eduSex: [
-          {required: true, message: "性别不能为空", trigger: "blur"}
-        ],
-        eduProject: [
-          {required: true, message: "测试项目不能为空", trigger: "blur"}
-        ],
-        eduSchoolName: [
-          {required: true, message: "初中学校不能为空", trigger: "blur"}
-        ],
-        eduStudentNumber: [
-          {required: true, message: "学籍号不能为空", trigger: "blur"}
-        ],
         eduStudentName: [
           {required: true, message: "学生姓名不能为空", trigger: "blur"}
         ],
-
-
+        eduIdCard: [
+          {required: true, message: "身份证号不能为空", trigger: "blur"}
+        ]
       }
     };
   },
@@ -673,23 +649,8 @@ export default {
         this.imageUrl = this.isEmptyAvatar(this.form.photo, this.form.sex);
         this.open = true;
         this.title = "修改";
-        // this.form.eduStudentName = row.eduStudentName
         this.$set(this.form, 'eduStudentName', row.eduStudentName)
-
         this.$set(this.form, 'eduIdCard', row.eduIdCard)
-        // this.$set(this.form,'idCard',row.idCard)
-        this.$set(this.form, 'eduStudentNumber', row.eduStudentNumber)
-        this.$set(this.form, 'eduSchoolName', row.eduSchoolName)
-        this.$set(this.form, 'eduProject', row.eduProject)
-        this.$set(this.form, 'eduSex', row.eduSex)
-
-
-        // this.form.eduIdCard = row.eduIdCard
-        // this.form.idCard = row.infoIdCard
-        // this.form.eduStudentNumber = row.eduStudentNumber
-        // this.form.eduSchoolName = row.eduSchoolName
-        // this.form.eduProject = row.eduProject
-        // this.form.edusex = row.eduSex
       });
     },
     // 获取状态
@@ -710,11 +671,8 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "查看";
-        this.form.eduStudentName = row.eduStudentName
-        this.form.idCard = row.infoIdCard
-        this.form.eduIdCard = row.eduIdCard
-        this.form.eduProject = row.eduProject
-        this.form.eduSex = row.eduSex
+        this.$set(this.form, 'eduStudentName', row.eduStudentName)
+        this.$set(this.form, 'eduIdCard', row.eduIdCard)
       });
     },
     /** 提交按钮 */