From 19e1292696b6f213a8713c12ddbaa1ace79c4748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E4=B8=9C=E6=81=92?= <1747763533@qq.com>
Date: Fri, 31 Oct 2025 16:52:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E4=BC=8D=E5=A4=8D=E5=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/routine/basic.js                      |  44 ++
 src/api/routine/mate.js                       |  44 ++
 src/views/routine/dis/basic/index.vue         | 392 ++++++++++++++++
 src/views/routine/dis/ejshe.vue               | 436 ++++++++++++++++++
 src/views/routine/dis/fdshe.vue               | 436 ++++++++++++++++++
 src/views/routine/dis/jwcshe.vue              | 436 ++++++++++++++++++
 src/views/routine/dis/mate/index.vue          | 375 +++++++++++++++
 src/views/routine/dis/shenhe.vue              | 436 ++++++++++++++++++
 src/views/routine/dis/tableData.vue           | 347 ++++++++++++++
 src/views/routine/dis/xjshe.vue               | 436 ++++++++++++++++++
 src/views/routine/dis/xwshe.vue               | 436 ++++++++++++++++++
 src/views/routine/dis/zsshe.vue               | 436 ++++++++++++++++++
 .../routine/school/component/applicatiosC.vue |   1 -
 13 files changed, 4254 insertions(+), 1 deletion(-)
 create mode 100644 src/api/routine/basic.js
 create mode 100644 src/api/routine/mate.js
 create mode 100644 src/views/routine/dis/basic/index.vue
 create mode 100644 src/views/routine/dis/ejshe.vue
 create mode 100644 src/views/routine/dis/fdshe.vue
 create mode 100644 src/views/routine/dis/jwcshe.vue
 create mode 100644 src/views/routine/dis/mate/index.vue
 create mode 100644 src/views/routine/dis/shenhe.vue
 create mode 100644 src/views/routine/dis/tableData.vue
 create mode 100644 src/views/routine/dis/xjshe.vue
 create mode 100644 src/views/routine/dis/xwshe.vue
 create mode 100644 src/views/routine/dis/zsshe.vue

