diff --git a/src/views/poverty/fdy.vue b/src/views/poverty/fdy.vue
index 494ec1d..f55dbc4 100644
--- a/src/views/poverty/fdy.vue
+++ b/src/views/poverty/fdy.vue
@@ -2,7 +2,15 @@
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
             label-width="68px">
-
+            <el-form-item label="班级" prop="classId">
+                <el-cascader placeholder="请选择班级" v-model="classVlue1" :show-all-levels="false" :options="ClassNameList"
+                    @change="handleChange1" clearable filterable>
+                    <template slot-scope="{ node, data }">
+                        <span>{{ data.label }}</span>
+                        <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+                    </template>
+                </el-cascader>
+            </el-form-item>
             <el-form-item label="姓名" prop="xm">
                 <el-input v-model="queryParams.xm" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
@@ -50,7 +58,7 @@
             <el-table-column label="辅导员审核" align="center" prop="fdyqm">
                 <template slot-scope="scope">
                     <!-- <img  v-if="scope.row.fdyqm" :src="scope.row.zp" width="160px" height="50px"> -->
-                    <div v-if="scope.row.fdyqm !=null && scope.row.fdyqm != '' ">
+                    <div v-if="scope.row.fdyqm != null && scope.row.fdyqm != ''">
                         <div v-if="scope.row.bjyjdj == '1'">
                             一等国家助学金
                         </div>
@@ -60,30 +68,30 @@
                         <div v-if="scope.row.bjyjdj == '3'">
                             三等国家助学金
                         </div>
-                      
 
-                    </div> 
-                    <span v-else >{{scope.row.status1}}</span>
+
+                    </div>
+                    <span v-else>{{ scope.row.status1 }}</span>
                 </template>
 
             </el-table-column>
             <el-table-column label="二级学院审核" align="center" prop="ejxyldqm">
-                    <template slot-scope="scope">
-                        <div v-if="scope.row.ejxyldqm">
-                            <div v-if="scope.row.csdj == '1'">
-                                一等国家助学金
-                            </div>
-                            <div v-if="scope.row.csdj == '2'">
-                                二等国家助学金
-                            </div>
-                            <div v-if="scope.row.csdj == '3'">
-                                三等国家助学金
-                            </div>
-                            <!-- 签名：<img :src="scope.row.ejxyldqm" width="160px" height="50px"> -->
-
+                <template slot-scope="scope">
+                    <div v-if="scope.row.ejxyldqm">
+                        <div v-if="scope.row.csdj == '1'">
+                            一等国家助学金
                         </div>
-                        <span v-else>未审核</span>
-                    </template>
+                        <div v-if="scope.row.csdj == '2'">
+                            二等国家助学金
+                        </div>
+                        <div v-if="scope.row.csdj == '3'">
+                            三等国家助学金
+                        </div>
+                        <!-- 签名：<img :src="scope.row.ejxyldqm" width="160px" height="50px"> -->
+
+                    </div>
+                    <span v-else>未审核</span>
+                </template>
 
             </el-table-column>
             <el-table-column label="学院意见" align="center" prop="zzdj">
@@ -99,12 +107,12 @@
                             三等国家助学金
                         </div>
                     </div>
-                    <div v-else>{{scope.row.status3}}</div>
+                    <div v-else>{{ scope.row.status3 }}</div>
                 </template>
             </el-table-column>
-            <el-table-column label="处分是否解除" align="center" >
+            <el-table-column label="处分是否解除" align="center">
                 <template slot-scope="scope">
-                    <span style="color:red"  v-if="scope.row.penaltyStatus0 == 1" >否</span>
+                    <span style="color:red" v-if="scope.row.penaltyStatus0 == 1">否</span>
                     <span v-else-if="scope.row.penaltyStatus1 == 1">是</span>
                     <!-- <span  v-else-if="scope.row.penaltyStatus3 == 3 ">处分申请中</span> -->
                     <span v-else>无处分记录</span>
@@ -116,7 +124,7 @@
                     <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-if="scope.row.step == 1" v-hasPermi="['system:apply:edit']">修改</el-button> -->
 
-                    <el-button size="mini" type="text" icon="el-icon-edit"   @click="handleUpdate(scope.row,1)"
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, 1)"
                         v-if="scope.row.step == 1">辅导员审核</el-button>
                     <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-if="scope.row.step == 3" v-hasPermi="['system:apply:edit']">二级学院审核</el-button>
