新生数据展示修改

src/views/stureg/reginfoimport/index.vue

@@ -13,6 +13,22 @@
       <el-form-item label="手机号" prop="SJH">
         <el-input v-model="queryParams.SJH" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <!-- 学院 -->
+      <el-form-item label="学院" prop="XY">
+        <el-input v-model="queryParams.XY" placeholder="请输入学院" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <!-- 专业 -->
+      <el-form-item label="专业" prop="ZY">
+        <el-input v-model="queryParams.ZY" placeholder="请输入专业" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <!-- 班级代码 -->
+      <el-form-item label="班级代码" prop="BJDM">
+        <el-input v-model="queryParams.BJDM" placeholder="请输入班级代码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <!-- 班级 -->
+      <el-form-item label="班级" prop="BJ">
+        <el-input v-model="queryParams.BJ" placeholder="请输入班级" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="校编学号" prop="XH">
         <el-input v-model="queryParams.XH" placeholder="请输入校编学号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -88,9 +104,10 @@
       </el-table-column>
       <el-table-column label="分配的宿舍" align="center" prop="dorm" width="100" />
       <el-table-column label="考生号" align="center" prop="ksh" width="130" />
+      <el-table-column label="学院" align="center" prop="xy" width="90" />
+      <el-table-column label="专业" align="center" prop="zy" width="90" />
       <el-table-column label="班级代码" align="center" prop="bjdm" width="90" />
-      <!-- <el-table-column label="身份证号" align="center" prop="sfzh" width="180" />
+      <el-table-column label="班级" align="center" prop="bj" width="90" />
-      <el-table-column label="手机号" align="center" prop="sjh" width="120" /> -->
       <el-table-column label="性别" align="center" prop="xb" width="70" />
       <el-table-column label="政治面貌" align="center" prop="zzmm" width="80" />
       <el-table-column label="民族" align="center" prop="mz" width="70" />

src/views/stureg/reginfoimport/info-search.vue

@@ -13,6 +13,18 @@
       <el-form-item label="手机号" prop="SJH">
         <el-input v-model="queryParams.SJH" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="学院" prop="XY">
+        <el-input v-model="queryParams.XY" placeholder="请输入学院" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="专业" prop="ZY">
+        <el-input v-model="queryParams.ZY" placeholder="请输入专业" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="班级代码" prop="BJDM">
+        <el-input v-model="queryParams.BJDM" placeholder="请输入班级代码" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="班级" prop="BJ">
+        <el-input v-model="queryParams.BJ" placeholder="请输入班级" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="校编学号" prop="XH">
         <el-input v-model="queryParams.XH" placeholder="请输入校编学号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -89,7 +101,10 @@
       </el-table-column>
       <el-table-column label="分配的宿舍" align="center" prop="dorm" width="100" /> 
       <el-table-column label="考生号" align="center" prop="ksh" width="130" />
+      <el-table-column label="学院" align="center" prop="xy" width="90" />
+      <el-table-column label="专业" align="center" prop="zy" width="90" />
       <el-table-column label="班级代码" align="center" prop="bjdm" width="90" />
+      <el-table-column label="班级" align="center" prop="bj" width="90" />
       <el-table-column label="手机号" align="center" prop="SJH" width="120" />
       <el-table-column label="性别" align="center" prop="xb" width="70"/>
       <el-table-column label="政治面貌" align="center" prop="zzmm" width="80"/>

src/views/stureg/stu/fdy.vue

@@ -29,6 +29,12 @@
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
         </el-form>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button> -->
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
         <el-table v-loading="loading" :data="stu_list">
             <el-table-column label="查看任务" align="center" class-name="small-padding fixed-width" fixed="left">
                 <template slot-scope="scope">
@@ -42,6 +48,9 @@
             <el-table-column label="学生姓名" align="center" prop="xsxm" width="100" />
             <el-table-column label="性别" align="center" prop="xb" width="60" />
             <el-table-column label="分配的宿舍" align="center" prop="dorm" />
+            <el-table-column label="是否吸烟" align="center" prop="isSmoke" />
+            <el-table-column label="是否早睡" align="center" prop="isEarly" />
+            <el-table-column label="兴趣特长" align="center" prop="hobby" />
             <el-table-column label="注册状态" align="center" prop="regStatus">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.srs_stu_reg_status" :value="scope.row.regStatus" />
@@ -49,7 +58,8 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
                 <template slot-scope="scope">
-                    <el-button size="mini" type="text" icon="el-icon-view" @click="viewStudentDetail(scope.row)">查看详情</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-view"
+                        @click="viewStudentDetail(scope.row)">查看详情</el-button>
                 </template>
             </el-table-column>
 
@@ -200,10 +210,12 @@
                     </el-form>
                 </el-tab-pane>
                 <el-tab-pane label="家庭成员" name="family">
-                    <FamilyMemberKnrd :stuNo="studentDetail.ksh || studentDetail.xh || studentDetail.stuNo" v-if="studentDetail.ksh || studentDetail.xh || studentDetail.stuNo" />
+                    <FamilyMemberKnrd :stuNo="studentDetail.ksh || studentDetail.xh || studentDetail.stuNo"
+                        v-if="studentDetail.ksh || studentDetail.xh || studentDetail.stuNo" />
                 </el-tab-pane>
                 <el-tab-pane label="教育经历" name="education">
-                        <EduExpKnrd :stuNo="studentDetail.ksh || studentDetail.xh || studentDetail.stuNo" v-if="studentDetail.ksh || studentDetail.xh || studentDetail.stuNo" />
+                    <EduExpKnrd :stuNo="studentDetail.ksh || studentDetail.xh || studentDetail.stuNo"
+                        v-if="studentDetail.ksh || studentDetail.xh || studentDetail.stuNo" />
                 </el-tab-pane>
             </el-tabs>
         </el-dialog>
@@ -283,7 +295,7 @@ export default {
             this.resetForm("queryForm");
             this.handleQuery();
         },
-        
+
         /** 查看学生详情 */
         async viewStudentDetail(row) {
             let loading = fullLoading(this);
@@ -295,12 +307,12 @@ export default {
                     loading.close();
                     return;
                 }
-                
+
                 // 获取基本信息
                 let basicRes = await getStuInfo(stuNo);
-                
+
                 loading.close();
-                
+
                 if (basicRes.code == 200) {
                     // 合并基本信息和当前行数据
                     this.studentDetail = {
@@ -311,7 +323,7 @@ export default {
                         ksh: row.ksh || basicRes.data.ksh,
                         xb: row.xb || basicRes.data.xb
                     };
-                    
+
                     this.activeTab = 'basic';
                     this.studentDetailVisible = true;
                 } else {
@@ -323,6 +335,11 @@ export default {
                 this.$message.error('获取学生详情失败');
             }
         },
+        handleExport() {
+            this.download('system/reg/export', {
+                ...this.queryParams
+            }, `新生报到数据_${new Date().getTime()}.xlsx`)
+        },
 
     }
 }