diff --git a/src/api/routine/basic.js b/src/api/routine/basic.js
new file mode 100644
index 0000000..e00c91f
--- /dev/null
+++ b/src/api/routine/basic.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询退伍复学申请列表
+export function listBasic(query) {
+  return request({
+    url: '/routine/basic/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询退伍复学申请详细
+export function getBasic(id) {
+  return request({
+    url: '/routine/basic/' + id,
+    method: 'get'
+  })
+}
+
+// 新增退伍复学申请
+export function addBasic(data) {
+  return request({
+    url: '/routine/basic/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改退伍复学申请
+export function updateBasic(data) {
+  return request({
+    url: '/routine/basic/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除退伍复学申请
+export function delBasic(id) {
+  return request({
+    url: '/routine/basic/' + id,
+    method: 'post'
+  })
+}
diff --git a/src/api/routine/mate.js b/src/api/routine/mate.js
new file mode 100644
index 0000000..32fc740
--- /dev/null
+++ b/src/api/routine/mate.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询退伍复学材料列表
+export function listMate(query) {
+  return request({
+    url: '/routine/mate/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询退伍复学材料详细
+export function getMate(id) {
+  return request({
+    url: '/routine/mate/' + id,
+    method: 'get'
+  })
+}
+
+// 新增退伍复学材料
+export function addMate(data) {
+  return request({
+    url: '/routine/mate/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改退伍复学材料
+export function updateMate(data) {
+  return request({
+    url: '/routine/mate/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除退伍复学材料
+export function delMate(id) {
+  return request({
+    url: '/routine/mate/' + id,
+    method: 'post'
+  })
+}
diff --git a/src/views/routine/dis/basic/index.vue b/src/views/routine/dis/basic/index.vue
new file mode 100644
index 0000000..56bdcdb
--- /dev/null
+++ b/src/views/routine/dis/basic/index.vue
@@ -0,0 +1,392 @@
+<template>
+  <div class="app-container">
+    <h1 style="font-size: 30px;text-align: center;">个人信息填写</h1>
+    <div class="stylecard">
+      <el-card class="box-card1">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <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="stName" :rules="rules.reason2">
+            <el-input v-model="form.stName" placeholder="请输入姓名" />
+          </el-form-item>
+          <el-form-item label="辅导员名字" prop="fdName" :rules="rules.reason3">
+            <el-input v-model="form.fdName" placeholder="请输入辅导员名字" />
+          </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"
+                :value="dict.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="民族" prop="nations" :rules="rules.reason5">
+            <!-- <el-input v-model="form.nations" placeholder="请输入民族" /> -->
+            <el-select v-model="form.nations" placeholder="请选择民族">
+              <el-option v-for="dict in dict.type.rt_nation" :key="dict.value" :label="dict.label"
+                :value="dict.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="班级" prop="stClass" :rules="rules.reason6">
+            <el-input v-model="form.stClass" placeholder="请输入班级" />
+          </el-form-item>
+          <el-form-item label="专业" prop="majors" :rules="rules.reason7">
+            <el-input v-model="form.majors" placeholder="请输入专业" />
+          </el-form-item>
+          <el-form-item label="年级" prop="grade" :rules="rules.reason8">
+            <el-input v-model="form.grade" placeholder="请输入年级" />
+          </el-form-item>
+          <el-form-item label="学院" prop="college" :rules="rules.reason9">
+            <!-- <el-input v-model="form.college" placeholder="请输入学院" /> -->
+            <el-select v-model="form.college" placeholder="请选择学院" :rules="rules.reason10">
+              <el-option v-for="dict in dict.type.rt_filling_college" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="原因" prop="reasons" :rules="rules.reason10">
+            <el-input v-model="form.reasons" placeholder="请输入原因" type="textarea" />
+          </el-form-item>
+          <el-form-item label="时间" prop="times" :rules="rules.reason11">
+            <!-- <el-input v-model="form.times" placeholder="请输入时间" /> -->
+            <el-date-picker v-model="form.times" clearable type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择填报时间" />
+          </el-form-item>
+          <el-form-item label="专业转换" prop="conversion" :rules="rules.reason12">
+            <el-select v-model="form.conversion" placeholder="请选择专业转换">
+              <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+                :value="dict.value"></el-option>
+            </el-select>
+
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-card>
+
+    </div>
+
+    <div slot="footer" class="stylecard">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+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'
+
+export default {
+  name: "Basic",
+  dicts: ['sys_yes_no', 'sys_user_sex', 'rt_filling_college', 'sys_commit_status', 'sys_teacher_kpi_filling_year', 'rt_nation', 'rt_classes'],
+  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: {
+        reason1: [
+          { required: true, message: '学号不能为空', trigger: 'blur' },
+        ],
+        reason2: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' },
+        ],
+        reason3: [
+          { required: true, message: '辅导员不能为空', trigger: 'blur' },
+        ],
+        reason4: [
+          { required: true, message: '请选择性别', trigger: 'blur' },
+        ],
+        reason5: [
+          { required: true, message: '请选择民族', trigger: 'blur' },
+        ],
+        reason6: [
+          { required: true, message: '请输入班级', trigger: 'blur' },
+        ],
+        reason7: [
+          { required: true, message: '请输入专业', trigger: 'blur' },
+        ],
+        reason8: [
+          { required: true, message: '请输入年级', trigger: 'blur' },
+        ],
+        reason9: [
+          { required: true, message: '请选择学院', trigger: 'blur' },
+        ],
+        reason10: [
+          { required: true, message: '请填写原因', trigger: 'blur' },
+        ],
+        reason11: [
+          { required: true, message: '请选择时间', trigger: 'blur' },
+        ],
+        reason12: [
+          { required: true, message: '请选择是否专业转换', trigger: 'blur' },
+        ],
+      }
+      
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+
+    // 填写学号时自动获取其他信息
+    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
+
+      })
+    },
+
+    /** 查询退伍复学申请列表 */
+    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: this.form.college,
+                oldgrade: this.form.grade,
+                oldmajor: this.form.majors,
+                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: this.form.college,
+                oldgrade: this.form.grade,
+                oldmajor: this.form.majors,
+                newgrade: null,
+                newmajor: null,
+                proof: null,
+                idcard: null,
+                material: null,
+                data1: null,
+                data2: null
+              };
+              addMate(this.dataform).then(response => {
+
+                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',
+                })
+              }
+
+
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    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>
+
+<style>
+.box-card1 {
+  width: 600px;
+  max-width: 100%;
+  /* 新增：适配小屏幕，避免溢出 */
+  text-align: center;
+  margin: 0 auto;
+  /* 替代原margin-left，实现水平居中更优雅 */
+  padding: 20px;
+  /* 新增：内边距，提升内容呼吸感 */
+  background-color: #fff;
+  /* 新增：卡片背景色 */
+  border-radius: 8px;
+  /* 新增：圆角，增强视觉友好度 */
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+  /* 新增：阴影，突出卡片层次 */
+  box-sizing: border-box;
+  /* 新增：保证width包含padding和border */
+  white-space: nowrap
+}
+
+.stylecard {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/routine/dis/ejshe.vue b/src/views/routine/dis/ejshe.vue
new file mode 100644
index 0000000..b4f9299
--- /dev/null
+++ b/src/views/routine/dis/ejshe.vue
@@ -0,0 +1,436 @@
+<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
new file mode 100644
index 0000000..b4f9299
--- /dev/null
+++ b/src/views/routine/dis/fdshe.vue
@@ -0,0 +1,436 @@
+<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/jwcshe.vue b/src/views/routine/dis/jwcshe.vue
new file mode 100644
index 0000000..b4f9299
--- /dev/null
+++ b/src/views/routine/dis/jwcshe.vue
@@ -0,0 +1,436 @@
+<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
new file mode 100644
index 0000000..4790084
--- /dev/null
+++ b/src/views/routine/dis/mate/index.vue
@@ -0,0 +1,375 @@
+<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="times">
+        <el-input
+          v-model="queryParams.times"
+          placeholder="请输入时间"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="学院" prop="college">
+        <el-select v-model="queryParams.college" placeholder="请选择学院" clearable>
+          <el-option v-for="dict in dict.type.rt_college" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="原年级" prop="oldgrade">
+        <el-input
+          v-model="queryParams.oldgrade"
+          placeholder="请输入原年级"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原专业" prop="oldmajor">
+        <el-input
+          v-model="queryParams.oldmajor"
+          placeholder="请输入原专业"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="新年级" prop="newgrade">
+        <el-input
+          v-model="queryParams.newgrade"
+          placeholder="请输入新年级"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="新专业" prop="newmajor">
+        <el-input
+          v-model="queryParams.newmajor"
+          placeholder="请输入新专业"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="保留字段1" prop="data1">
+        <el-input
+          v-model="queryParams.data1"
+          placeholder="请输入保留字段1"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="保留字段2" prop="data2">
+        <el-input
+          v-model="queryParams.data2"
+          placeholder="请输入保留字段2"
+          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="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['routine:mate:add']">新增</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['routine:mate:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['routine:mate:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['routine:mate:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="mateList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
+      <el-table-column label="学号" align="center" prop="stId" />
+      <!-- <el-table-column label="时间" align="center" prop="times" /> -->
+      <el-table-column label="学院" align="center" prop="college">
+
+      </el-table-column>
+      <el-table-column label="原年级" align="center" prop="oldgrade">
+
+      </el-table-column>
+      <el-table-column label="原专业" align="center" prop="oldmajor" />
+      <!-- <el-table-column label="新年级" align="center" prop="newgrade">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.rt_grade" :value="scope.row.newgrade"/>
+        </template>
+</el-table-column>
+<el-table-column label="新专业" align="center" prop="newmajor" /> -->
+      <!-- <el-table-column label="退役证明" align="center" prop="proof" />
+      <el-table-column label="身份证" align="center" prop="idcard" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.idcard" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="材料" align="center" prop="material" /> -->
+      <!-- <el-table-column label="保留字段1" align="center" prop="data1" />
+      <el-table-column label="保留字段2" align="center" prop="data2" /> -->
+      <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:mate:edit']">上传材料</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['routine:mate: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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="学号" prop="stId" :rules="rules.reason1">
+          <el-input v-model="form.stId" 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="college" :rules="rules.reason2">
+          <el-select v-model="form.college" placeholder="请选择学院">
+            <el-option v-for="dict in dict.type.rt_college" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="原年级" prop="oldgrade" :rules="rules.reason3">
+          <el-input v-model="form.oldgrade" placeholder="请输入原年级" />
+        </el-form-item>
+        <el-form-item label="原专业" prop="oldmajor" :rules="rules.reason4">
+          <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-form-item>
+        <el-form-item label="新专业" prop="newmajor" :rules="rules.reason6">
+          <el-input v-model="form.newmajor" placeholder="请输入新专业" />
+        </el-form-item>
+        <el-form-item label="退役证明" prop="proof">
+          <file-upload v-model="form.proof" />
+        </el-form-item>
+        <el-form-item label="身份证" prop="idcard">
+          <image-upload v-model="form.idcard" />
+        </el-form-item>
+        <el-form-item label="材料" prop="material">
+          <file-upload v-model="form.material" />
+        </el-form-item>
+
+      </el-form>
+      <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 { listMate, getMate, delMate, addMate, updateMate } from "@/api/routine/mate";
+
+export default {
+  name: "Mate",
+  dicts: ['rt_college'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 退伍复学材料表格数据
+      mateList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        stId: null,
+        times: null,
+        college: null,
+        oldgrade: null,
+        oldmajor: null,
+        newgrade: null,
+        newmajor: null,
+        proof: null,
+        idcard: null,
+        material: null,
+        data1: null,
+        data2: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        reason1: [
+          { required: true, message: '学号不能为空', trigger: 'blur' },
+        ],
+        reason2: [
+          { required: true, message: '学院不能为空', trigger: 'blur' },
+        ],
+        reason3: [
+          { required: true, message: '输入原年级', trigger: 'blur' },
+        ],
+        reason4: [
+          { required: true, message: '输入原专业', trigger: 'blur' },
+        ],
+        reason5: [
+          { required: true, message: '输入新年级', trigger: 'blur' },
+        ],
+        reason6: [
+          { required: true, message: '输入新专业', trigger: 'blur' },
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询退伍复学材料列表 */
+    getList() {
+      this.loading = true;
+      listMate(this.queryParams).then(response => {
+        this.mateList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        stId: null,
+        times: null,
+        college: null,
+        oldgrade: null,
+        oldmajor: null,
+        newgrade: null,
+        newmajor: null,
+        proof: null,
+        idcard: null,
+        material: null,
+        data1: null,
+        data2: 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
+      getMate(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) {
+            updateMate(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+              this.$router.push({
+                path: '/routine/dis/appli',
+              })
+            });
+          } else {
+            addMate(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+              this.$router.push({
+                path: '/routine/dis/appli',
+              })
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除退伍复学材料编号为"' + ids + '"的数据项？').then(function () {
+        return delMate(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('routine/mate/export', {
+        ...this.queryParams
+      }, `mate_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/routine/dis/shenhe.vue b/src/views/routine/dis/shenhe.vue
new file mode 100644
index 0000000..b4f9299
--- /dev/null
+++ b/src/views/routine/dis/shenhe.vue
@@ -0,0 +1,436 @@
+<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/tableData.vue b/src/views/routine/dis/tableData.vue
new file mode 100644
index 0000000..db7294b
--- /dev/null
+++ b/src/views/routine/dis/tableData.vue
@@ -0,0 +1,347 @@
+<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
new file mode 100644
index 0000000..b4f9299
--- /dev/null
+++ b/src/views/routine/dis/xjshe.vue
@@ -0,0 +1,436 @@
+<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
new file mode 100644
index 0000000..b4f9299
--- /dev/null
+++ b/src/views/routine/dis/xwshe.vue
@@ -0,0 +1,436 @@
+<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/zsshe.vue b/src/views/routine/dis/zsshe.vue
new file mode 100644
index 0000000..b4f9299
--- /dev/null
+++ b/src/views/routine/dis/zsshe.vue
@@ -0,0 +1,436 @@
+<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/school/component/applicatiosC.vue b/src/views/routine/school/component/applicatiosC.vue
index 6ff70c0..41857e7 100644
--- a/src/views/routine/school/component/applicatiosC.vue
+++ b/src/views/routine/school/component/applicatiosC.vue
@@ -539,7 +539,6 @@ export default {
       getStudentInfoByStuId(this.form.stuId).then(response => {
         if (response.data == null) {
           this.$message.error('学号不存在')
-
           return
         }
         this.form = response.data