@@ -125,8 +133,8 @@
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.step == 1"
                         @click="handleDelete(scope.row)" v-hasPermi="['system:apply:remove']">删除</el-button> -->
 
-                    <el-button size="mini" type="text"  v-if="scope.row.step != 1"
-                         @click="handleUpdate(scope.row,2)">查看</el-button>
+                    <el-button size="mini" type="text" v-if="scope.row.step != 1"
+                        @click="handleUpdate(scope.row, 2)">查看</el-button>
 
                 </template>
             </el-table-column>
@@ -135,8 +143,8 @@
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize" @pagination="getList" />
 
-          <!--批量审核对话框 -->
-            <el-dialog title="批量编辑" :visible.sync="open" width="80%" append-to-body>
+        <!--批量审核对话框 -->
+        <el-dialog title="批量编辑" :visible.sync="open" width="80%" append-to-body>
             <el-form label-width="180px">
                 <el-form-item label="审批类型">
                     <el-radio-group v-model="form.status">
@@ -149,7 +157,7 @@
                     <el-form-item label="签字上传">
                         <image-upload v-model="form.fdyqm" :disabled="true" :limit="1" />
                     </el-form-item>
-<!-- <el-upload
+                    <!-- <el-upload
                                                 :disabled="fdyEditDisable"
                                                 class="avatar-uploader"
                                                 :action="upload.url"
@@ -162,12 +170,13 @@
                                             </el-upload> -->
                     <el-form-item label="签名日期">
                         <el-col :span="11">
-                            <el-date-picker type="date" value-format="yyyy年MM月dd日" placeholder="选择日期" v-model="form.fdyqmrq" style="width: 100%;"></el-date-picker>
+                            <el-date-picker type="date" value-format="yyyy年MM月dd日" placeholder="选择日期"
+                                v-model="form.fdyqmrq" style="width: 100%;"></el-date-picker>
                         </el-col>
                     </el-form-item>
                 </el-row>
 
-                <el-row v-if="form.status == '0' || form.status=='2'">
+                <el-row v-if="form.status == '0' || form.status == '2'">
 
                     <el-form-item label="理由">
                         <el-col :span="11">
@@ -177,7 +186,7 @@
                 </el-row>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary"  v-loading="btnloading" @click="submitForm">确 定</el-button>
+                <el-button type="primary" v-loading="btnloading" @click="submitForm">确 定</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
@@ -185,19 +194,20 @@
 </template>
 
 <script>
-import { getUserProfile,updateSignature } from "@/api/system/user";
-import { listApply, getApply, delApply, addApply, updateApply, listFdy,batchUpdateFdy} from "@/api/zxj/apply";
+import { getClassName } from "@/api/stuCQS/basedata/student";
+import { getUserProfile, updateSignature } from "@/api/system/user";
+import { listApply, getApply, delApply, addApply, updateApply, listFdy, batchUpdateFdy } from "@/api/zxj/apply";
 import ImportTable from '../tool/gen/importTable.vue';
