diff --git a/src/api/routine/basic.js b/src/api/routine/basic.js
index e00c91f..32d9d57 100644
--- a/src/api/routine/basic.js
+++ b/src/api/routine/basic.js
@@ -1,5 +1,12 @@
 import request from '@/utils/request'
 
+// 根据学号查询信息
+export function getStname(stName) {
+  return request({
+    url: '/routine/basic/name/' + stName,
+    method: 'get'
+  })
+}
 // 查询退伍复学申请列表
 export function listBasic(query) {
   return request({
diff --git a/src/views/routine/dis/basic/index.vue b/src/views/routine/dis/basic/index.vue
index bbfdad1..fcf8ff7 100644
--- a/src/views/routine/dis/basic/index.vue
+++ b/src/views/routine/dis/basic/index.vue
@@ -7,12 +7,15 @@
           <el-form-item label="学号" prop="stId" :rules="rules.reason1">
             <el-input v-model="form.stId" placeholder="请输入学号" @blur="changeGet" />
           </el-form-item>
+           <!-- <el-form-item label="学生编号" prop="studentId" >
+            <el-input v-model="form.studentId" placeholder="" disabled />
+          </el-form-item> -->
           <el-form-item label="姓名" prop="stName" :rules="rules.reason2">
             <el-input v-model="form.stName" placeholder="请输入姓名" />
           </el-form-item>
-          <el-form-item label="辅导员名字" prop="fdName" :rules="rules.reason3">
+          <!-- <el-form-item label="辅导员名字" prop="fdName" :rules="rules.reason3">
             <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="性别" prop="sex" :rules="rules.reason4">
             <el-select v-model="form.sex" placeholder="请选择性别">
               <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
@@ -101,6 +104,11 @@
 import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
 import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
 import { getStudentInfoByStuId } from '@/api/routine/stuIdReissue'
+import { getUserProfile } from '@/api/system/user' // 获取
+
+// 获取学生信息
+import { addStudent, delStudent, doDept, getClassName, getStatus, getStudent, initOnePwd, initPwd, listStudent, updateStudent } from '@/api/stuCQS/basedata/student'
+import { log } from "vxe-table";
 
 export default {
   name: "Basic",
@@ -129,6 +137,7 @@ export default {
        queryParams: {
         pageNum: 1,
         pageSize: 10,
+        studentId:null,
         fxId: null,
         fxTime: null,
         stId: null,
@@ -222,11 +231,28 @@ export default {
     };
   },
   created() {
-    this.getList();
+    // this.getList();
+    this.getUser()
     this.showData()
   },
   methods: {
 
+       // 获取当前登录信息
+    getUser() {
+      this.loading = true
+      getUserProfile().then(response => {
+        // this.user = response.data;
+        this.roleGroup = response.roleGroup
+        // this.postGroup = response.postGroup;
+        // console.log(response);
+        console.log(response.data)
+        this.form.studentId = response.data.userId
+        // this.loading = false
+        this.getList();
+      })
+    },
+
+
     // 修改数据
     showData() {
       if (this.$route.query.id != undefined) {
@@ -239,24 +265,66 @@ export default {
     },
 
     // 填写学号时自动获取其他信息
-    changeGet() {
-      this.form.stuId = this.form.stId ? this.form.stId : this.$route.query.stId
-      getStudentInfoByStuId(this.form.stuId).then(response => {
-        if (response.data == null) {
-          this.$message.error('学号不存在')
-          return
-        }
-        this.form = response.data
-        console.log(this.form)
-        this.form.stId = response.data.stuNo
-        this.form.stName = response.data.studentName
-        this.form.college = response.data.departmentName
-        this.majors = response.data.className
-        this.form.sex = response.data.gender
-        this.form.grade = response.data.gradeName
+    // changeGet() {
+    //   this.form.stuId = this.form.stId ? this.form.stId : this.$route.query.stId
+    //   getStudentInfoByStuId(this.form.stuId).then(response => {
+    //     if (response.data == null) {
+    //       this.$message.error('学号不存在')
+    //       return
+    //     }
+    //     this.form = response.data
+    //     console.log(this.form)
+    //     this.form.stId = response.data.stuNo
+    //     this.form.stName = response.data.studentName
+    //     this.form.college = response.data.departmentName
+    //     this.majors = response.data.className
+    //     this.form.sex = response.data.gender
+    //     this.form.grade = response.data.gradeName
 
-      })
-    },
+    //   })
+    // },
+    // 填写学号时自动获取其他信息 + 同步赋值studentId
+      changeGet() {
+        // 1. 先确定stId（优先取form.stId，无则取路由参数）
+        this.form.stuId = this.form.stId ? this.form.stId : this.$route.query.stId;
+
+        // 2. 并行请求：同时获取学生信息和登录用户信息（提升效率）
+        Promise.all([
+          // 请求1：根据stuId获取学生信息
+          getStudentInfoByStuId(this.form.stuId),
+          // 请求2：获取登录用户信息（用于赋值studentId）
+          getUserProfile()
+        ]).then(([studentRes, userRes]) => {
+          // 处理学生信息请求的结果
+          if (studentRes.data == null) {
+            this.$message.error('学号不存在');
+            return;
+          }
+          // 赋值学生信息到form
+          this.form = studentRes.data;
+          this.form.stId = studentRes.data.stuNo;
+          this.form.stName = studentRes.data.studentName;
+          this.form.college = studentRes.data.departmentName;
+          this.majors = studentRes.data.className;
+          this.form.sex = studentRes.data.gender;
+          this.form.grade = studentRes.data.gradeName;
+
+           listStudent({pageNum:1,pageSize:10,name:this.form.stName}).then(response => {
+               this.form.studentId = response.rows[0].stuId
+              //  console.log(this.form.studentId)
+               
+            })
+            
+          // 处理登录用户信息请求的结果：赋值studentId
+          // this.form.studentId = userRes.data.userId; // 核心：把userId赋值给studentId
+          // console.log("学生信息+studentId已完成赋值：", this.form);
+
+        }).catch(err => {
+          // 捕获请求异常
+          console.error("请求失败：", err);
+          this.$message.error('数据获取失败，请重试');
+        });
+      },
 
     /** 查询退伍复学申请列表 */
     getList() {
@@ -276,26 +344,52 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,
+      id: null,
+        fxId: null,
+        fxTime: null,
         stId: null,
         stName: null,
         fdName: null,
         sex: null,
         nations: null,
+        fdQm: null,
+        xwQm: null,
+        erQm: null,
+        xjQm: null,
+        jwQm: null,
         stClass: null,
         majors: null,
         grade: null,
         college: null,
         reasons: null,
+        fdIdea: null,
+        twoIdea: null,
+        xwIdea: null,
+        xjIdea: null,
+        jwIdea: null,
+        zsIdea: null,
+        zsStatus: null,
         times: null,
         fdStatus: null,
         xwStatus: null,
         twoStatus: null,
         xjglStatus: null,
+        jwStatus: null,
+        rwTime: null,
+        zsTime: null,
+        fdTime: null,
+        xwTime: null,
+        twoTime: null,
+        xjTime: null,
+        jwTime: null,
         datab: null,
         dataa: null,
         conversion: null,
-        jwcStatus: null
+        processId: null,
+        deployId: null,
+        studentId: null,
+        testData: null,
+        testTest: null
       };
       this.resetForm("form");
     },
@@ -336,11 +430,25 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+
+            // 重置状态
+              this.form.zsStatus=0
+              this.form.fdStatus=0
+              this.form.xwStatus=0
+              this.form.twoStatus=0
+              this.form.Status=0
+              this.form.jwStatus=0
+
+              this.form.fdIdea=""
+              this.form.xwIdeaI=""
+              this.form.twoIdea=""
+              this.form.xjIdea=""
+              this.form.jwIdea=""
+
             updateBasic(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
-              // this.form.stId
               this.dataform = {
                 id: null,
                 stId: this.form.stId,
@@ -362,6 +470,17 @@ export default {
                 this.open = false;
                 this.getList();
               });
+            
+              
+               if (this.form.conversion == "N") {
+                this.$router.push({
+                  path: '/routine/dis/appli',
+                })
+              } else {
+                this.$router.push({
+                  path: '/routine/dis/disma',
+                })
+              }
             });
           } else {
             addBasic(this.form).then(response => {
diff --git a/src/views/routine/dis/ejshe.vue b/src/views/routine/dis/ejshe.vue
deleted file mode 100644
index b4f9299..0000000
--- a/src/views/routine/dis/ejshe.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-  <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="stId">
-        <el-input
-          v-model="queryParams.stId"
-          placeholder="请输入学号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名" prop="stName">
-        <el-input
-          v-model="queryParams.stName"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    
-      <el-form-item label="时间" prop="times">
-        <el-input
-          v-model="queryParams.times"
-          placeholder="请输入时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <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"
-          v-hasPermi="['routine:basic:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="basicList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="学号" align="center" prop="stId" />
-      <el-table-column label="姓名" align="center" prop="stName" />
-     
-      <!-- <el-table-column label="性别" align="center" prop="sex">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="民族" align="center" prop="nations">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_nation" :value="scope.row.nations"/>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="班级" align="center" prop="stClass">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_classes" :value="scope.row.stClass"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="学院" align="center" prop="college">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_college" :value="scope.row.college"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="times" />
-      <el-table-column label="辅导员审核状态" align="center" prop="fdStatus" />
-      <el-table-column label="学务审核" align="center" prop="xwStatus" />
-      <el-table-column label="二级学院审核状态" align="center" prop="twoStatus" />
-      <el-table-column label="学籍管理审核状态" align="center" prop="xjglStatus" />
-      <el-table-column label="教务处审核状态" align="center" prop="jwcStatus" />
-      <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)"
-            v-hasPermi="['routine:basic:edit']"
-          >查看材料</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['routine:basic:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改退伍复学申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="学号" prop="stId">
-          <el-input v-model="form.stId" placeholder="请输入学号" />
-        </el-form-item>
-        <el-form-item label="姓名" prop="stName">
-          <el-input v-model="form.stName" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="辅导员名字" prop="fdName">
-          <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
-        </el-form-item>
-        <el-form-item label="性别" prop="sex">
-          <el-select v-model="form.sex" placeholder="请选择性别">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民族" prop="nations">
-          <el-input v-model="form.nations" placeholder="请输入民族" />
-        </el-form-item>
-        <el-form-item label="班级" prop="stClass">
-          <el-input v-model="form.stClass" placeholder="请输入班级" />
-        </el-form-item>
-        <el-form-item label="专业" prop="majors">
-          <el-input v-model="form.majors" placeholder="请输入专业" />
-        </el-form-item>
-        <el-form-item label="年级" prop="grade">
-          <el-input v-model="form.grade" placeholder="请输入年级" />
-        </el-form-item>
-        <el-form-item label="学院" prop="college">
-          <el-input v-model="form.college" placeholder="请输入学院" />
-        </el-form-item>
-        <el-form-item label="原因" prop="reasons">
-          <el-input v-model="form.reasons" placeholder="请输入原因" />
-        </el-form-item>
-        <el-form-item label="时间" prop="times">
-          <el-input v-model="form.times" placeholder="请输入时间" />
-        </el-form-item>
-        <el-form-item label="空余字段" prop="datab">
-          <el-input v-model="form.datab" placeholder="请输入空余字段" />
-        </el-form-item>
-        <el-form-item label="" prop="dataa">
-          <el-input v-model="form.dataa" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="专业转换" prop="conversion">
-          <el-input v-model="form.conversion" placeholder="请输入专业转换" />
-        </el-form-item>
-      </el-form> -->
-       <el-tabs type="border-card">
-        <el-tab-pane label="基础信息填写">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="basicList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="姓名" align="center" prop="stName" />
-                  <el-table-column label="辅导员名字" align="center" prop="fdName" />
-                  <el-table-column label="性别" align="center" prop="sex" />
-                  <el-table-column label="民族" align="center" prop="nations" />
-                  <el-table-column label="班级" align="center" prop="stClass" />
-                  <el-table-column label="专业" align="center" prop="majors" />
-                  <el-table-column label="年级" align="center" prop="grade" />
-                  <el-table-column label="学院" align="center" prop="college" />
-                  <el-table-column label="原因" align="center" prop="grade" />
-                  <el-table-column label="原因" align="center" prop="reasons" />
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-         <el-tab-pane label="上传材料">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="form.maList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="原年级" align="center" prop="oldgrade" />
-                  <el-table-column label="原专业" align="center" prop="oldmajor" />
-                  <el-table-column label="新年级" align="center" prop="newgrade" />
-                  <el-table-column label="新专业" align="center" prop="newmajor" />
-                  <el-table-column label="退役证明" align="center" prop="proof" />
-                  <el-table-column label="身份证" align="center" prop="idcard" />
-                  <el-table-column label="材料" align="center" prop="material" />
-
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-
-      </el-tabs>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
-import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
-export default {
-  name: "Basic",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 退伍复学申请表格数据
-      basicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询退伍复学申请列表 */
-    getList() {
-      this.loading = true;
-      listBasic(this.queryParams).then(response => {
-        this.basicList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.basicList )
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加退伍复学申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getBasic(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "查看填报信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBasic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              // this.form.stId
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addBasic(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              console.log(this.form.stId)
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-              
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function() {
-        return delBasic(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('routine/basic/export', {
-        ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/src/views/routine/dis/fdshe.vue b/src/views/routine/dis/fdshe.vue
deleted file mode 100644
index b4f9299..0000000
--- a/src/views/routine/dis/fdshe.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-  <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="stId">
-        <el-input
-          v-model="queryParams.stId"
-          placeholder="请输入学号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名" prop="stName">
-        <el-input
-          v-model="queryParams.stName"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    
-      <el-form-item label="时间" prop="times">
-        <el-input
-          v-model="queryParams.times"
-          placeholder="请输入时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <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"
-          v-hasPermi="['routine:basic:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="basicList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="学号" align="center" prop="stId" />
-      <el-table-column label="姓名" align="center" prop="stName" />
-     
-      <!-- <el-table-column label="性别" align="center" prop="sex">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="民族" align="center" prop="nations">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_nation" :value="scope.row.nations"/>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="班级" align="center" prop="stClass">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_classes" :value="scope.row.stClass"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="学院" align="center" prop="college">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_college" :value="scope.row.college"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="times" />
-      <el-table-column label="辅导员审核状态" align="center" prop="fdStatus" />
-      <el-table-column label="学务审核" align="center" prop="xwStatus" />
-      <el-table-column label="二级学院审核状态" align="center" prop="twoStatus" />
-      <el-table-column label="学籍管理审核状态" align="center" prop="xjglStatus" />
-      <el-table-column label="教务处审核状态" align="center" prop="jwcStatus" />
-      <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)"
-            v-hasPermi="['routine:basic:edit']"
-          >查看材料</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['routine:basic:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改退伍复学申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="学号" prop="stId">
-          <el-input v-model="form.stId" placeholder="请输入学号" />
-        </el-form-item>
-        <el-form-item label="姓名" prop="stName">
-          <el-input v-model="form.stName" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="辅导员名字" prop="fdName">
-          <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
-        </el-form-item>
-        <el-form-item label="性别" prop="sex">
-          <el-select v-model="form.sex" placeholder="请选择性别">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民族" prop="nations">
-          <el-input v-model="form.nations" placeholder="请输入民族" />
-        </el-form-item>
-        <el-form-item label="班级" prop="stClass">
-          <el-input v-model="form.stClass" placeholder="请输入班级" />
-        </el-form-item>
-        <el-form-item label="专业" prop="majors">
-          <el-input v-model="form.majors" placeholder="请输入专业" />
-        </el-form-item>
-        <el-form-item label="年级" prop="grade">
-          <el-input v-model="form.grade" placeholder="请输入年级" />
-        </el-form-item>
-        <el-form-item label="学院" prop="college">
-          <el-input v-model="form.college" placeholder="请输入学院" />
-        </el-form-item>
-        <el-form-item label="原因" prop="reasons">
-          <el-input v-model="form.reasons" placeholder="请输入原因" />
-        </el-form-item>
-        <el-form-item label="时间" prop="times">
-          <el-input v-model="form.times" placeholder="请输入时间" />
-        </el-form-item>
-        <el-form-item label="空余字段" prop="datab">
-          <el-input v-model="form.datab" placeholder="请输入空余字段" />
-        </el-form-item>
-        <el-form-item label="" prop="dataa">
-          <el-input v-model="form.dataa" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="专业转换" prop="conversion">
-          <el-input v-model="form.conversion" placeholder="请输入专业转换" />
-        </el-form-item>
-      </el-form> -->
-       <el-tabs type="border-card">
-        <el-tab-pane label="基础信息填写">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="basicList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="姓名" align="center" prop="stName" />
-                  <el-table-column label="辅导员名字" align="center" prop="fdName" />
-                  <el-table-column label="性别" align="center" prop="sex" />
-                  <el-table-column label="民族" align="center" prop="nations" />
-                  <el-table-column label="班级" align="center" prop="stClass" />
-                  <el-table-column label="专业" align="center" prop="majors" />
-                  <el-table-column label="年级" align="center" prop="grade" />
-                  <el-table-column label="学院" align="center" prop="college" />
-                  <el-table-column label="原因" align="center" prop="grade" />
-                  <el-table-column label="原因" align="center" prop="reasons" />
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-         <el-tab-pane label="上传材料">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="form.maList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="原年级" align="center" prop="oldgrade" />
-                  <el-table-column label="原专业" align="center" prop="oldmajor" />
-                  <el-table-column label="新年级" align="center" prop="newgrade" />
-                  <el-table-column label="新专业" align="center" prop="newmajor" />
-                  <el-table-column label="退役证明" align="center" prop="proof" />
-                  <el-table-column label="身份证" align="center" prop="idcard" />
-                  <el-table-column label="材料" align="center" prop="material" />
-
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-
-      </el-tabs>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
-import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
-export default {
-  name: "Basic",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 退伍复学申请表格数据
-      basicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询退伍复学申请列表 */
-    getList() {
-      this.loading = true;
-      listBasic(this.queryParams).then(response => {
-        this.basicList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.basicList )
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加退伍复学申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getBasic(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "查看填报信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBasic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              // this.form.stId
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addBasic(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              console.log(this.form.stId)
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-              
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function() {
-        return delBasic(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('routine/basic/export', {
-        ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/src/views/routine/dis/formData.vue b/src/views/routine/dis/formData.vue
index bf87384..30bdaf6 100644
--- a/src/views/routine/dis/formData.vue
+++ b/src/views/routine/dis/formData.vue
@@ -80,17 +80,17 @@
              <p class="reason-text" style="" v-else>是否申请转专业：（）是   （×）否
             </p>
             <p class="reason-text" style="color: red;">原年级和专业:__
-              {{ form.maList.length > 0 ? form.maList[0].oldgrade : '暂无数据' }}
-              __{{ form.maList.length > 0 ? form.maList[0].oldmajor : '暂无数据' }}__
+              {{ form.maList[0].oldgrade }}
+              __{{  form.maList[0].oldmajor}}__
                <!-- <el-input v-model="form.maList.oldgrade" type="textarea" :rows="3"
               class="opinion-textarea">{{oldgrade}}</el-input> -->
               <!-- <el-input v-model="form.maList.oldgrade" type="textarea" :rows="3"
               class="opinion-textarea"></el-input> -->
               
               申请转入年级和专业：__
-              {{ form.maList.length > 0 ? form.maList[0].newgrade : '暂无数据' }}
+              {{  form.maList[0].newgrade  }}
               __
-              {{ form.maList.length > 0 ? form.maList[0].newmajor : '暂无数据' }}__
+              {{  form.maList[0].newmajor  }}__
             </p>
 
             <image-preview
@@ -292,7 +292,7 @@
 
         <!-- 操作按钮 -->
       <div class="form-btn-group">
-        <el-button type="primary" @click="submitForm">提交审核</el-button>
+        <!-- <el-button type="primary" @click="submitForm">提交审核</el-button> -->
         <!-- <el-button @click="resetForm">重置表单</el-button> -->
         <!-- <el-button type="text" @click="printForm">打印表单</el-button> -->
       </div>
@@ -305,6 +305,7 @@
 
 <script>
 import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
+import { listStudent, getClassName } from '@/api/stuCQS/basedata/student'
 
 export default {
   name: "Basic",
@@ -329,6 +330,9 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+
+     // 班级名称列表
+      ClassNameList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -386,14 +390,30 @@ export default {
   created() {
     this.getList();
     this.showData()
+    
   },
   methods: {
+     /** 获取班级名称列表 */
+    getClassNameList() {
+      getClassName().then(res => {
+        this.ClassNameList = res.data
+        console.log(this.ClassNameList)
+        // if(this.ClassNameList != null){
+        //    this.ClassNameList.forEach(element => {
+        //      if(element.id == this.form.newmajor){
+
+        //      }
+        //    });
+        // }
+      })
+    },
 
      showData() {
       if (this.$route.query.id != undefined) {
         console.log(this.$route.query.id)
         getBasic(this.$route.query.id).then((response) => {
           this.form = response.data
+          this.getClassNameList()
           // this.active = response.data.status + 1;
         })
       }
diff --git a/src/views/routine/dis/formSt.vue b/src/views/routine/dis/formSt.vue
index 2c367c1..c318376 100644
--- a/src/views/routine/dis/formSt.vue
+++ b/src/views/routine/dis/formSt.vue
@@ -1,303 +1,342 @@
 <template>
-  <div class="application-form-container">
-    <h2 class="form-title">广西水利电力职业技术学院</h2>
-    <h3 class="form-subtitle">退役复学申请表</h3>
+  <div class="application-form-container" style="display: flex; justify-content: center; align-items: center">
+    <div id="print" ref="print" style="width: auto;">
+      <h2 class="form-title">广西水利电力职业技术学院</h2>
+      <h3 class="form-subtitle">退役复学申请表</h3>
 
-     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      <table class="application-table">
-        <!-- 基本信息行1 -->
-        <tr>
-          <td class="label">姓名</td>
-          <td class="input-cell">
-            <el-form-item prop="stName" class="form-item-custom">
-              <el-input v-model="form.stName" placeholder="请输入姓名" class="basic-input"></el-input>
-            </el-form-item>
-          </td>
-          <td class="label">性别</td>
-          <td class="input-cell">
-            <el-form-item prop="sex" class="form-item-custom">
-              <el-select v-model="form.sex" placeholder="请选择性别" class="basic-input">
-                <el-option label="男" value="0"></el-option>
-                <el-option label="女" value="1"></el-option>
-              </el-select>
-            </el-form-item>
-          </td>
-          <td class="label">民族</td>
-          <td class="input-cell">
-            <el-form-item prop="nations" class="form-item-custom">
-              <el-input v-model="form.nations" placeholder="请输入民族" class="basic-input"></el-input>
-            </el-form-item>
-          </td>
-          <td class="label">班级</td>
-          <td class="input-cell" colspan="2">
-            <el-form-item prop="stClass" class="form-item-custom">
-              <el-input v-model="form.stClass" placeholder="请输入年级" class="basic-input"></el-input>
-            </el-form-item>
-          </td>
-        </tr>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <table class="application-table">
+          <!-- 基本信息行1 -->
+          <tr>
+            <td class="label">姓名</td>
+            <td class="input-cell">
+              <!-- <el-form-item prop="stName" class="form-item-custom">
+                <el-input v-model="form.stName" placeholder="请输入姓名" class="basic-input" disabled></el-input>
+              </el-form-item> -->
+              {{ form.stName }}
+            </td>
+            <td class="label">性别</td>
+            <td class="input-cell">
+              <!-- <el-form-item prop="sex" class="form-item-custom">
+                <el-select v-model="form.sex" placeholder="请选择性别" class="basic-input" disabled>
+                  <el-option label="男" value="0"></el-option>
+                  <el-option label="女" value="1"></el-option>
+                </el-select>
+              </el-form-item> -->
+              {{ form.sex }}
+            </td>
+            <td class="label">民族</td>
+            <td class="input-cell">
+              <!-- <el-form-item prop="nations" class="form-item-custom">
+                <el-input v-model="form.nations" placeholder="请输入民族" class="basic-input" disabled></el-input>
+              </el-form-item> -->
+              <!-- 用dict-tag组件渲染字典标签 -->
+              <dict-tag :options="dict.type.rt_nation" :value="form.nations" />
+            </td>
+            <td class="label">班级</td>
+            <td class="input-cell" colspan="2">
+              <!-- <el-form-item prop="stClass" class="form-item-custom">
+                <el-input v-model="form.stClass" placeholder="请输入年级" class="basic-input" disabled></el-input>
+              </el-form-item> -->
+              {{ form.stClass }}
+            </td>
+          </tr>
 
 
-           <!-- 专业、学号、班级行 -->
-        <tr>
-           <td class="label">学号</td>
-          <td class="input-cell">
-            <el-form-item prop="stId" class="form-item-custom">
-              <el-input v-model="form.stId" placeholder="请输入学号" class="basic-input" type="textarea" :rows="3"></el-input>
-            </el-form-item>
-          </td>
-          <td class="label" rowspan="2">专业<br />名称</td>
-          <td class="input-cell" colspan="3" rowspan="2">
-            <el-form-item prop="majors" class="form-item-custom">
-              <el-input v-model="form.majors" placeholder="请输入专业名称" class="major-input" type="textarea" :rows="3"></el-input>
-            </el-form-item>
-          </td>
-         
-          <td class="label">联系电话</td>
-          <td class="input-cell" colspan="2">
-            <el-form-item prop="datab" class="form-item-custom">
-              <el-input v-model="form.datab" placeholder="请输入电话" class="basic-input" type="textarea" :rows="3"></el-input>
-            </el-form-item>
-          </td>
-        </tr>
-        <tr></tr>
+          <!-- 专业、学号、班级行 -->
+          <tr>
+            <td class="label">学号</td>
+            <td class="input-cell">
+              <!-- <el-form-item prop="stId" class="form-item-custom">
+                <el-input v-model="form.stId" placeholder="请输入学号" class="basic-input" type="textarea" disabled
+                  :rows="3"></el-input>
+              </el-form-item> -->
+              {{ form.stId }}
+            </td>
+            <td class="label" rowspan="2">专业<br />名称</td>
+            <td class="input-cell" colspan="3" rowspan="2">
+              <!-- <el-form-item prop="majors" class="form-item-custom">
+                <el-input v-model="form.majors" placeholder="请输入专业名称" class="major-input" type="textarea" disabled
+                  :rows="3"></el-input>
+              </el-form-item> -->
+              {{ form.majors }}
+            </td>
 
-         <tr>
-          <td class="label" rowspan="4">申请<br />理由</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-             <p class="reason-text">本人于 
-               <el-form-item prop="rwTime" class="form-item-custom inline-item">
-                <el-date-picker v-model="form.rwTime" type="date" placeholder="选择日期" format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd" class="date-picker"></el-date-picker>
-              </el-form-item> 
-              应征入伍，于
-              <el-form-item prop="dataa" class="form-item-custom inline-item">
-                <el-date-picker v-model="form.dataa" type="date" placeholder="选择日期" format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd" class="date-picker"></el-date-picker>
-              </el-form-item> 日退役，退役后申请复学。
-            </p>
-             <p class="reason-text" style="" v-if="form.conversion=='Y'">是否申请转专业：（√）是   （）否
-            </p>
-             <p class="reason-text" style="" v-else>是否申请转专业：（）是   （×）否
-            </p>
-            <p class="reason-text" style="color: red;">原年级和专业:__
-              {{ form.maList.length > 0 ? form.maList[0].oldgrade : '暂无数据' }}
-              __{{ form.maList.length > 0 ? form.maList[0].oldmajor : '暂无数据' }}__
-               <!-- <el-input v-model="form.maList.oldgrade" type="textarea" :rows="3"
+            <td class="label">联系电话</td>
+            <td class="input-cell" colspan="2">
+              <!-- <el-form-item prop="datab" class="form-item-custom">
+                <el-input v-model="form.datab" placeholder="请输入电话" class="basic-input" type="textarea" disabled
+                  :rows="3"></el-input>
+              </el-form-item> -->
+              {{ form.datab }}
+            </td>
+          </tr>
+          <tr></tr>
+
+          <tr>
+            <td class="label" rowspan="4">申请<br />理由</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <p class="reason-text">本人于
+                <!-- <el-form-item prop="rwTime" class="form-item-custom inline-item">
+                  <el-date-picker v-model="form.rwTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                    value-format="yyyy-MM-dd" class="date-picker"></el-date-picker>
+                </el-form-item> -->
+                {{ form.rwTime | formatDate }}
+                应征入伍，于
+                <!-- <el-form-item prop="dataa" class="form-item-custom inline-item">
+                  <el-date-picker v-model="form.dataa" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                    value-format="yyyy-MM-dd" class="date-picker"></el-date-picker>
+                </el-form-item>  -->
+                {{ form.dataa | formatDate }}
+                日退役，退役后申请复学。
+              </p>
+              <p class="reason-text" style="" v-if="form.conversion == 'Y'">是否申请转专业：（√）是 （）否
+              </p>
+              <p class="reason-text" style="" v-else>是否申请转专业：（）是 （×）否
+              </p>
+              <p v-if="form.conversion === 'Y'" class="reason-text" style="color: red;">原年级和专业:__
+                {{ form.maList.length > 0 ? form.maList[0].oldgrade : '' }}
+                __{{ form.maList.length > 0 ? form.maList[0].oldmajor : '' }}__
+                <!-- <el-input v-model="form.maList.oldgrade" type="textarea" :rows="3"
               class="opinion-textarea">{{oldgrade}}</el-input> -->
-              <!-- <el-input v-model="form.maList.oldgrade" type="textarea" :rows="3"
+                <!-- <el-input v-model="form.maList.oldgrade" type="textarea" :rows="3"
               class="opinion-textarea"></el-input> -->
-              
-              申请转入年级和专业：__
-              {{ form.maList.length > 0 ? form.maList[0].newgrade : '暂无数据' }}
-              __
-              {{ form.maList.length > 0 ? form.maList[0].newmajor : '暂无数据' }}__
-            </p>
 
-            <image-preview
-              v-if="form.maList.length > 0 && form.maList[0].proof"
-              :src="form.maList[0].proof"
-              :width="240"
-              :height="160"
-            />
-            <span v-else>暂无图片</span>
+                申请转入年级和专业：__
+                {{ saveGradeName }}
+                __
+                {{ saveClassName }}__
+              </p>
 
-           <image-preview
-              v-if="form.maList.length > 0 && form.maList[0].idcard"
-              :src="form.maList[0].idcard"
-              :width="240"
-              :height="160"
-            />
-            <span v-else>暂无图片</span>
+              <image-preview v-if="form.maList.length > 0 && form.maList[0].proof" :src="form.maList[0].proof"
+                :width="240" :height="160" />
+              <span v-else></span>
 
-            <image-preview
-              v-if="form.maList.length > 0 && form.maList[0].material"
-              :src="form.maList[0].material"
-              :width="240"
-              :height="160"
-            />
-            <span v-else>暂无图片</span>
-            
-            <p class="attachment-tip"></p>
-            <div class="applicant-info right-align">
-               <span>申请人：</span>
-              <el-input v-model="form.stName" readonly class="applicant-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-form-item prop="times" class="form-item-custom inline-item">
-                <el-date-picker v-model="form.times" type="date" placeholder="选择日期" format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-              </el-form-item>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
-        
-         <!-- 招生意见行 -->
-        <tr v-if="form.conversion === 'Y'">
-          <td class="label" rowspan="4">招生与<br />就业处<br />意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-            <p class="reason-text" style="color: red;">符合转专业条件，拟同意转入年级和专业：
-              __{{ form.maList.length > 0 ? form.maList[0].newgrade : '暂无数据' }}
-              __
-              {{ form.maList.length > 0 ? form.maList[0].newmajor : '暂无数据' }}__
-            </p>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="form.status" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="form.idea" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="form.time" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
+              <image-preview v-if="form.maList.length > 0 && form.maList[0].idcard" :src="form.maList[0].idcard"
+                :width="240" :height="160" />
+              <span v-else></span>
+
+              <image-preview v-if="form.maList.length > 0 && form.maList[0].material" :src="form.maList[0].material"
+                :width="240" :height="160" />
+              <span v-else></span>
+
+              <p class="attachment-tip"></p>
+              <div class="applicant-info right-align">
+                <span>申请人：</span>
+                <!-- <el-input v-model="form.stName" readonly class="applicant-input" disabled></el-input> -->
+                {{ form.stName }}
+                <span class="date-label">日期：</span>
+                <!-- <el-form-item prop="times" class="form-item-custom inline-item">
+                  <el-date-picker v-model="form.times" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                    value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
+                </el-form-item> -->
+                {{ form.times | formatDate }}
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
+
+          <!-- 招生意见行 -->
+          <tr v-if="form.conversion === 'Y'">
+            <td class="label" rowspan="4">招生与<br />就业处<br />意见</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <p class="reason-text" style="color: red;">符合转专业条件，拟同意转入年级和专业：
+                __{{ saveGradeName }}
+                __
+                {{ saveClassName }}__
+              </p>
+              <div class="signature-area right-align">
+                <span>审批结果：</span>
+                <el-select v-model="form.zsStatus" placeholder="" class="short-select" disabled>
+                  <el-option label="重新审核" value="0"></el-option>
+                  <el-option label="通过" value="1"></el-option>
+                  <el-option label="退回" value="2"></el-option>
+                  <el-option label="驳回" value="3"></el-option>
+                </el-select>
+                <span class="date-label">签名：</span>
+                <!-- <el-input v-model="form.idea" placeholder="请输入姓名" class="signature-input" disabled></el-input> -->
+                {{ form.zsIdea }}
+                <span class="date-label">日期：</span>
+                <!-- <el-date-picker v-model="form.time" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker> -->
+                {{ form.zsTime | formatDate }}
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
 
           <!-- 辅导员意见行 -->
-        <tr>
-          <td class="label" rowspan="4">辅导员<br />意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-            <el-input v-model="form.fdIdea" type="textarea" :rows="3" placeholder="请填写辅导员意见..."
-              class="opinion-textarea"></el-input>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="form.fdStatus" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="form.fdQm" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="form.fdTime" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
+          <tr>
+            <td class="label" rowspan="4">辅导员<br />意见</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <!-- <el-input v-model="form.fdIdea" type="textarea" :rows="3" placeholder="请填写辅导员意见..." disabled
+                class="opinion-textarea"></el-input> -->
+              {{ form.fdIdea }}
+              <div class="signature-area right-align">
+                <span>审批结果：</span>
+                <el-select v-model="form.fdStatus" placeholder="待审核" class="short-select" disabled>
+                  <el-option label="重新审核" value="0"></el-option>
+                  <el-option label="通过" value="1"></el-option>
+                  <el-option label="退回" value="2"></el-option>
+                  <el-option label="驳回" value="3"></el-option>
+                </el-select>
+                <span class="date-label">签名：</span>
+                <!-- <el-input v-model="form.fdQm" placeholder="请输入姓名" class="signature-input" disabled></el-input> -->
+                {{ form.fdQm }}
+                <span class="date-label">日期：</span>
+                <!-- <el-date-picker v-model="form.fdTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker> -->
+                {{ form.fdTime | formatDate }}
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
 
 
-         <!-- 学务意见行 -->
-        <tr>
-          <td class="label" rowspan="4">学务<br />意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-            <p>拟编入</p>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="form.xwStatus" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="form.xwQm" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="form.xwTime" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
+          <!-- 学务意见行 -->
+          <tr>
+            <td class="label" rowspan="4">学务<br />意见</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <!-- <el-input v-model="form.xwIdea" type="textarea" :rows="3" placeholder="请填写意见..."
+                class="opinion-textarea"></el-input> -->
+              {{ form.xwIdea }}
+              <div class="signature-area right-align">
+                <span>审批结果：</span>
+                <el-select v-model="form.xwStatus" placeholder="待审核" class="short-select" disabled>
+                  <el-option label="重新审核" value="0"></el-option>
+                  <el-option label="通过" value="1"></el-option>
+                  <el-option label="退回" value="2"></el-option>
+                  <el-option label="驳回" value="3"></el-option>
+                </el-select>
+                <span class="date-label">签名：</span>
+                <!-- <el-input v-model="form.xwQm" placeholder="请输入姓名" class="signature-input" disabled></el-input> -->
+                {{ form.xwQm }}
+                <span class="date-label">日期：</span>
+                <!-- <el-date-picker v-model="form.xwTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker> -->
+                {{ form.xwTime | formatDate }}
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
 
 
-         <!-- 二级意见行 -->
-        <tr>
-          <td class="label" rowspan="4">二级学<br />院意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-           <el-input v-model="form.twoIdea" type="textarea" :rows="3" placeholder="请填写意见..."
-              class="opinion-textarea"></el-input>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="form.twoStatus" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="form.erQm" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="form.twoTime" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
+          <!-- 二级意见行 -->
+          <tr>
+            <td class="label" rowspan="4">二级学<br />院意见</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <!-- <el-input v-model="form.twoIdea" type="textarea" :rows="3" placeholder="请填写意见..."
+                class="opinion-textarea"></el-input> -->
+              {{ form.twoIdea }}
+              <div class="signature-area right-align">
+                <span>审批结果：</span>
+                <el-select v-model="form.twoStatus" placeholder="待审核" class="short-select" disabled>
+                  <el-option label="重新审核" value="0"></el-option>
+                  <el-option label="通过" value="1"></el-option>
+                  <el-option label="退回" value="2"></el-option>
+                  <el-option label="驳回" value="3"></el-option>
+                </el-select>
+                <span class="date-label">签名：</span>
+                <!-- <el-input v-model="form.erQm" placeholder="请输入姓名" class="signature-input" disabled></el-input> -->
+                {{ form.erQm }}
+                <span class="date-label">日期：</span>
+                {{ form.twoTime | formatDate }}
+                <!-- <el-date-picker v-model="form.twoTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker> -->
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
 
-         <!-- 学籍管理科意见行 -->
-        <tr>
-          <td class="label" rowspan="4">学籍管<br />理科意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-           <el-input v-model="form.xjIdea" type="textarea" :rows="3" placeholder="请填写意见..."
-              class="opinion-textarea"></el-input>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="form.xjglStatus" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="form.xjQm" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="form.xjTime" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
+          <!-- 学籍管理科意见行 -->
+          <tr>
+            <td class="label" rowspan="4">学籍管<br />理科意见</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <!-- <el-input v-model="form.xjIdea" type="textarea" :rows="3" placeholder="请填写意见..." disabled
+                class="opinion-textarea"></el-input> -->
+              {{ form.xjIdea }}
+              <div class="signature-area right-align">
+                <span>审批结果：</span>
+                <el-select v-model="form.xjglStatus" placeholder="待审核" class="short-select" disabled>
+                  <el-option label="重新审核" value="0"></el-option>
+                  <el-option label="通过" value="1"></el-option>
+                  <el-option label="退回" value="2"></el-option>
+                  <el-option label="驳回" value="3"></el-option>
+                </el-select>
+                <span class="date-label">签名：</span>
+                <!-- <el-input v-model="form.xjQm" placeholder="请输入姓名" class="signature-input" disabled></el-input> -->
+                {{ form.xjQm }}
+                <span class="date-label">日期：</span>
+                {{ form.xjTime | formatDate }}
+                <!-- <el-date-picker v-model="form.xjTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker> -->
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
 
-        
-         <!-- 教务处主意见行 -->
-        <tr>
-          <td class="label" rowspan="4">教务处<br />主管领导意见</td>
-          <td class="input-cell" colspan="8" rowspan="4">
-           <el-input v-model="form.jwIdea" type="textarea" :rows="3" placeholder="请填写意见..."
-              class="opinion-textarea"></el-input>
-            <div class="signature-area right-align">
-              <span>审批结果：</span>
-              <el-select v-model="form.jwStatus" placeholder="请选择" class="short-select">
-                <el-option label="通过" value="1"></el-option>
-                <el-option label="驳回" value="2"></el-option>
-              </el-select>
-              <span class="date-label">签名：</span>
-              <el-input v-model="form.jwQm" placeholder="请输入姓名" class="signature-input"></el-input>
-              <span class="date-label">日期：</span>
-              <el-date-picker v-model="form.jwTime" type="date" placeholder="选择日期"
-                format="yyyy-MM-dd" value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker>
-            </div>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr></tr>
 
-      </table>
+          <!-- 教务处主意见行 -->
+          <tr>
+            <td class="label" rowspan="4">教务处<br />主管领导意见</td>
+            <td class="input-cell" colspan="8" rowspan="4">
+              <!-- <el-input v-model="form.jwIdea" type="textarea" :rows="3" placeholder="请填写意见..." disabled
+                class="opinion-textarea"></el-input> -->
+              {{ form.jwIdea }}
+              <div class="signature-area right-align">
+                <span>审批结果：</span>
+                <el-select v-model="form.jwStatus" placeholder="待审核" class="short-select" disabled>
+                  <el-option label="重新审核" value="0"></el-option>
+                  <el-option label="通过" value="1"></el-option>
+                  <el-option label="退回" value="2"></el-option>
+                  <el-option label="驳回" value="3"></el-option>
+                </el-select>
+                <span class="date-label">签名：</span>
+                <!-- <el-input v-model="form.jwQm" placeholder="请输入姓名" class="signature-input" disabled></el-input> -->
+                {{ form.jwQm }}
+                <span class="date-label">日期：</span>
+                {{ form.jwTime | formatDate }}
+                <!-- <el-date-picker v-model="form.jwTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" disabled
+                  value-format="yyyy-MM-dd" class="date-picker full-date"></el-date-picker> -->
+              </div>
+            </td>
+          </tr>
+          <tr></tr>
+          <tr></tr>
+          <tr></tr>
+
+        </table>
         <!-- 说明信息 -->
-      <div class="form-description">
-        <p>说明：1.本表应附学生入伍证明材料复印件；</p>
-        <p>2.本表一式两份，二级学院和教务处各留存一份。</p>
-      </div>
+        <div class="form-description">
+          <p>说明：1.本表应附学生入伍证明材料复印件；</p>
+          <p>2.本表一式两份，二级学院和教务处各留存一份。</p>
+        </div>
 
 
         <!-- 操作按钮 -->
-      <!-- <div class="form-btn-group"> -->
+        <!-- <div class="form-btn-group"> -->
         <!-- <el-button type="primary" @click="submitForm">提交审核</el-button> -->
         <!-- <el-button @click="resetForm">重置表单</el-button> -->
         <!-- <el-button type="text" @click="printForm">打印表单</el-button> -->
-      <!-- </div> -->
-
-     </el-form>
+        <!-- </div> -->
+      </el-form>
+    </div>
+    <!-- 按钮 -->
+    <div class="form-btn-group">
+      <el-button type="primary" @click="doPrint">打印表单</el-button>
+    </div>
 
   </div>
 
@@ -305,10 +344,13 @@
 
 <script>
 import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
+import { listStudent, getClassName } from '@/api/stuCQS/basedata/student'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
+import print from 'print-js'
 
 export default {
   name: "Basic",
-  dicts: ['sys_user_sex'],
+  dicts: ['sys_yes_no', 'sys_user_sex', 'rt_filling_college', 'sys_commit_status', 'sys_teacher_kpi_filling_year', 'rt_nation', 'rt_classes'],
   data() {
     return {
       // 遮罩层
@@ -329,6 +371,9 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+
+      // 班级名称列表
+      ClassNameList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -376,6 +421,10 @@ export default {
         processId: null,
         deployId: null
       },
+      // 班级名称
+      saveClassName:null,
+      // 年级名称
+      saveGradeName:null,
       // 表单参数
       form: {},
       // 表单校验
@@ -389,16 +438,74 @@ export default {
   },
   methods: {
 
-     showData() {
+    /** 获取班级名称列表 */
+    getClassNameList() {
+      getClassName().then(res => {
+        this.ClassNameList = res.data
+        // console.log(this.ClassNameList)
+        if (this.ClassNameList != null) {
+          this.ClassNameList.forEach(element => {
+            if (element.value == this.form.maList[0].data1) {
+              // console.log(element.label)
+              element.children.forEach(elementTwo => {
+                  if (elementTwo.value == this.form.maList[0].data2) {
+                    //  console.log(elementTwo.label)
+                    elementTwo.children.forEach(elementFree => {
+                      this.saveClassName = elementFree.label
+                      // console.log(elementFree.label)
+                    });
+                  }
+                });
+            }
+          });
+        }
+      })
+    },
+
+    // 打印方法
+    doPrint() {
+      printJS({
+        printable: 'print',
+        type: 'html',
+        targetStyles: ['*'],
+        style: '@page {margin:2.4cm 2cm ;resolution: 300dpi;}',
+        onPrintDialogClose: (this.erexcel = false),
+        targetStyles: ['*'],
+        font_size: '',
+      })
+    },
+
+    // 回显数据
+    showData() {
       if (this.$route.query.id != undefined) {
         console.log(this.$route.query.id)
         getBasic(this.$route.query.id).then((response) => {
           this.form = response.data
+          this.getClassNameList()
+          this.listGrade()
           // this.active = response.data.status + 1;
         })
       }
     },
 
+      /** 获取年级列表 */
+        async listGrade() {
+            try {
+                let res = await listGrade()
+                if (res.code == 200) {
+                    this.grade_list = [...res.rows]
+                    console.log(this.grade_list)
+                    this.grade_list.forEach(element => {
+                      if(element.gradeId == this.form.maList[0].newgrade){
+                          this.saveGradeName = element.gradeName
+                      }
+                    });
+                }
+            } catch (error) {
+                console.error('获取年级列表失败:', error)
+            }
+        },
+
     /** 查询退伍复学申请列表 */
     getList() {
       this.loading = true;
@@ -477,7 +584,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -519,12 +626,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function () {
         return delBasic(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -726,4 +833,69 @@ export default {
     padding-bottom: 8px !important;
   }
 }
+
+
+
+/* 针对所有 .basic-input 去掉边框和背景 */
+.basic-input {
+  border: none !important;
+  background: transparent !important;
+  box-shadow: none !important;
+  /* 去掉可能存在的阴影 */
+}
+
+.form-table {
+  font-family: "微软雅黑", sans-serif;
+  font-size: 14px;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+.form-table th,
+.form-table td {
+  border: 1px solid #000;
+  padding: 8px 12px;
+  text-align: left;
+}
+
+.form-table .label-cell {
+  background-color: #f5f5f5;
+  font-weight: bold;
+}
+
+/* 打印专用样式（继承系统样式，覆盖浏览器默认） */
+@media print {
+
+  /* 强制打印时使用系统字体 */
+  body {
+    font-family: "微软雅黑", sans-serif !important;
+    font-size: 14px !important;
+  }
+
+  /* 确保表格边框、背景与系统一致（部分浏览器打印会忽略背景，需开启） */
+  .form-table {
+    border-collapse: collapse !important;
+    width: 100% !important;
+    -webkit-print-color-adjust: exact;
+    /* 强制打印背景色 */
+    print-color-adjust: exact;
+  }
+
+  .form-table th,
+  .form-table td {
+    border: 1px solid #000 !important;
+    padding: 8px 12px !important;
+    text-align: left !important;
+  }
+
+  .form-table .label-cell {
+    background-color: #f5f5f5 !important;
+    font-weight: bold !important;
+  }
+
+  /* 隐藏打印无关元素（如按钮） */
+  .no-print {
+    display: none !important;
+  }
+}
 </style>
diff --git a/src/views/routine/dis/jwcshe.vue b/src/views/routine/dis/jwcshe.vue
deleted file mode 100644
index b4f9299..0000000
--- a/src/views/routine/dis/jwcshe.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-  <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="stId">
-        <el-input
-          v-model="queryParams.stId"
-          placeholder="请输入学号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名" prop="stName">
-        <el-input
-          v-model="queryParams.stName"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    
-      <el-form-item label="时间" prop="times">
-        <el-input
-          v-model="queryParams.times"
-          placeholder="请输入时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <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"
-          v-hasPermi="['routine:basic:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="basicList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="学号" align="center" prop="stId" />
-      <el-table-column label="姓名" align="center" prop="stName" />
-     
-      <!-- <el-table-column label="性别" align="center" prop="sex">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="民族" align="center" prop="nations">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_nation" :value="scope.row.nations"/>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="班级" align="center" prop="stClass">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_classes" :value="scope.row.stClass"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="学院" align="center" prop="college">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_college" :value="scope.row.college"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="times" />
-      <el-table-column label="辅导员审核状态" align="center" prop="fdStatus" />
-      <el-table-column label="学务审核" align="center" prop="xwStatus" />
-      <el-table-column label="二级学院审核状态" align="center" prop="twoStatus" />
-      <el-table-column label="学籍管理审核状态" align="center" prop="xjglStatus" />
-      <el-table-column label="教务处审核状态" align="center" prop="jwcStatus" />
-      <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)"
-            v-hasPermi="['routine:basic:edit']"
-          >查看材料</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['routine:basic:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改退伍复学申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="学号" prop="stId">
-          <el-input v-model="form.stId" placeholder="请输入学号" />
-        </el-form-item>
-        <el-form-item label="姓名" prop="stName">
-          <el-input v-model="form.stName" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="辅导员名字" prop="fdName">
-          <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
-        </el-form-item>
-        <el-form-item label="性别" prop="sex">
-          <el-select v-model="form.sex" placeholder="请选择性别">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民族" prop="nations">
-          <el-input v-model="form.nations" placeholder="请输入民族" />
-        </el-form-item>
-        <el-form-item label="班级" prop="stClass">
-          <el-input v-model="form.stClass" placeholder="请输入班级" />
-        </el-form-item>
-        <el-form-item label="专业" prop="majors">
-          <el-input v-model="form.majors" placeholder="请输入专业" />
-        </el-form-item>
-        <el-form-item label="年级" prop="grade">
-          <el-input v-model="form.grade" placeholder="请输入年级" />
-        </el-form-item>
-        <el-form-item label="学院" prop="college">
-          <el-input v-model="form.college" placeholder="请输入学院" />
-        </el-form-item>
-        <el-form-item label="原因" prop="reasons">
-          <el-input v-model="form.reasons" placeholder="请输入原因" />
-        </el-form-item>
-        <el-form-item label="时间" prop="times">
-          <el-input v-model="form.times" placeholder="请输入时间" />
-        </el-form-item>
-        <el-form-item label="空余字段" prop="datab">
-          <el-input v-model="form.datab" placeholder="请输入空余字段" />
-        </el-form-item>
-        <el-form-item label="" prop="dataa">
-          <el-input v-model="form.dataa" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="专业转换" prop="conversion">
-          <el-input v-model="form.conversion" placeholder="请输入专业转换" />
-        </el-form-item>
-      </el-form> -->
-       <el-tabs type="border-card">
-        <el-tab-pane label="基础信息填写">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="basicList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="姓名" align="center" prop="stName" />
-                  <el-table-column label="辅导员名字" align="center" prop="fdName" />
-                  <el-table-column label="性别" align="center" prop="sex" />
-                  <el-table-column label="民族" align="center" prop="nations" />
-                  <el-table-column label="班级" align="center" prop="stClass" />
-                  <el-table-column label="专业" align="center" prop="majors" />
-                  <el-table-column label="年级" align="center" prop="grade" />
-                  <el-table-column label="学院" align="center" prop="college" />
-                  <el-table-column label="原因" align="center" prop="grade" />
-                  <el-table-column label="原因" align="center" prop="reasons" />
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-         <el-tab-pane label="上传材料">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="form.maList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="原年级" align="center" prop="oldgrade" />
-                  <el-table-column label="原专业" align="center" prop="oldmajor" />
-                  <el-table-column label="新年级" align="center" prop="newgrade" />
-                  <el-table-column label="新专业" align="center" prop="newmajor" />
-                  <el-table-column label="退役证明" align="center" prop="proof" />
-                  <el-table-column label="身份证" align="center" prop="idcard" />
-                  <el-table-column label="材料" align="center" prop="material" />
-
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-
-      </el-tabs>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
-import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
-export default {
-  name: "Basic",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 退伍复学申请表格数据
-      basicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询退伍复学申请列表 */
-    getList() {
-      this.loading = true;
-      listBasic(this.queryParams).then(response => {
-        this.basicList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.basicList )
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加退伍复学申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getBasic(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "查看填报信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBasic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              // this.form.stId
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addBasic(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              console.log(this.form.stId)
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-              
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function() {
-        return delBasic(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('routine/basic/export', {
-        ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/src/views/routine/dis/mate/index.vue b/src/views/routine/dis/mate/index.vue
index 018d0fd..dde0883 100644
--- a/src/views/routine/dis/mate/index.vue
+++ b/src/views/routine/dis/mate/index.vue
@@ -169,10 +169,21 @@
           <el-input v-model="form.oldmajor" placeholder="请输入原专业" />
         </el-form-item>
         <el-form-item label="新年级" prop="newgrade" :rules="rules.reason5">
-          <el-input v-model="form.newgrade" placeholder="请输入新年级" />
+          <el-select v-model="form.newgrade" filterable clearable placeholder="请选择年级" style="width: 100%">
+            <el-option v-for="item in grade_list" :key="item.gradeId" :label="item.gradeName" :value="item.gradeId" />
+          </el-select>
+
+          <!-- <el-input v-model="form.newgrade" placeholder="请输入新专业" /> -->
         </el-form-item>
-        <el-form-item label="新专业" prop="newmajor" :rules="rules.reason6">
-          <el-input v-model="form.newmajor" placeholder="请输入新专业" />
+        <el-form-item label="新班级" prop="newmajor" :rules="rules.reason6">
+          <el-cascader v-model="classVlue1" placeholder="请选择班级" :show-all-levels="false" :options="ClassNameList"
+            clearable filterable style="width: 100%" @change="handleChange1">
+            <template slot-scope="{ node, data }">
+              <span>{{ data.label }}</span>
+              <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+            </template>
+          </el-cascader>
+          <!-- <el-input v-model="form.newmajor" placeholder="请输入新专业" /> -->
         </el-form-item>
         <el-form-item label="退役证明" prop="proof">
           <image-upload v-model="form.proof" />
@@ -196,6 +207,8 @@
 <script>
 import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
 import { getUserProfile } from '@/api/system/user' // 获取
+import { listGrade } from '@/api/stuCQS/basedata/grade'
+import { listStudent, getClassName } from '@/api/stuCQS/basedata/student'
 
 export default {
   name: "Mate",
@@ -220,7 +233,13 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-        // 查询参数
+      // 年级列表
+      grade_list: [],
+      // 班级搜索选择
+      classVlue1: [],
+      // 班级名称列表
+      ClassNameList: [],
+      // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -266,10 +285,40 @@ export default {
   created() {
     // this.getList();
     this.getUser()
+    this.listGrade()
+    this.getClassNameList()
   },
   methods: {
-    
-       // 获取当前登录信息
+
+    /** 搜索班级选择 */
+    handleChange1(value) {
+      console.log(value)
+      this.form.data1 = value[0]
+      this.form.data2 = value[1]
+      this.form.newmajor = value[2]
+
+    },
+
+    /** 获取班级名称列表 */
+    getClassNameList() {
+      getClassName().then(res => {
+        this.ClassNameList = res.data
+      })
+    },
+
+    /** 获取年级列表 */
+    async listGrade() {
+      try {
+        let res = await listGrade()
+        if (res.code == 200) {
+          this.grade_list = [...res.rows]
+        }
+      } catch (error) {
+        console.error('获取年级列表失败:', error)
+      }
+    },
+
+    // 获取当前登录信息
     getUser() {
       this.loading = true
       getUserProfile().then(response => {
@@ -305,7 +354,7 @@ export default {
       this.open = false;
       this.reset();
     },
-      // 表单重置
+    // 表单重置
     reset() {
       this.form = {
         id: null,
diff --git a/src/views/routine/dis/she.vue b/src/views/routine/dis/she.vue
index 97dda55..87dc209 100644
--- a/src/views/routine/dis/she.vue
+++ b/src/views/routine/dis/she.vue
@@ -51,6 +51,56 @@
         </template> -->
       </el-table-column>
       <el-table-column label="时间" align="center" prop="times" />
+
+       <el-table-column label="审核状态" align="center" prop="jwcStatus" >
+          <template slot-scope="scope">
+
+
+             <el-tag v-if="scope.row.conversion=='Y' ">
+                <!-- 审批状态（0、待审批；1、已通过； -->
+                  <el-tag v-if="scope.row.zsStatus == 0 || scope.row.zsStatus == null">招就处审批中</el-tag>
+                   <el-tag v-else-if="scope.row.zsStatus == 1 && (scope.row.fdStatus == 0 || scope.row.fdStatus == null)  ">辅导员审核中</el-tag>
+                  <el-tag v-else-if="scope.row.fdStatus == 1 && (scope.row.xwStatus == 0 || scope.row.xwStatus == null)  ">学务审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xwStatus == 1 && ( scope.row.twoStatus == 0 || scope.row.twoStatus == null)" >二级学院审核中</el-tag>
+                  <el-tag v-else-if="scope.row.twoStatus == 1 && ( scope.row.xjglStatus == 0 || scope.row.xjglStatus == null)" >学籍管理审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xjglStatus == 1 && ( scope.row.jwStatus == 0 || scope.row.jwStatus == null)" >教务处主管审核中</el-tag>
+                  
+                  <el-tag v-else-if="scope.row.fdStatus == 1  || scope.row.xwStatus == 1 || scope.row.twoStatus == 1 ||  scope.row.xjglStatus == 1 || scope.row.jwStatus == 1   " type="success">审批通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 2  || scope.row.xwStatus == 2 || scope.row.twoStatus == 2 ||  scope.row.xjglStatus == 2 || scope.row.jwStatus == 2 "
+                          type="danger"
+                  >审批未通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 3  || scope.row.xwStatus == 3 || scope.row.twoStatus == 3 ||  scope.row.xjglStatus == 3 || scope.row.jwStatus == 3 "
+                          type="danger"
+                  >审批未通过</el-tag>
+            </el-tag>
+
+            <el-tag v-if="scope.row.conversion=='N' ">
+                 <!-- 审批状态（0、待审批；1、已通过； -->
+                  <el-tag v-if="scope.row.fdStatus == 0 || scope.row.fdStatus == null">辅导员审批中</el-tag>
+                  <el-tag v-else-if="scope.row.fdStatus == 1 && (scope.row.xwStatus == 0 || scope.row.xwStatus == null)  ">学务审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xwStatus == 1 && ( scope.row.twoStatus == 0 || scope.row.twoStatus == null)" >二级学院审核中</el-tag>
+                  <el-tag v-else-if="scope.row.twoStatus == 1 && ( scope.row.xjglStatus == 0 || scope.row.xjglStatus == null)" >学籍管理审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xjglStatus == 1 && ( scope.row.jwStatus == 0 || scope.row.jwStatus == null)" >教务处主管审核中</el-tag>
+                  
+                  <el-tag v-else-if="scope.row.fdStatus == 1  || scope.row.xwStatus == 1 || scope.row.twoStatus == 1 ||  scope.row.xjglStatus == 1 || scope.row.jwStatus == 1   " type="success">审批通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 2  || scope.row.xwStatus == 2 || scope.row.twoStatus == 2 ||  scope.row.xjglStatus == 2 || scope.row.jwStatus == 2 "
+                          type="danger"
+                  >审批未通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 3  || scope.row.xwStatus == 3 || scope.row.twoStatus == 3 ||  scope.row.xjglStatus == 3 || scope.row.jwStatus == 3 "
+                          type="danger"
+                  >审批未通过</el-tag>
+            </el-tag>
+
+           
+
+         
+         
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="辅导员审核状态" align="center" prop="fdStatus" />
       <el-table-column label="学务审核" align="center" prop="xwStatus" />
       <el-table-column label="二级学院审核状态" align="center" prop="twoStatus" />
@@ -59,7 +109,7 @@
       <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="handledetail(scope.row)"
-            v-hasPermi="['routine:basic:edit']">开始审核</el-button>
+            v-hasPermi="['routine:basic:edit']">查看信息</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['routine:basic:remove']">删除</el-button>
         </template>
@@ -184,7 +234,7 @@
 <script>
 import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
 import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
+import { getUserProfile } from '@/api/system/user' // 获取
 export default {
   name: "Basic",
   dicts: ['sys_user_sex'],
@@ -212,25 +262,48 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        fxId: null,
+        fxTime: null,
         stId: null,
         stName: null,
         fdName: null,
         sex: null,
         nations: null,
+        fdQm: null,
+        xwQm: null,
+        erQm: null,
+        xjQm: null,
+        jwQm: null,
         stClass: null,
         majors: null,
         grade: null,
         college: null,
         reasons: null,
+        fdIdea: null,
+        twoIdea: null,
+        xwIdea: null,
+        xjIdea: null,
+        jwIdea: null,
+        zsIdea: null,
+        zsStatus: null,
         times: null,
         fdStatus: null,
         xwStatus: null,
         twoStatus: null,
         xjglStatus: null,
+        jwStatus: null,
+        rwTime: null,
+        zsTime: null,
+        fdTime: null,
+        xwTime: null,
+        twoTime: null,
+        xjTime: null,
+        jwTime: null,
         datab: null,
         dataa: null,
         conversion: null,
-        jwcStatus: null
+        processId: null,
+        deployId: null
       },
       // 表单参数
       form: {},
@@ -240,14 +313,58 @@ export default {
     };
   },
   created() {
-    this.getList();
+    // this.getList();
+    this.getUser()
   },
   methods: {
 
+       // 获取当前登录信息
+    getUser() {
+      this.loading = true
+      getUserProfile().then(response => {
+        // this.user = response.data;
+        this.roleGroup = response.roleGroup
+        // this.postGroup = response.postGroup;
+        // console.log(response);
+        if (response.roleGroup.includes('辅导员')) {
+          this.queryParams.fdQm = response.data.nickName
+          this.getList()
+          return
+        }else if(response.roleGroup.includes("招就处")){
+          this.queryParams.zsIdea = response.data.nickName
+          this.getList()
+          return
+        }else if(response.roleGroup.includes("学务干事")){
+          this.queryParams.xwQm = response.data.nickName
+          this.getList()
+          return
+        }else if(response.roleGroup.includes("二级学院领导")){
+          this.queryParams.erQm = response.data.nickName
+          this.getList()
+          return
+        }else if(response.roleGroup.includes("学籍管理科")){
+          this.queryParams.xjQm = response.data.nickName
+          this.getList()
+          return
+        }
+        else if(response.roleGroup.includes("教务处主管领导")){
+          this.queryParams.jwQm = response.data.nickName
+          this.getList()
+          return
+        }
+        //  else if (!response.roleGroup.includes('辅导员')) {
+        //   this.getList()
+        //   return
+        // }
+        this.loading = false
+        // this.getList();
+      })
+    },
+
       // 跳转到表单页面
     handledetail(row) {
       this.$router.push({
-        path: '/routine/dis/fd',
+        path: '/routine/dis/formSt',
         query: {
           id: row.id,
       
@@ -408,7 +525,7 @@ export default {
     handleExport() {
       this.download('routine/basic/export', {
         ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
+      }, `退伍复学_${new Date().getTime()}.xlsx`)
     }
   }
 };
diff --git a/src/views/routine/dis/shenhe.vue b/src/views/routine/dis/shenhe.vue
index 2924454..427f664 100644
--- a/src/views/routine/dis/shenhe.vue
+++ b/src/views/routine/dis/shenhe.vue
@@ -78,23 +78,71 @@
       <el-table-column label="学籍管理审核状态" align="center" prop="xjglStatus" /> -->
       <el-table-column label="审核状态" align="center" prop="jwcStatus" >
           <template slot-scope="scope">
-          <!-- 审批状态（0、待审批；1、已通过； -->
-          <el-tag v-if="scope.row.jwcStatus == 0 || scope.row.jwcStatus == null">审批中</el-tag>
-          <el-tag v-else-if="scope.row.jwcStatus == 1" type="success">已通过</el-tag>
-          <el-tag v-else-if="scope.row.jwcStatus == 2" type="danger">已驳回</el-tag>
+           <el-tag v-if="scope.row.conversion=='Y' ">
+                <!-- 审批状态（0、待审批；1、已通过； -->
+                  <el-tag v-if="scope.row.zsStatus == 0 || scope.row.zsStatus == null">招就处审批中</el-tag>
+                   <el-tag v-else-if="scope.row.zsStatus == 1 && (scope.row.fdStatus == 0 || scope.row.fdStatus == null)  ">辅导员审核中</el-tag>
+                  <el-tag v-else-if="scope.row.fdStatus == 1 && (scope.row.xwStatus == 0 || scope.row.xwStatus == null)  ">学务审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xwStatus == 1 && ( scope.row.twoStatus == 0 || scope.row.twoStatus == null)" >二级学院审核中</el-tag>
+                  <el-tag v-else-if="scope.row.twoStatus == 1 && ( scope.row.xjglStatus == 0 || scope.row.xjglStatus == null)" >学籍管理审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xjglStatus == 1 && ( scope.row.jwStatus == 0 || scope.row.jwStatus == null)" >教务处主管审核中</el-tag>
+                  
+                  <el-tag v-else-if="scope.row.fdStatus == 1  || scope.row.xwStatus == 1 || scope.row.twoStatus == 1 ||  scope.row.xjglStatus == 1 || scope.row.jwStatus == 1   " type="success">审批通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 2  || scope.row.xwStatus == 2 || scope.row.twoStatus == 2 ||  scope.row.xjglStatus == 2 || scope.row.jwStatus == 2 "
+                          type="danger"
+                  >审批未通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 3  || scope.row.xwStatus == 3 || scope.row.twoStatus == 3 ||  scope.row.xjglStatus == 3 || scope.row.jwStatus == 3 "
+                          type="danger"
+                  >审批未通过</el-tag>
+            </el-tag>
+
+            <el-tag v-if="scope.row.conversion=='N' ">
+                 <!-- 审批状态（0、待审批；1、已通过； -->
+                  <el-tag v-if="scope.row.fdStatus == 0 || scope.row.fdStatus == null">辅导员审批中</el-tag>
+                  <el-tag v-else-if="scope.row.fdStatus == 1 && (scope.row.xwStatus == 0 || scope.row.xwStatus == null)  ">学务审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xwStatus == 1 && ( scope.row.twoStatus == 0 || scope.row.twoStatus == null)" >二级学院审核中</el-tag>
+                  <el-tag v-else-if="scope.row.twoStatus == 1 && ( scope.row.xjglStatus == 0 || scope.row.xjglStatus == null)" >学籍管理审核中</el-tag>
+                  <el-tag v-else-if="scope.row.xjglStatus == 1 && ( scope.row.jwStatus == 0 || scope.row.jwStatus == null)" >教务处主管审核中</el-tag>
+                  
+                  <el-tag v-else-if="scope.row.fdStatus == 1  || scope.row.xwStatus == 1 || scope.row.twoStatus == 1 ||  scope.row.xjglStatus == 1 || scope.row.jwStatus == 1   " type="success">审批通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 2  || scope.row.xwStatus == 2 || scope.row.twoStatus == 2 ||  scope.row.xjglStatus == 2 || scope.row.jwStatus == 2 "
+                          type="danger"
+                  >审批未通过</el-tag>
+
+                  <el-tag v-else-if="scope.row.fdStatus == 3  || scope.row.xwStatus == 3 || scope.row.twoStatus == 3 ||  scope.row.xjglStatus == 3 || scope.row.jwStatus == 3 "
+                          type="danger"
+                  >审批未通过</el-tag>
+            </el-tag>
+
+         
         </template>
       </el-table-column>
       
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
              <el-button
-             v-if="scope.row.fdStatus === 2 || scope.row.xwStatus === 2 || scope.row.twoStatus===2||scope.row.jwcStatus===2||scope.row.xjglStatus===2||scope.row.zsStatus===2"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handledetail(scope.row)"
-            v-hasPermi="['routine:basic:edit']"
-          >修改</el-button>
+              v-if="
+                scope.row.fdStatus === '2' || 
+                scope.row.xwStatus === '2' || 
+                scope.row.twoStatus === '2' ||
+                scope.row.jwcStatus === '2' ||
+                scope.row.xjglStatus === '2' ||
+                scope.row.zsStatus === '3' || 
+                scope.row.fdStatus === '3' || 
+                scope.row.xwStatus === '3' || 
+                scope.row.twoStatus === '3' ||
+                scope.row.jwcStatus === '3' ||
+                scope.row.xjglStatus === '3'
+              "
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handledetail(scope.row)"
+              v-hasPermi="['routine:basic:edit']"
+            >修改提交</el-button>
 
           <el-button
             size="mini"
@@ -600,7 +648,7 @@ export default {
     handleExport() {
       this.download('routine/basic/export', {
         ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
+      }, `退伍复学_${new Date().getTime()}.xlsx`)
     }
   }
 };
diff --git a/src/views/routine/dis/tableData.vue b/src/views/routine/dis/tableData.vue
deleted file mode 100644
index db7294b..0000000
--- a/src/views/routine/dis/tableData.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-   <div class="retire-resume-application">
-    <h2 class="title">退役复学申请表</h2>
-    <table class="application-table">
-      <!-- 姓名、性别、民族、班级行 -->
-      <tr>
-        <td>姓名</td>
-        <td><input type="text" placeholder="请输入姓名" /></td>
-        <td>性别</td>
-        <td><input type="text" placeholder="请输入性别" /></td>
-        <td>民族</td>
-        <td><input type="text" placeholder="请输入民族" /></td>
-        <td>班级</td>
-        <td><input type="text" placeholder="请输入班级" /></td>
-      </tr>
-      <!-- 学号、专业名称、联系电话行 -->
-      <tr>
-        <td>学号</td>
-        <td><input type="text" placeholder="请输入学号" /></td>
-        <td>专业名称</td>
-        <td colspan="3"><input type="text" placeholder="请输入专业名称" /></td>
-        <td>联系电话</td>
-        <td><input type="tel" placeholder="请输入联系电话" /></td>
-      </tr>
-      <!-- 申请原因行 -->
-      <tr>
-        <td rowspan="3" class="vertical-align">申请原因</td>
-        <td colspan="7">
-          <p>本人于 <input type="date" /> 应征入伍，于 <input type="date" /> 退役，退役后申请复学。</p>
-          <p>是否申请转专业：
-            <input type="radio" id="major-yes" name="major" value="是" />
-            <label for="major-yes">是</label>
-            <input type="radio" id="major-no" name="major" value="否" checked />
-            <label for="major-no">否</label>
-          </p>
-          <p>原年级和专业：<input type="text" placeholder="请输入原年级和专业" />；申请转入年级和专业：<input type="text" placeholder="请输入申请转入年级和专业" />。</p>
-          <p>（设上传退役证明、身份证等佐证材料区域）<input type="file" multiple /></p>
-          <p>申请人：<input type="text" placeholder="请输入申请人姓名" /> 日期：<input type="date" /></p>
-        </td>
-      </tr>
-      <!-- 招生与就业处意见行 -->
-      <tr>
-        <td colspan="7">
-          <p>符合转专业条件，拟同意转入年级和专业：<input type="text" placeholder="请输入拟同意转入年级和专业" />。</p>
-          <p>签字：<input type="text" placeholder="请输入签字人" /> 年 月 日：<input type="date" /></p>
-        </td>
-      </tr>
-    </table>
-  </div>
-</template>
-
-<script>
-import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
-import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
-export default {
-  name: "Basic",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 退伍复学申请表格数据
-      basicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询退伍复学申请列表 */
-    getList() {
-      this.loading = true;
-      listBasic(this.queryParams).then(response => {
-        this.basicList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.basicList)
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加退伍复学申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getBasic(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改退伍复学申请";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBasic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              // this.form.stId
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addBasic(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              console.log(this.form.stId)
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-
-                this.open = false;
-                this.getList();
-              });
-
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function () {
-        return delBasic(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('routine/basic/export', {
-        ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
-
-
-<script setup>
-import { reactive } from 'vue';
-
-// 表单数据
-const formData = reactive({
-  name: '',
-  gender: '',
-  nation: '',
-  class: '',
-  studentId: '',
-  major: '',
-  phone: '',
-  birthDate: '',
-  idCard: '',
-  originalGrade: '',
-  enlistmentDate: '',
-  militaryUnit: '',
-  dischargeDate: '',
-  dischargeCertNo: '',
-  isReturn: '是',
-  originalSchool: '',
-  enlistmentDate2: '',
-  dischargeDate2: '',
-  changeMajor: '否',
-  originalMajor: '',
-  targetMajor: '',
-  applicantSignature: '',
-  applicationDate: '',
-  collegeOpinion: '',
-  collegeLeader: '',
-  collegeDate: '',
-  teachingAffairsOpinion: '',
-  teachingAffairsLeader: '',
-  teachingAffairsDate: '',
-  studentAffairsOpinion: '',
-  studentAffairsLeader: '',
-  studentAffairsDate: '',
-  schoolLeaderOpinion: '',
-  schoolLeaderSignature: '',
-  schoolLeaderDate: ''
-});
-</script>
-
-<script setup>
-// 此处可添加表单数据绑定、提交等逻辑
-</script>
-
-<style scoped>
-.retire-resume-application {
-  max-width: 800px;
-  margin: 0 auto;
-  padding: 20px;
-}
-
-.title {
-  text-align: center;
-  margin-bottom: 20px;
-}
-
-.application-table {
-  width: 100%;
-  border-collapse: collapse;
-}
-
-.application-table td {
-  border: 1px solid #ccc;
-  padding: 10px;
-}
-
-.vertical-align {
-  vertical-align: middle;
-}
-
-input, label {
-  margin: 5px 0;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/routine/dis/xjshe.vue b/src/views/routine/dis/xjshe.vue
deleted file mode 100644
index b4f9299..0000000
--- a/src/views/routine/dis/xjshe.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-  <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="stId">
-        <el-input
-          v-model="queryParams.stId"
-          placeholder="请输入学号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名" prop="stName">
-        <el-input
-          v-model="queryParams.stName"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    
-      <el-form-item label="时间" prop="times">
-        <el-input
-          v-model="queryParams.times"
-          placeholder="请输入时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <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"
-          v-hasPermi="['routine:basic:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="basicList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="学号" align="center" prop="stId" />
-      <el-table-column label="姓名" align="center" prop="stName" />
-     
-      <!-- <el-table-column label="性别" align="center" prop="sex">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="民族" align="center" prop="nations">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_nation" :value="scope.row.nations"/>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="班级" align="center" prop="stClass">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_classes" :value="scope.row.stClass"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="学院" align="center" prop="college">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_college" :value="scope.row.college"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="times" />
-      <el-table-column label="辅导员审核状态" align="center" prop="fdStatus" />
-      <el-table-column label="学务审核" align="center" prop="xwStatus" />
-      <el-table-column label="二级学院审核状态" align="center" prop="twoStatus" />
-      <el-table-column label="学籍管理审核状态" align="center" prop="xjglStatus" />
-      <el-table-column label="教务处审核状态" align="center" prop="jwcStatus" />
-      <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)"
-            v-hasPermi="['routine:basic:edit']"
-          >查看材料</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['routine:basic:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改退伍复学申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="学号" prop="stId">
-          <el-input v-model="form.stId" placeholder="请输入学号" />
-        </el-form-item>
-        <el-form-item label="姓名" prop="stName">
-          <el-input v-model="form.stName" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="辅导员名字" prop="fdName">
-          <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
-        </el-form-item>
-        <el-form-item label="性别" prop="sex">
-          <el-select v-model="form.sex" placeholder="请选择性别">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民族" prop="nations">
-          <el-input v-model="form.nations" placeholder="请输入民族" />
-        </el-form-item>
-        <el-form-item label="班级" prop="stClass">
-          <el-input v-model="form.stClass" placeholder="请输入班级" />
-        </el-form-item>
-        <el-form-item label="专业" prop="majors">
-          <el-input v-model="form.majors" placeholder="请输入专业" />
-        </el-form-item>
-        <el-form-item label="年级" prop="grade">
-          <el-input v-model="form.grade" placeholder="请输入年级" />
-        </el-form-item>
-        <el-form-item label="学院" prop="college">
-          <el-input v-model="form.college" placeholder="请输入学院" />
-        </el-form-item>
-        <el-form-item label="原因" prop="reasons">
-          <el-input v-model="form.reasons" placeholder="请输入原因" />
-        </el-form-item>
-        <el-form-item label="时间" prop="times">
-          <el-input v-model="form.times" placeholder="请输入时间" />
-        </el-form-item>
-        <el-form-item label="空余字段" prop="datab">
-          <el-input v-model="form.datab" placeholder="请输入空余字段" />
-        </el-form-item>
-        <el-form-item label="" prop="dataa">
-          <el-input v-model="form.dataa" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="专业转换" prop="conversion">
-          <el-input v-model="form.conversion" placeholder="请输入专业转换" />
-        </el-form-item>
-      </el-form> -->
-       <el-tabs type="border-card">
-        <el-tab-pane label="基础信息填写">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="basicList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="姓名" align="center" prop="stName" />
-                  <el-table-column label="辅导员名字" align="center" prop="fdName" />
-                  <el-table-column label="性别" align="center" prop="sex" />
-                  <el-table-column label="民族" align="center" prop="nations" />
-                  <el-table-column label="班级" align="center" prop="stClass" />
-                  <el-table-column label="专业" align="center" prop="majors" />
-                  <el-table-column label="年级" align="center" prop="grade" />
-                  <el-table-column label="学院" align="center" prop="college" />
-                  <el-table-column label="原因" align="center" prop="grade" />
-                  <el-table-column label="原因" align="center" prop="reasons" />
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-         <el-tab-pane label="上传材料">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="form.maList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="原年级" align="center" prop="oldgrade" />
-                  <el-table-column label="原专业" align="center" prop="oldmajor" />
-                  <el-table-column label="新年级" align="center" prop="newgrade" />
-                  <el-table-column label="新专业" align="center" prop="newmajor" />
-                  <el-table-column label="退役证明" align="center" prop="proof" />
-                  <el-table-column label="身份证" align="center" prop="idcard" />
-                  <el-table-column label="材料" align="center" prop="material" />
-
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-
-      </el-tabs>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
-import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
-export default {
-  name: "Basic",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 退伍复学申请表格数据
-      basicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询退伍复学申请列表 */
-    getList() {
-      this.loading = true;
-      listBasic(this.queryParams).then(response => {
-        this.basicList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.basicList )
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加退伍复学申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getBasic(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "查看填报信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBasic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              // this.form.stId
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addBasic(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              console.log(this.form.stId)
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-              
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function() {
-        return delBasic(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('routine/basic/export', {
-        ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/src/views/routine/dis/xwshe.vue b/src/views/routine/dis/xwshe.vue
deleted file mode 100644
index b4f9299..0000000
--- a/src/views/routine/dis/xwshe.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<template>
-  <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="stId">
-        <el-input
-          v-model="queryParams.stId"
-          placeholder="请输入学号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名" prop="stName">
-        <el-input
-          v-model="queryParams.stName"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    
-      <el-form-item label="时间" prop="times">
-        <el-input
-          v-model="queryParams.times"
-          placeholder="请输入时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <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"
-          v-hasPermi="['routine:basic:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="basicList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="学号" align="center" prop="stId" />
-      <el-table-column label="姓名" align="center" prop="stName" />
-     
-      <!-- <el-table-column label="性别" align="center" prop="sex">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="民族" align="center" prop="nations">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_nation" :value="scope.row.nations"/>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="班级" align="center" prop="stClass">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_classes" :value="scope.row.stClass"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="学院" align="center" prop="college">
-        <!-- <template slot-scope="scope">
-          <dict-tag :options="dict.type.rt_college" :value="scope.row.college"/>
-        </template> -->
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="times" />
-      <el-table-column label="辅导员审核状态" align="center" prop="fdStatus" />
-      <el-table-column label="学务审核" align="center" prop="xwStatus" />
-      <el-table-column label="二级学院审核状态" align="center" prop="twoStatus" />
-      <el-table-column label="学籍管理审核状态" align="center" prop="xjglStatus" />
-      <el-table-column label="教务处审核状态" align="center" prop="jwcStatus" />
-      <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)"
-            v-hasPermi="['routine:basic:edit']"
-          >查看材料</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['routine:basic:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改退伍复学申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="学号" prop="stId">
-          <el-input v-model="form.stId" placeholder="请输入学号" />
-        </el-form-item>
-        <el-form-item label="姓名" prop="stName">
-          <el-input v-model="form.stName" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="辅导员名字" prop="fdName">
-          <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
-        </el-form-item>
-        <el-form-item label="性别" prop="sex">
-          <el-select v-model="form.sex" placeholder="请选择性别">
-            <el-option
-              v-for="dict in dict.type.sys_user_sex"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民族" prop="nations">
-          <el-input v-model="form.nations" placeholder="请输入民族" />
-        </el-form-item>
-        <el-form-item label="班级" prop="stClass">
-          <el-input v-model="form.stClass" placeholder="请输入班级" />
-        </el-form-item>
-        <el-form-item label="专业" prop="majors">
-          <el-input v-model="form.majors" placeholder="请输入专业" />
-        </el-form-item>
-        <el-form-item label="年级" prop="grade">
-          <el-input v-model="form.grade" placeholder="请输入年级" />
-        </el-form-item>
-        <el-form-item label="学院" prop="college">
-          <el-input v-model="form.college" placeholder="请输入学院" />
-        </el-form-item>
-        <el-form-item label="原因" prop="reasons">
-          <el-input v-model="form.reasons" placeholder="请输入原因" />
-        </el-form-item>
-        <el-form-item label="时间" prop="times">
-          <el-input v-model="form.times" placeholder="请输入时间" />
-        </el-form-item>
-        <el-form-item label="空余字段" prop="datab">
-          <el-input v-model="form.datab" placeholder="请输入空余字段" />
-        </el-form-item>
-        <el-form-item label="" prop="dataa">
-          <el-input v-model="form.dataa" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="专业转换" prop="conversion">
-          <el-input v-model="form.conversion" placeholder="请输入专业转换" />
-        </el-form-item>
-      </el-form> -->
-       <el-tabs type="border-card">
-        <el-tab-pane label="基础信息填写">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="basicList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="姓名" align="center" prop="stName" />
-                  <el-table-column label="辅导员名字" align="center" prop="fdName" />
-                  <el-table-column label="性别" align="center" prop="sex" />
-                  <el-table-column label="民族" align="center" prop="nations" />
-                  <el-table-column label="班级" align="center" prop="stClass" />
-                  <el-table-column label="专业" align="center" prop="majors" />
-                  <el-table-column label="年级" align="center" prop="grade" />
-                  <el-table-column label="学院" align="center" prop="college" />
-                  <el-table-column label="原因" align="center" prop="grade" />
-                  <el-table-column label="原因" align="center" prop="reasons" />
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-         <el-tab-pane label="上传材料">
-          <div>
-            <div>
-              <el-row :gutter="10" />
-              <div style="margin-top: 20px;">
-                <el-table :data="form.maList" border>
-                  <el-table-column label="序号" type="index" width="50" align="center" />
-
-                  <el-table-column label="学号" align="center" prop="stId" />
-                  <el-table-column label="原年级" align="center" prop="oldgrade" />
-                  <el-table-column label="原专业" align="center" prop="oldmajor" />
-                  <el-table-column label="新年级" align="center" prop="newgrade" />
-                  <el-table-column label="新专业" align="center" prop="newmajor" />
-                  <el-table-column label="退役证明" align="center" prop="proof" />
-                  <el-table-column label="身份证" align="center" prop="idcard" />
-                  <el-table-column label="材料" align="center" prop="material" />
-
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-tab-pane>
-
-
-      </el-tabs>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBasic, getBasic, delBasic, addBasic, updateBasic } from "@/api/routine/basic";
-import { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
-
-export default {
-  name: "Basic",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 退伍复学申请表格数据
-      basicList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询退伍复学申请列表 */
-    getList() {
-      this.loading = true;
-      listBasic(this.queryParams).then(response => {
-        this.basicList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.basicList )
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        stId: null,
-        stName: null,
-        fdName: null,
-        sex: null,
-        nations: null,
-        stClass: null,
-        majors: null,
-        grade: null,
-        college: null,
-        reasons: null,
-        times: null,
-        fdStatus: null,
-        xwStatus: null,
-        twoStatus: null,
-        xjglStatus: null,
-        datab: null,
-        dataa: null,
-        conversion: null,
-        jwcStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加退伍复学申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getBasic(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "查看填报信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateBasic(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              // this.form.stId
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-            });
-          } else {
-            addBasic(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              console.log(this.form.stId)
-              this.dataform = {
-                id: null,
-                stId: this.form.stId,
-                times: null,
-                college: null,
-                oldgrade: null,
-                oldmajor: null,
-                newgrade: null,
-                newmajor: null,
-                proof: null,
-                idcard: null,
-                material: null,
-                data1: null,
-                data2: null
-              };
-              addMate(this.dataform).then(response => {
-                
-                this.open = false;
-                this.getList();
-              });
-              
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除退伍复学申请编号为"' + ids + '"的数据项？').then(function() {
-        return delBasic(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('routine/basic/export', {
-        ...this.queryParams
-      }, `basic_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>