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

ruoyi-ui/package.json

@@ -60,6 +60,7 @@
     "luckyexcel": "^1.0.1",
     "luckyexcel": "^1.0.1",
     "moment": "^2.29.4",
     "moment": "^2.29.4",
     "nprogress": "0.2.0",
     "nprogress": "0.2.0",
+    "print-js": "^1.6.0",
     "qrcodejs2": "0.0.2",
     "qrcodejs2": "0.0.2",
     "quill": "1.3.7",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "screenfull": "5.0.2",

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

@@ -56,8 +56,6 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="身份证号码" align="center" prop="idCard" min-width="180"/>
       <el-table-column label="身份证号码" align="center" prop="idCard" min-width="180"/>
       <el-table-column label="姓名" align="center" min-width="88" prop="studentName"/>
       <el-table-column label="姓名" align="center" min-width="88" prop="studentName"/>
-      <el-table-column label="学籍号" align="center" min-width="180" prop="studentNumber"/>
-      <el-table-column label="初中学校" key="juniorSchool" min-width="130" align="center" prop="schoolName"/>
       <el-table-column label="测试项目"  prop="project" min-width="100">
       <el-table-column label="测试项目"  prop="project" min-width="100">
       </el-table-column>
       </el-table-column>
       <el-table-column label="性别" align="center" prop="sex" min-width="80">
       <el-table-column label="性别" align="center" prop="sex" min-width="80">
@@ -114,22 +112,6 @@
             <el-form-item label="身份证号:" prop="idCard">
             <el-form-item label="身份证号:" prop="idCard">
               <el-input v-model="form.idCard" placeholder="请输入身份证号" readOnly/>
               <el-input v-model="form.idCard" placeholder="请输入身份证号" readOnly/>
             </el-form-item>
             </el-form-item>
-            <el-form-item label="学籍号:" prop="studentNumber">
-              <el-input v-model="form.studentNumber" placeholder="请输入学籍号" readOnly/>
-            </el-form-item>
-            <el-form-item label="初中学校:" prop="schoolName">
-              <el-input v-model="form.schoolName" placeholder="请输入初中学校" readOnly/>
-            </el-form-item>
-            <el-form-item label="身高:" prop="height">
-              <el-input v-model="form.height" placeholder="请输入身高" readOnly>
-                <template slot="suffix">CM</template>
-              </el-input>
-            </el-form-item>
-            <el-form-item label="体重:" prop="weight">
-              <el-input v-model="form.weight" placeholder="请输入体重" readOnly>
-                <template slot="suffix">KG</template>
-              </el-input>
-            </el-form-item>
             <el-form-item label="联系方式1:" prop="telephone1">
             <el-form-item label="联系方式1:" prop="telephone1">
               <el-input v-model="form.telephone1" placeholder="请输入联系方式" readOnly/>
               <el-input v-model="form.telephone1" placeholder="请输入联系方式" readOnly/>
             </el-form-item>
             </el-form-item>
@@ -397,6 +379,7 @@ export default {
       this.reset();
       this.reset();
       const id = row.id || this.ids
       const id = row.id || this.ids
       getAddressInfo(id).then(response => {
       getAddressInfo(id).then(response => {
+        console.log(response)
         this.form = response.data;
         this.form = response.data;
         this.imageUrl = this.isEmptyAvatar(this.form.photo, this.form.sex);
         this.imageUrl = this.isEmptyAvatar(this.form.photo, this.form.sex);
         this.open = true;
         this.open = true;