-  import {
+import {
     Message
-  } from 'element-ui';
+} from 'element-ui';
 export default {
     name: "poverty_Apply",
     data() {
 
         return {
-            user:{signature:null},
-            btnloading:false,
+            user: { signature: null },
+            btnloading: false,
             // 遮罩层
             loading: true,
             // 选中数组
@@ -249,25 +259,29 @@ export default {
                 xsqm: null,
                 xsqmrq: null,
                 csdj: null,
-                zzdj: null
+                zzdj: null,
+                classId:null
             },
             // 表单参数
-            form: {status:'1'},
+            form: { status: '1' },
             // 表单校验
             rules: {
-            }
-            
+            },
+            ClassNameList: [],//班级名称
+            classVlue1: []//班级搜索选择
+
         };
     },
     created() {
         this.getList();
+        this.getClassNameList();
         getUserProfile().then(response => {
             this.form.fdyqm = response.data.signature;
         });
     },
     methods: {
-        hanlerDialog(){
-            if(this.ids.length == 0){
+        hanlerDialog() {
+            if (this.ids.length == 0) {
                 this.$modal.msgError("至少选则一项");
                 return;
             }
@@ -282,6 +296,17 @@ export default {
                 this.loading = false;
             });
         },
+        getClassNameList() {
+            getClassName().then(res => {
+                this.ClassNameList = res.data
+            })
+        },
+        //搜索班级选择
+        handleChange1(value) {
+            this.queryParams.classId = value[2];
+            //console.log(value);
+        },
+
         // 取消按钮
         cancel() {
             this.open = false;
@@ -320,7 +345,8 @@ export default {
                 xsqm: null,
                 xsqmrq: null,
                 csdj: null,
-                zzdj: null
+                zzdj: null,
+                classId:null
             };
             this.resetForm("form");
         },
@@ -333,6 +359,7 @@ export default {
         resetQuery() {
             this.resetForm("queryForm");
             this.handleQuery();
+            this.classVlue1 = [];
         },
         // 多选框选中数据
         handleSelectionChange(selection) {
@@ -348,34 +375,34 @@ export default {
             this.$router.push({ path: "proverty_examine" });
         },
         /** 修改按钮操作 */
-        handleUpdate(row,action) {
+        handleUpdate(row, action) {
 
             const nid = row.id || this.ids;
-              this.$router.push({ path: "proverty_examine", query: { id: nid,"action":action } });
+            this.$router.push({ path: "proverty_examine", query: { id: nid, "action": action } });
         },
-        doUpdateSignature(){
-            updateSignature(this.user).then(res=>{});
+        doUpdateSignature() {
+            updateSignature(this.user).then(res => { });
         },
         /** 提交按钮 */
         submitForm() {
-            if(this.form.status == '1'){
-                if (this.form.fdyqm==''|| this.form.fdyqm==null) {
+            if (this.form.status == '1') {
+                if (this.form.fdyqm == '' || this.form.fdyqm == null) {
                     Message({
                         message: '请上传签名文件',
                         type: 'error'
                     })
                     return
                 }
-                if (this.form.fdyqmrq=='' ||this.form.fdyqmrq==null ) {
+                if (this.form.fdyqmrq == '' || this.form.fdyqmrq == null) {
                     Message({
                         message: '请选择签名日期',
                         type: 'error'
                     })
                     return
                 }
-            
-            }else{
-                 if (this.form.remark=='' ||this.form.remark==null) {
+
+            } else {
+                if (this.form.remark == '' || this.form.remark == null) {
                     Message({
                         message: '请输入理由',
                         type: 'error'
@@ -386,12 +413,12 @@ export default {
             this.form.step = 2;
             this.form.ids = this.ids;
             this.btnloading = true;
-            batchUpdateFdy(this.form).then(res =>{
+            batchUpdateFdy(this.form).then(res => {
                 this.btnloading = false;
-                 if(res.code==200){
+                if (res.code == 200) {
                     this.$modal.msgSuccess("批量修改成功");
                     this.open = false;
-                    if(this.form.status == '1'){
+                    if (this.form.status == '1') {
                         this.user.signature = this.form.fdyqm;
                         this.doUpdateSignature();
                     }
@@ -399,7 +426,7 @@ export default {
                     this.getList();
                 }
             })
-            
+
         },
         /** 删除按钮操作 */
         handleDelete(row) {
diff --git a/src/views/stuCQS/basedata/stuinfo/index.vue b/src/views/stuCQS/basedata/stuinfo/index.vue
index 890c39b..1b4adb1 100644
--- a/src/views/stuCQS/basedata/stuinfo/index.vue
+++ b/src/views/stuCQS/basedata/stuinfo/index.vue
@@ -60,16 +60,15 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-         >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+          @click="handleDelete">删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
@@ -128,10 +127,8 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            >修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-           >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-refresh" @click="doInitPwdOne(scope.row)">初始化密码</el-button>
           <el-button size="mini" type="text" icon="el-icon-view" @click="picVClick(scope.row)">查看画像</el-button>
         </template>
@@ -458,12 +455,12 @@ export default {
     },
     //搜索班级选择
     handleChange1(value) {
-      this.queryParams.classId = value[2]
+      this.queryParams.classId = value[2];
       //console.log(value);
     },
     //班级选择添加修改
     handleChange2(value) {
-      this.form.classId = value[2]
+      this.form.classId = value[2];
       //console.log(value);
     },
 
@@ -504,8 +501,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.classVlue1 = [],
-        this.handleQuery();
+      this.classVlue1 = [];
+      this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {