Merge remote-tracking branch 'origin/main'

src/views/basedata/stu/own.vue

@@ -190,28 +190,46 @@
         <el-dialog :title="查看详情" :visible.sync="openDetail" width="900px" append-to-body>
             <el-form ref="form" :model="form" label-width="80px">
                 <el-form-item label="姓名" prop="name">
-                    <el-input v-model="form.name"  :disabled="true" />
+                    <el-input v-model="form.name" :readonly="true" />
                 </el-form-item>
                 <el-form-item label="学号" prop="stuNo">
-                    <el-input v-model="form.stuNo"  :disabled="true" />
+                    <el-input v-model="form.stuNo" :readonly="true" />
                 </el-form-item>
                 <el-form-item label="性别" prop="gender">
-                    <el-input v-model="form.gender"  :disabled="true" />
+                    <el-input v-model="form.gender" :readonly="true" />
+                </el-form-item>
+                <el-form-item label="民族" prop="mz">
+                    <el-input v-model="form.mz" :readonly="true" />
                 </el-form-item>
                 <el-form-item label="生日" prop="birthday">
-                    <el-input v-model="form.birthday" :disabled="true" />
+                    <el-input v-model="form.birthday" :readonly="true" />
+                </el-form-item>
+                <el-form-item label="政治面貌" prop="zzmm">
+                    <el-input v-model="form.zzmm" :readonly="true" />
                 </el-form-item>
                 <el-form-item label="身份证号码" prop="idCard">
-                    <el-input v-model="form.idCard"  :disabled="true" />
+                    <el-input v-model="form.idCard" :readonly="true" />
+                </el-form-item>
+                <el-form-item label="籍贯" prop="jg">
+                    <el-input v-model="form.jg" :readonly="true" />
+                </el-form-item>
+                <el-form-item label="血型" prop="xx">
+                    <el-input v-model="form.xx" :readonly="true" />
+                </el-form-item>
+                <el-form-item label="学院" prop="deptName">
+                    <el-input v-model="form.deptName" :readonly="true" />
+                </el-form-item>
+                <el-form-item label="专业" prop="majorName">
+                    <el-input v-model="form.majorName" :readonly="true" />
                 </el-form-item>
                 <el-form-item label="所属班级" prop="className">
-                    <el-input v-model="form.className"  :disabled="true" />
+                    <el-input v-model="form.className" :readonly="true" />
                 </el-form-item>
                 <el-form-item label="手机号码" prop="phone">
-                    <el-input v-model="form.phone" :disabled="true" />
+                    <el-input v-model="form.phone" :readonly="true" />
                 </el-form-item>
                 <el-form-item label="家庭地址" prop="address">
-                    <el-input v-model="form.address" :disabled="true" />
+                    <el-input v-model="form.address" :readonly="true" />
                 </el-form-item>
             </el-form>
         </el-dialog>
@@ -349,9 +367,13 @@ export default {
             const stuId = row.stuId || this.ids
             getStudent(stuId).then(response => {
                 this.form = response.data;
-                // var data = response.data;
+                this.form.className = response.data.srsClass.className;
-                // this.classVlue2 = [data.dept.deptId, data.srsMajors.majorId, data.srsClass.classId]
+                this.form.deptName = response.data.dept.deptName;
-                // console.log(this.classVlue2);
+                this.form.majorName = response.data.srsMajors.majorName;
+                this.form.mz = response.data.cphStuExtraInfo.mz;
+                this.form.zzmm = response.data.cphStuExtraInfo.zzmm;
+                this.form.jg = response.data.cphStuExtraInfo.jg;
+                this.form.xx = response.data.cphStuExtraInfo.xx;
                 this.openDetail = true;
             });
         },