diff --git a/src/views/Aspiration/Aspiration.vue b/src/views/Aspiration/Aspiration.vue
index 5a06908..293a2eb 100644
--- a/src/views/Aspiration/Aspiration.vue
+++ b/src/views/Aspiration/Aspiration.vue
@@ -1,540 +1,567 @@
-
 <template>
-    <div>
-        <el-card shadow="never" style="margin-top: 20px;">
-            <template #header>
-                <slot name="header">
-                    <vxe-toolbar :print="isHasAuth('print')" custom ref="toolbar">
-                        <template #toolSuffix>
-                            <vxe-button style="margin-right: 10px;" v-if="isHasAuth('export')" icon="vxe-icon-download" circle @click="exportMethod"></vxe-button>
-                        </template>
-                        <template #buttons>
-                            <el-button
-                                    v-if="isHasAuth('create')"
-                                    icon="el-icon-plus"
-                                    type="primary"
-                                    size="small"
-                                    @click="isShowAdd = true"
-                            >新增</el-button
-                            >
-                            <el-button
-                                    v-if="isHasAuth('search')"
-                                    icon="el-icon-search"
-                                    type="primary"
-                                    plain
-                                    size="small"
-                                    @click="getList"
-                            >搜索</el-button
-                            >
-                        </template>
-                    </vxe-toolbar>
-                </slot>
+  <div>
+    <el-card shadow="never" style="margin-top: 20px">
+      <template #header>
+        <slot name="header">
+          <vxe-toolbar :print="isHasAuth('print')" custom ref="toolbar">
+            <template #toolSuffix>
+              <vxe-button
+                style="margin-right: 10px"
+                v-if="isHasAuth('export')"
+                icon="vxe-icon-download"
+                circle
+                @click="exportMethod"
+              ></vxe-button>
+            </template>
+            <template #buttons>
+              <el-button
+                v-if="isHasAuth('create')"
+                icon="el-icon-plus"
+                type="primary"
+                size="small"
+                @click="isShowAdd = true"
+                >新增</el-button
+              >
+              <el-button
+                v-if="isHasAuth('search')"
+                icon="el-icon-search"
+                type="primary"
+                plain
+                size="small"
+                @click="getList"
+                >搜索</el-button
+              >
             </template>
+          </vxe-toolbar>
+        </slot>
+      </template>
 
-            <vxe-table
-                    ref="table"
-                    stripe
-                    style="margin-top: 10px"
-                    :loading="loading"
-                    :height="tableHeight"
-                    keep-source
-                    show-overflow
-                    :menu-config="{
-                      className: 'my-menus',
-                      body: {
-                        options: [
-                          [
-                            { code: 'copy', name: '复制', prefixConfig: { icon: 'vxe-icon-copy' }, suffixConfig: { content: 'Ctrl+C' } },
-                            { code: 'remove', name: '删除', prefixConfig: { icon: 'vxe-icon-delete-fill', className: 'color-red' } }
-                          ],
-                        ]
-                      }
-                    }"
-                    @menu-click="contextMenuClickEvent"
-                    :row-config="{ isCurrent: true, isHover: true }"
-                    :column-config="{ resizable: true }"
-                    :export-config="{}"
-                    :edit-rules="validRules"
-                    :edit-config="{
+      <vxe-table
+        ref="table"
+        stripe
+        style="margin-top: 10px"
+        :loading="loading"
+        :height="tableHeight"
+        keep-source
+        show-overflow
+        :menu-config="{
+          className: 'my-menus',
+          body: {
+            options: [
+              [
+                {
+                  code: 'copy',
+                  name: '复制',
+                  prefixConfig: { icon: 'vxe-icon-copy' },
+                  suffixConfig: { content: 'Ctrl+C' },
+                },
+                {
+                  code: 'remove',
+                  name: '删除',
+                  prefixConfig: {
+                    icon: 'vxe-icon-delete-fill',
+                    className: 'color-red',
+                  },
+                },
+              ],
+            ],
+          },
+        }"
+        @menu-click="contextMenuClickEvent"
+        :row-config="{ isCurrent: true, isHover: true }"
+        :column-config="{ resizable: true }"
+        :export-config="{}"
+        :edit-rules="validRules"
+        :edit-config="{
           trigger: 'manual',
           mode: 'row',
           showStatus: true,
           isHover: true,
           autoClear: false,
         }"
-                    
-                    :align="allAlign"
-                    :data="tableData"
-            >
-                <vxe-column type="checkbox" width="50" align="center" />
-                <vxe-column type="seq" width="58" align="center"  />
-                
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="name"
-                                width="160"
-                                title="名称"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                field="area_id"
-                                width="180"
-                                title="区域"
-                                :edit-render="{ name: 'VxeSelect', options: area, props: { multiple: false }, optionProps: { value: 'id', label: 'name' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                field="year"
-                                width="180"
-                                title="年份"
-                                :edit-render="{}"
-                        >
-                            <template #edit="{ row }">
-                                <el-date-picker v-model="row['year']" style="width: 100%;" size="small" type="year" value-format="yyyy"></el-date-picker>
-                            </template>
-                        </vxe-column>
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="title"
-                                width="160"
-                                title="标题"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="remark"
-                                width="160"
-                                title="备注"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="tip"
-                                width="160"
-                                title="提示"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                field="need_sign"
-                                width="180"
-                                title="是否需要签名"
-                                :edit-render="{ name: 'VxeSelect', options: [{'value':1,'label':'是'},{'value':0,'label':'否'}], props: { multiple: false }, optionProps: { value: 'value', label: 'label' } }"
-                        />
-                        
-                <vxe-column field="operate" header-align="center" title="操作" min-width="220" fixed="right">
-                    <template #default="{ row }">
-                        <template v-if="isActiveStatus(row)">
-                            <el-button size="small" type="primary" @click="saveRowEvent(row)"
-                            >保存</el-button
-                            >
-                            <el-button
-                                    size="small"
-                                    type="primary"
-                                    plain
-                                    @click="cancelRowEvent(row)"
-                            >取消</el-button
-                            >
-                        </template>
-                        <template v-else>
-                            <el-button v-if="isHasAuth('detail')" size="small" type="primary" plain @click="detail(row)"
-                            >查看</el-button
-                            >
-                            <el-button v-if="isHasAuth('edit')" size="small" type="warning" @click="editRowEvent(row)"
-                            >编辑</el-button
-                            >
-                            <el-button
-                                    v-if="isHasAuth('delete')"
-                                    size="small"
-                                    type="danger"
-                                    @click="destroyRowEvent(row)"
-                            >删除</el-button
-                            >
-                        </template>
-                    </template>
-                </vxe-column>
-            </vxe-table>
-
-            
-                <el-pagination
-                        style="margin-top: 10px;display: flex;justify-content: flex-end;"
-                        :current-page.sync="select.page"
-                        :page-sizes="[20, 30, 40, 50]"
-                        :page-size.sync="select.page_size"
-                        layout="total, sizes, prev, pager, next, jumper"
-                        :total="total"
-                        @size-change="
+        :align="allAlign"
+        :data="tableData"
+      >
+        <vxe-column type="checkbox" width="50" align="center" />
+        <vxe-column type="seq" width="58" align="center" />
+
+        <vxe-column
+          header-align="center"
+          field="name"
+          width="160"
+          title="名称"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          align="center"
+          field="area_id"
+          width="180"
+          title="区域"
+          :edit-render="{
+            name: 'VxeSelect',
+            options: area,
+            props: { multiple: false },
+            optionProps: { value: 'id', label: 'name' },
+          }"
+        />
+
+        <vxe-column
+          align="center"
+          field="year"
+          width="180"
+          title="年份"
+          :edit-render="{}"
+        >
+          <template #edit="{ row }">
+            <el-date-picker
+              v-model="row['year']"
+              style="width: 100%"
+              size="small"
+              type="year"
+              value-format="yyyy"
+            ></el-date-picker>
+          </template>
+        </vxe-column>
+
+        <vxe-column
+          header-align="center"
+          field="title"
+          width="160"
+          title="标题"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="remark"
+          width="160"
+          title="备注"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="tip"
+          width="160"
+          title="提示"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          align="center"
+          field="need_sign"
+          width="180"
+          title="是否需要签名"
+          :edit-render="{
+            name: 'VxeSelect',
+            options: [
+              { value: 1, label: '是' },
+              { value: 0, label: '否' },
+            ],
+            props: { multiple: false },
+            optionProps: { value: 'value', label: 'label' },
+          }"
+        />
+
+        <vxe-column
+          field="operate"
+          header-align="center"
+          title="操作"
+          min-width="220"
+          fixed="right"
+        >
+          <template #default="{ row }">
+            <template v-if="isActiveStatus(row)">
+              <el-button size="small" type="primary" @click="saveRowEvent(row)"
+                >保存</el-button
+              >
+              <el-button
+                size="small"
+                type="primary"
+                plain
+                @click="cancelRowEvent(row)"
+                >取消</el-button
+              >
+            </template>
+            <template v-else>
+              <el-button
+                v-if="isHasAuth('detail')"
+                size="small"
+                type="primary"
+                plain
+                @click="detail(row)"
+                >查看</el-button
+              >
+              <el-button
+                v-if="isHasAuth('edit')"
+                size="small"
+                type="warning"
+                @click="editRowEvent(row)"
+                >编辑</el-button
+              >
+              <el-button
+                v-if="isHasAuth('delete')"
+                size="small"
+                type="danger"
+                @click="destroyRowEvent(row)"
+                >删除</el-button
+              >
+            </template>
+          </template>
+        </vxe-column>
+      </vxe-table>
+
+      <el-pagination
+        style="margin-top: 10px; display: flex; justify-content: flex-end"
+        :current-page.sync="select.page"
+        :page-sizes="[20, 30, 40, 50]"
+        :page-size.sync="select.page_size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        @size-change="
           (e) => {
             select.page_size = e;
             select.page = 1;
             getList();
           }
         "
-                        @current-change="
+        @current-change="
           (e) => {
             select.page = e;
             getList();
           }
         "
-                />
-            
-        </el-card>
-
-        <AddAspiration
-                ref="AddAspiration"
-                
-                    :area="area"
-                  
-                :is-show.sync="isShowAdd"
-                @refresh="getList"
-        />
-        <ShowAspiration
-                ref="ShowAspiration"
-        
-                :area="area"
-                
-                :is-show.sync="isShowDetail"
-        />
-        
-    </div>
+      />
+    </el-card>
+
+    <AddAspiration
+      ref="AddAspiration"
+      :area="area"
+      :is-show.sync="isShowAdd"
+      @refresh="getList"
+    />
+    <ShowAspiration
+      ref="ShowAspiration"
+      :area="area"
+      :is-show.sync="isShowDetail"
+    />
+  </div>
 </template>
 
 <script>
-  import VxeUI from "vxe-pc-ui";
-  
-  import { authMixin } from "@/mixin/authMixin"
-  import { uploadSize } from "@/settings";
-  import { deepCopy } from "@/utils";
-  import { download } from "@/utils/downloadRequest";
-  import { destroy, index, save } from "@/api/aspiration/aspiration";
-  import AddAspiration from "./components/AddAspiration.vue";
-  import ShowAspiration from "./components/ShowAspiration.vue";
-  import axios from "axios";
-  import { getToken } from "@/utils/auth";
-  
-        import { index as areaIndex } from '@/api/area/area';
-      
-  export default {
-    name: "Aspiration",
-    mixins: [authMixin],
-    components: {
-        
-      AddAspiration,
-      ShowAspiration,
-    },
-    data() {
-      return {
-        uploadSize,
-        examineKey: 0,
-        isShowAdd: false,
-        isShowDetail: false,
-
-        loading: false,
-        tableHeight: 400,
-        select: {
-          page: 1,
-          page_size: 20,
-          keyword: '',
-          show_relation: [],
-          
-        },
-        total: 0,
-        allAlign: null,
-        tableData: [],
-        form: {
-          id: '',
-          
-            name: '',
-          
-            area_id: '',
-          
-            year: '',
-          
-            title: '',
-          
-            remark: '',
-          
-            tip: '',
-          
-            need_sign: '',
-          
-        },
+import VxeUI from "vxe-pc-ui";
+
+import { authMixin } from "@/mixin/authMixin";
+import { uploadSize } from "@/settings";
+import { deepCopy } from "@/utils";
+import { download } from "@/utils/downloadRequest";
+import { destroy, index, save } from "@/api/aspiration/aspiration";
+import AddAspiration from "./components/AddAspiration.vue";
+import ShowAspiration from "./components/ShowAspiration.vue";
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+
+import { index as areaIndex } from "@/api/area/area";
+
+export default {
+  name: "Aspiration",
+  mixins: [authMixin],
+  components: {
+    AddAspiration,
+    ShowAspiration,
+  },
+  data() {
+    return {
+      uploadSize,
+      examineKey: 0,
+      isShowAdd: false,
+      isShowDetail: false,
+
+      loading: false,
+      tableHeight: 400,
+      select: {
+        page: 1,
+        page_size: 20,
+        keyword: "",
+        show_relation: [],
+      },
+      total: 0,
+      allAlign: null,
+      tableData: [],
+      form: {
+        id: "",
+
+        name: "",
+
+        area_id: "",
+
+        year: "",
+
+        title: "",
+
+        remark: "",
+
+        tip: "",
+
+        need_sign: "",
+      },
       validRules: {
-          
-          name: [
-            
+        name: [
           {
             required: true,
-            message: '名称'+'必填'
+            message: "名称" + "必填",
           },
-          
         ],
-          
-          area_id: [
-            
+
+        area_id: [
           {
             required: true,
-            message: '区域'+'必填'
+            message: "区域" + "必填",
           },
-          
         ],
-          
-          title: [
-            
+
+        title: [
           {
             required: true,
-            message: '标题'+'必填'
+            message: "标题" + "必填",
           },
-          
         ],
-          
       },
 
-        
-               area: [],
-             
-      };
-    },
-    computed: {
-      isActiveStatus() {
-        return function (row) {
-          if (this.$refs["table"]) {
-            return this.$refs["table"].isEditByRow(row);
-          }
-        };
-      },
-      isHasAuth() {
-        return function (auth) {
-          return this.auths_auth_mixin.indexOf(auth) !== -1
+      area: [],
+    };
+  },
+  computed: {
+    isActiveStatus() {
+      return function (row) {
+        if (this.$refs["table"]) {
+          return this.$refs["table"].isEditByRow(row);
         }
-      }
-    },
-    created() {
-      
-         this.getArea()
-         
-      this.getList();
+      };
     },
-    mounted() {
-      this.bindToolbar()
-      this.calcTableHeight()
+    isHasAuth() {
+      return function (auth) {
+        return this.auths_auth_mixin.indexOf(auth) !== -1;
+      };
     },
-    methods: {
-      exportMethod() {
-        this.$confirm("请选择导出方式", "提示", {
-          confirmButtonText: "全量导出",
-          cancelButtonText: "部分导出",
-          distinguishCancelAndClose: true
-        }).then(_ => {
-          download('/api/admin/school/index', 'get', {
+  },
+  created() {
+    this.getArea();
+
+    this.getList();
+  },
+  mounted() {
+    this.bindToolbar();
+    this.calcTableHeight();
+  },
+  methods: {
+    exportMethod() {
+      this.$confirm("请选择导出方式", "提示", {
+        confirmButtonText: "全量导出",
+        cancelButtonText: "部分导出",
+        distinguishCancelAndClose: true,
+      })
+        .then((_) => {
+          download("/api/admin/school/index", "get", {
             ...this.select,
             page: 1,
             page_size: 9999,
             is_export: 1,
-            export_fields: Object.keys(this.form)
-          })
-        }).catch(action => {
-          if (action === 'cancel' && this.$refs['table']) {
-            this.$refs['table'].openExport()
+            export_fields: Object.keys(this.form),
+          });
+        })
+        .catch((action) => {
+          if (action === "cancel" && this.$refs["table"]) {
+            this.$refs["table"].openExport();
           }
         });
-      },
-      calcTableHeight() {
-        let clientHeight = document.documentElement.clientHeight;
-        let cardTitle = document.querySelector(".el-card__header")?.getBoundingClientRect()?.height;
-        let search = document.querySelector(".vxe-toolbar")?.getBoundingClientRect()?.height;
-        let paginationHeight = (document.querySelector(".el-pagination")?.getBoundingClientRect()?.height ?? 0) + 10; //分页的高度
-        let topHeight = 50; //页面 头部
-        let padding = 80;
-        let margin = 20;
-        this.tableHeight =
-          clientHeight - cardTitle - search - paginationHeight - topHeight - padding - margin;
-      },
-      contextMenuClickEvent ({ menu, row, column }) {
-        switch (menu.code) {
-          case 'copy':
-            // 示例
-            if (row && column) {
-              if (VxeUI.clipboard.copy(row[column.field])) {
-                this.$message.success('已复制到剪贴板！')
-              }
-            }
-            break
-          case 'remove':
-            if (row && column) {
-              this.destroyRowEvent(row)
+    },
+    calcTableHeight() {
+      let clientHeight = document.documentElement.clientHeight;
+      let cardTitle = document
+        .querySelector(".el-card__header")
+        ?.getBoundingClientRect()?.height;
+      let search = document
+        .querySelector(".vxe-toolbar")
+        ?.getBoundingClientRect()?.height;
+      let paginationHeight =
+        (document.querySelector(".el-pagination")?.getBoundingClientRect()
+          ?.height ?? 0) + 10; //分页的高度
+      let topHeight = 50; //页面 头部
+      let padding = 80;
+      let margin = 20;
+      this.tableHeight =
+        clientHeight -
+        cardTitle -
+        search -
+        paginationHeight -
+        topHeight -
+        padding -
+        margin;
+    },
+    contextMenuClickEvent({ menu, row, column }) {
+      switch (menu.code) {
+        case "copy":
+          // 示例
+          if (row && column) {
+            if (VxeUI.clipboard.copy(row[column.field])) {
+              this.$message.success("已复制到剪贴板！");
             }
-          default:
-        }
-      },
-      async detail (row) {
-        await this.$refs["ShowAspiration"].getDetail(row.id)
-        this.isShowDetail = true
-      },
+          }
+          break;
+        case "remove":
+          if (row && column) {
+            this.destroyRowEvent(row);
+          }
+        default:
+      }
+    },
+    async detail(row) {
+      await this.$refs["ShowAspiration"].getDetail(row.id);
+      this.isShowDetail = true;
+    },
 
-      
-           async getArea() {
-             try {
-               const res = await areaIndex({
-                 page: 1,
-                 page_size: 999,
-                 
-               }, false)
-               this.area = res.data
-             } catch(err) {
-               console.error(err)
-             }
-           },
-         
-
-      uploadMethod(file) {
-        const formData = new FormData()
-        formData.append('file', file)
-        window.$_uploading = true
-        return axios.post(process.env.VUE_APP_UPLOAD_API, formData, {
+    async getArea() {
+      try {
+        const res = await areaIndex(
+          {
+            page: 1,
+            page_size: 999,
+          },
+          false
+        );
+        this.area = res.data;
+      } catch (err) {
+        console.error(err);
+      }
+    },
+
+    uploadMethod(file) {
+      const formData = new FormData();
+      formData.append("file", file);
+      window.$_uploading = true;
+      return axios
+        .post(process.env.VUE_APP_UPLOAD_API, formData, {
           headers: {
             Authorization: `Bearer ${getToken()}`,
-          }
-        }).then((response) => {
-          window.$_uploading = false
+          },
+        })
+        .then((response) => {
+          window.$_uploading = false;
           if (response.status === 200 && !response.data.code) {
             return {
               response: response.data,
               name: response.data.original_name,
-              url: response.data.url
-            }
+              url: response.data.url,
+            };
           } else {
-            this.$message.error("上传失败")
+            this.$message.error("上传失败");
           }
-        }).catch(_ => {
-          window.$_uploading = false
         })
-      },
-      bindToolbar() {
-        this.$nextTick(() => {
-          if (this.$refs["table"] && this.$refs["toolbar"]) {
-            this.$refs["table"].connect(this.$refs["toolbar"]);
-          }
+        .catch((_) => {
+          window.$_uploading = false;
         });
-      },
-
-      editRowEvent(row) {
-        if (this.$refs["table"]) {
-          this.$refs["table"].setEditRow(row);
-        }
-      },
-      cancelRowEvent(row) {
-        if (this.$refs["table"]) {
-          this.$refs["table"].clearEdit().then(() => {
-            // 还原行数据
-            this.$refs["table"].revertData(row);
-          });
+    },
+    bindToolbar() {
+      this.$nextTick(() => {
+        if (this.$refs["table"] && this.$refs["toolbar"]) {
+          this.$refs["table"].connect(this.$refs["toolbar"]);
         }
-      },
+      });
+    },
 
-      async getList() {
-        this.loading = true;
-        try {
-          const res = await index(this.select, false);
-          this.tableData = res.data;
-          this.total = res.total;
-          this.loading = false;
-        } catch (err) {
-          console.error(err);
-          this.loading = false;
-        }
-      },
+    editRowEvent(row) {
+      if (this.$refs["table"]) {
+        this.$refs["table"].setEditRow(row);
+      }
+    },
+    cancelRowEvent(row) {
+      if (this.$refs["table"]) {
+        this.$refs["table"].clearEdit().then(() => {
+          // 还原行数据
+          this.$refs["table"].revertData(row);
+        });
+      }
+    },
 
-      async saveRowEvent(row) {
-        if (window.$_uploading) {
-          this.$message.warning("文件正在上传中")
-          return
+    async getList() {
+      this.loading = true;
+      try {
+        const res = await index(this.select, false);
+        this.tableData = res.data;
+        this.total = res.total;
+        this.loading = false;
+      } catch (err) {
+        console.error(err);
+        this.loading = false;
+      }
+    },
+
+    async saveRowEvent(row) {
+      if (window.$_uploading) {
+        this.$message.warning("文件正在上传中");
+        return;
+      }
+      try {
+        const errMap = await this.$refs["table"].validate();
+        if (errMap) {
+          throw new Error(errMap);
         }
-        try {
-          const errMap = await this.$refs["table"].validate();
-          if (errMap) {
-            throw new Error(errMap);
-          }
-          await this.$confirm("确认保存？", "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "取消",
-          });
-          await this.$refs["table"].clearEdit();
-          let form = deepCopy(this.form);
-          for (const key in form) {
-            form[key] = row[key];
-          }
-          
-          this.loading = true;
-          await save(form, false);
-          await this.getList();
-          this.loading = false;
-        } catch (err) {
-          this.loading = false;
+        await this.$confirm("确认保存？", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+        });
+        await this.$refs["table"].clearEdit();
+        let form = deepCopy(this.form);
+        for (const key in form) {
+          form[key] = row[key];
         }
-      },
-      async destroyRowEvent(row) {
-        try {
-          await this.$confirm("确认删除？", "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "取消",
-          });
-          this.loading = true;
-          if (row.id) {
-            await destroy({
+
+        this.loading = true;
+        await save(form, false);
+        await this.getList();
+        this.loading = false;
+      } catch (err) {
+        this.loading = false;
+      }
+    },
+    async destroyRowEvent(row) {
+      try {
+        await this.$confirm("确认删除？", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+        });
+        this.loading = true;
+        if (row.id) {
+          await destroy(
+            {
               id: row.id,
-            },false);
-            await this.getList();
-          } else {
-            console.log(row);
-            this.tableData.splice(
-              this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
-              1
-            );
-          }
-          this.loading = false;
-        } catch (err) {
-          this.loading = false;
+            },
+            false
+          );
+          await this.getList();
+        } else {
+          console.log(row);
+          this.tableData.splice(
+            this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
+            1
+          );
         }
-      },
-
+        this.loading = false;
+      } catch (err) {
+        this.loading = false;
+      }
     },
-  };
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  ::v-deep .el-card__header {
-    padding: 6px 20px;
-  }
-  ::v-deep .el-tag + .el-tag {
-    margin-left: 4px;
-  }
+::v-deep .el-card__header {
+  padding: 6px 20px;
+}
+::v-deep .el-tag + .el-tag {
+  margin-left: 4px;
+}
 </style>
diff --git a/src/views/Aspiration/components/AddAspiration.vue b/src/views/Aspiration/components/AddAspiration.vue
index c15839f..5c72f17 100644
--- a/src/views/Aspiration/components/AddAspiration.vue
+++ b/src/views/Aspiration/components/AddAspiration.vue
@@ -1,83 +1,144 @@
-
 <template>
-    <div>
-        <el-drawer
-                :title="$route.meta.title"
-                direction="rtl"
-                size="68%"
-                :visible.sync="visible"
-                append-to-body
-                :before-close="handleClose"
-                @close="$emit('update:isShow',false)">
-            <section class="drawer-container">
-                <el-form class="drawer-container__form" ref="elForm" :model="form" :rules="rules" label-position="top" label-width="120px" size="small">
-                    <div class="form-layout">
-                        
-                                 <el-form-item label="名称" prop="name">
-                                   <el-input v-model="form['name']" clearable placeholder="请填写名称" style="width: 100%;"></el-input>
-                                 </el-form-item>
-                               
-                                   <el-form-item label="区域" prop="area_id" clearable>
-                                     <el-select v-model="form['area_id']" clearable placeholder="请填写区域"  style="width: 100%;">
-                                       <el-option v-for="(option, optionIndex) in area" :key="optionIndex" :label="option['name']" :value="option['id']"></el-option>
-                                     </el-select>
-                                   </el-form-item>
-                               
-                                    <el-form-item label="年份" prop="year" clearable>
-                                      <el-date-picker v-model="form['year']" clearable placeholder="请填写年份" type="year" value-format="yyyy" style="width: 100%;"></el-date-picker>
-                                    </el-form-item>
-                               
-                                 <el-form-item label="标题" prop="title">
-                                   <el-input v-model="form['title']" clearable placeholder="请填写标题" style="width: 100%;"></el-input>
-                                 </el-form-item>
-                               
-                                    <el-form-item label="备注" prop="remark">
-                                      <el-input v-model="form['remark']" clearable placeholder="请填写备注" type="textarea" :autosize="{ minRows: 2 }" style="width: 100%;"></el-input>
-                                    </el-form-item>
-                               
-                                    <el-form-item label="提示" prop="tip">
-                                      <el-input v-model="form['tip']" clearable placeholder="请填写提示" type="textarea" :autosize="{ minRows: 2 }" style="width: 100%;"></el-input>
-                                    </el-form-item>
-                               
-                                   <el-form-item label="是否需要签名" prop="need_sign" clearable>
-                                     <el-select v-model="form['need_sign']" clearable placeholder="请填写是否需要签名"  style="width: 100%;">
-                                       <el-option v-for="(option, optionIndex) in [{'value':1,'label':'是'},{'value':0,'label':'否'}]" :key="optionIndex" :label="option['label']" :value="option['value']"></el-option>
-                                     </el-select>
-                                   </el-form-item>
-                               
-                    </div>
-                </el-form>
+  <div>
+    <el-drawer
+      :title="$route.meta.title"
+      direction="rtl"
+      size="68%"
+      :visible.sync="visible"
+      append-to-body
+      :before-close="handleClose"
+      @close="$emit('update:isShow', false)"
+    >
+      <section class="drawer-container">
+        <el-form
+          class="drawer-container__form"
+          ref="elForm"
+          :model="form"
+          :rules="rules"
+          label-position="top"
+          label-width="120px"
+          size="small"
+        >
+          <div class="form-layout">
+            <el-form-item label="名称" prop="name">
+              <el-input
+                v-model="form['name']"
+                clearable
+                placeholder="请填写名称"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="区域" prop="area_id" clearable>
+              <el-select
+                v-model="form['area_id']"
+                clearable
+                placeholder="请填写区域"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(option, optionIndex) in area"
+                  :key="optionIndex"
+                  :label="option['name']"
+                  :value="option['id']"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="年份" prop="year" clearable>
+              <el-date-picker
+                v-model="form['year']"
+                clearable
+                placeholder="请填写年份"
+                type="year"
+                value-format="yyyy"
+                style="width: 100%"
+              ></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="标题" prop="title">
+              <el-input
+                v-model="form['title']"
+                clearable
+                placeholder="请填写标题"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
 
-                <div class="drawer-container__footer">
-                    <el-button @click="reset">重 置</el-button>
-                    <el-button type="primary" @click="submit" :loading="loading">{{ loading ? '提交中 ...' : '确 定' }}</el-button>
-                </div>
-            </section>
-        </el-drawer>
-    </div>
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="form['remark']"
+                clearable
+                placeholder="请填写备注"
+                type="textarea"
+                :autosize="{ minRows: 2 }"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="提示" prop="tip">
+              <el-input
+                v-model="form['tip']"
+                clearable
+                placeholder="请填写提示"
+                type="textarea"
+                :autosize="{ minRows: 2 }"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="是否需要签名" prop="need_sign" clearable>
+              <el-select
+                v-model="form['need_sign']"
+                clearable
+                placeholder="请填写是否需要签名"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(option, optionIndex) in [
+                    { value: 1, label: '是' },
+                    { value: 0, label: '否' },
+                  ]"
+                  :key="optionIndex"
+                  :label="option['label']"
+                  :value="option['value']"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-form>
+
+        <div class="drawer-container__footer">
+          <el-button @click="reset">重 置</el-button>
+          <el-button type="primary" @click="submit" :loading="loading">{{
+            loading ? "提交中 ..." : "确 定"
+          }}</el-button>
+        </div>
+      </section>
+    </el-drawer>
+  </div>
 </template>
 
 <script>
-  import { save, show } from "@/api/aspiration/aspiration";
-  import axios from "axios";
-  import { getToken } from "@/utils/auth";
-  import { uploadSize } from "@/settings";
-  import { formatFileSize } from "@/utils";
+import { save, show } from "@/api/aspiration/aspiration";
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import { uploadSize } from "@/settings";
+import { formatFileSize } from "@/utils";
 
-  export default {
+export default {
   name: "AspirationDrawer",
   props: {
     isShow: {
       type: Boolean,
       default: false,
-      required: true
+      required: true,
+    },
+
+    area: {
+      type: Array,
+      default: () => [],
     },
-    
-           area : {
-             type: Array,
-             default: () => []
-           },
-         
   },
   data() {
     return {
@@ -86,60 +147,50 @@
       loading: false,
       visible: false,
       form: {
-        
-          name: '',
-        
-          area_id: '',
-        
-          year: '',
-        
-          title: '',
-        
-          remark: '',
-        
-          tip: '',
-        
-          need_sign: '',
-        
+        name: "",
+
+        area_id: "",
+
+        year: "",
+
+        title: "",
+
+        remark: "",
+
+        tip: "",
+
+        need_sign: "",
       },
       rules: {
-          
-          name: [
-              
+        name: [
           {
             required: true,
-            message: '名称'+'必填'
+            message: "名称" + "必填",
           },
-              
         ],
-          
-          area_id: [
-              
+
+        area_id: [
           {
             required: true,
-            message: '区域'+'必填'
+            message: "区域" + "必填",
           },
-              
         ],
-          
-          title: [
-              
+
+        title: [
           {
             required: true,
-            message: '标题'+'必填'
+            message: "标题" + "必填",
           },
-              
         ],
-          
       },
-    }
+    };
   },
   watch: {
     isShow(newVal) {
-      this.visible = newVal
+      this.visible = newVal;
     },
     visible(newVal) {
-      this.$emit('update:isShow', newVal)
+      this.$emit("update:isShow", newVal);
     },
   },
   methods: {
@@ -151,23 +202,23 @@
         });
         return false;
       }
-      window.$_uploading = true
+      window.$_uploading = true;
     },
     uploadSuccess(response, file, fileList, fieldName) {
-      window.$_uploading = false
+      window.$_uploading = false;
       fileList.forEach((file) => {
         if (file.response?.data && !file.response?.code) {
           file.response = file.response.data;
         }
       });
-      this.form[fieldName] = fileList
+      this.form[fieldName] = fileList;
     },
     uploadRemove(file, fileList, fieldName) {
-      this.form[fieldName] = fileList
+      this.form[fieldName] = fileList;
     },
     uploadError(err, file, fileList, fieldName) {
-      window.$_uploading = false
-      this.form[fieldName] = fileList
+      window.$_uploading = false;
+      this.form[fieldName] = fileList;
       this.$message({
         type: "warning",
         message: err,
@@ -176,57 +227,55 @@
     formatFileSize,
     getToken,
     handleClose(done) {
-      this.$confirm('确定关闭窗口？')
-        .then(_ => {
+      this.$confirm("确定关闭窗口？")
+        .then((_) => {
           done();
         })
-        .catch(_ => {});
+        .catch((_) => {});
     },
 
     reset() {
       this.form = {
-          
-          name: '',
-          
-          area_id: '',
-          
-          year: '',
-          
-          title: '',
-          
-          remark: '',
-          
-          tip: '',
-          
-          need_sign: '',
-          
-      }
-      this.$refs['elForm'].resetFields()
+        name: "",
+
+        area_id: "",
+
+        year: "",
+
+        title: "",
+
+        remark: "",
+
+        tip: "",
+
+        need_sign: "",
+      };
+      this.$refs["elForm"].resetFields();
     },
     submit() {
       if (window.$_uploading) {
-        this.$message.warning("文件正在上传中")
-        return
+        this.$message.warning("文件正在上传中");
+        return;
       }
-      
-      this.$refs['elForm'].validate(async valid => {
+
+      this.$refs["elForm"].validate(async (valid) => {
         if (valid) {
-          this.loading = true
+          this.loading = true;
           try {
-            await save(this.form)
-            this.$message.success('新增成功')
-            this.$emit('refresh')
-            this.$emit('update:isShow', false)
-            this.loading = false
-            this.reset()
+            await save(this.form);
+            this.$message.success("新增成功");
+            this.$emit("refresh");
+            this.$emit("update:isShow", false);
+            this.loading = false;
+            this.reset();
           } catch (err) {
-            this.loading = false
+            this.loading = false;
           }
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/Aspiration/components/ShowAspiration.vue b/src/views/Aspiration/components/ShowAspiration.vue
index 901fccc..6207747 100644
--- a/src/views/Aspiration/components/ShowAspiration.vue
+++ b/src/views/Aspiration/components/ShowAspiration.vue
@@ -1,133 +1,150 @@
-
 <template>
-    <div>
-        <el-drawer
-                :title="$route.meta.title"
-                direction="rtl"
-                size="68%"
-                :visible.sync="visible"
-                append-to-body
-                @close="$emit('update:isShow',false)">
-            <section class="drawer-container">
-                <el-descriptions class="drawer-container__desc" size="small" border ref="elDesc" :column="2" direction="vertical" :labelStyle="{ 'font-weight': '500', 'font-size': '15px' }">
-                    
-                    <el-descriptions-item label="名称">
-                        {{ form['name'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="区域">
-                        {{ area.find(i => i['id'] === form['area_id']) ? area.find(i => i['id'] === form['area_id'])['name'] : '' }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="年份">
-                        {{ form['year'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="标题">
-                        {{ form['title'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="备注" span="2">
-                        <div v-html="form['remark']"></div>
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="提示" span="2">
-                        <div v-html="form['tip']"></div>
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="是否需要签名">
-                        {{ [{'value':1,'label':'是'},{'value':0,'label':'否'}].find(i => i['value'] === form['need_sign']) ? [{'value':1,'label':'是'},{'value':0,'label':'否'}].find(i => i['value'] === form['need_sign'])['label'] : '' }}
-                    </el-descriptions-item>
-                    
-                </el-descriptions>
-            </section>
-        </el-drawer>
-    </div>
+  <div>
+    <el-drawer
+      :title="$route.meta.title"
+      direction="rtl"
+      size="68%"
+      :visible.sync="visible"
+      append-to-body
+      @close="$emit('update:isShow', false)"
+    >
+      <section class="drawer-container">
+        <el-descriptions
+          class="drawer-container__desc"
+          size="small"
+          border
+          ref="elDesc"
+          :column="2"
+          direction="vertical"
+          :labelStyle="{ 'font-weight': '500', 'font-size': '15px' }"
+        >
+          <el-descriptions-item label="名称">
+            {{ form["name"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="区域">
+            {{
+              area.find((i) => i["id"] === form["area_id"])
+                ? area.find((i) => i["id"] === form["area_id"])["name"]
+                : ""
+            }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="年份">
+            {{ form["year"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="标题">
+            {{ form["title"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="备注" span="2">
+            <div v-html="form['remark']"></div>
+          </el-descriptions-item>
+
+          <el-descriptions-item label="提示" span="2">
+            <div v-html="form['tip']"></div>
+          </el-descriptions-item>
+
+          <el-descriptions-item label="是否需要签名">
+            {{
+              [
+                { value: 1, label: "是" },
+                { value: 0, label: "否" },
+              ].find((i) => i["value"] === form["need_sign"])
+                ? [
+                    { value: 1, label: "是" },
+                    { value: 0, label: "否" },
+                  ].find((i) => i["value"] === form["need_sign"])["label"]
+                : ""
+            }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </section>
+    </el-drawer>
+  </div>
 </template>
 
 <script>
-  import { show } from "@/api/aspiration/aspiration";
-
-  export default {
-    name: "AspirationShow",
-    props: {
-      isShow: {
-        type: Boolean,
-        default: false,
-        required: true
-      },
-  
-  area : {
-    type: Array,
-  default: () => []
-  },
-  
+import { show } from "@/api/aspiration/aspiration";
+
+export default {
+  name: "AspirationShow",
+  props: {
+    isShow: {
+      type: Boolean,
+      default: false,
+      required: true,
+    },
+
+    area: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
       loading: false,
       visible: false,
       form: {
-      
-      name: '',
-      
-      area_id: '',
-      
-      year: '',
-      
-      title: '',
-      
-      remark: '',
-      
-      tip: '',
-      
-      need_sign: '',
-      
-  },
-  }
+        name: "",
+
+        area_id: "",
+
+        year: "",
+
+        title: "",
+
+        remark: "",
+
+        tip: "",
+
+        need_sign: "",
+      },
+    };
   },
   watch: {
     isShow(newVal) {
-      this.visible = newVal
+      this.visible = newVal;
     },
     visible(newVal) {
-      this.$emit('update:isShow', newVal)
+      this.$emit("update:isShow", newVal);
     },
   },
   methods: {
     async getDetail(id) {
       try {
         const detail = await show({
-          id
-        })
+          id,
+        });
         for (let key in this.form) {
           if (detail.hasOwnProperty(key)) {
-            this.form[key] = detail[key]
+            this.form[key] = detail[key];
           }
         }
       } catch (err) {
-        console.error(err)
+        console.error(err);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  .span2 {
-    grid-column: span 2;
-  }
-  ::v-deep .el-form-item > * {
-    max-width: 100%;
-  }
-  .drawer-container {
-    height: 100%;
-    padding: 20px;
-    display: flex;
-    flex-direction: column;
-
-    & > * {
-      flex: 1;
-    }
+.span2 {
+  grid-column: span 2;
+}
+::v-deep .el-form-item > * {
+  max-width: 100%;
+}
+.drawer-container {
+  height: 100%;
+  padding: 20px;
+  display: flex;
+  flex-direction: column;
+
+  & > * {
+    flex: 1;
   }
+}
 </style>
diff --git a/src/views/Batch/Batch.vue b/src/views/Batch/Batch.vue
index e5b56dd..ca48e48 100644
--- a/src/views/Batch/Batch.vue
+++ b/src/views/Batch/Batch.vue
@@ -1,467 +1,496 @@
-
 <template>
-    <div>
-        <el-card shadow="never" style="margin-top: 20px;">
-            <template #header>
-                <slot name="header">
-                    <vxe-toolbar :print="isHasAuth('print')" custom ref="toolbar">
-                        <template #toolSuffix>
-                            <vxe-button style="margin-right: 10px;" v-if="isHasAuth('export')" icon="vxe-icon-download" circle @click="exportMethod"></vxe-button>
-                        </template>
-                        <template #buttons>
-                            <el-button
-                                    v-if="isHasAuth('create')"
-                                    icon="el-icon-plus"
-                                    type="primary"
-                                    size="small"
-                                    @click="isShowAdd = true"
-                            >新增</el-button
-                            >
-                            <el-button
-                                    v-if="isHasAuth('search')"
-                                    icon="el-icon-search"
-                                    type="primary"
-                                    plain
-                                    size="small"
-                                    @click="getList"
-                            >搜索</el-button
-                            >
-                        </template>
-                    </vxe-toolbar>
-                </slot>
+  <div>
+    <el-card shadow="never" style="margin-top: 20px">
+      <template #header>
+        <slot name="header">
+          <vxe-toolbar :print="isHasAuth('print')" custom ref="toolbar">
+            <template #toolSuffix>
+              <vxe-button
+                style="margin-right: 10px"
+                v-if="isHasAuth('export')"
+                icon="vxe-icon-download"
+                circle
+                @click="exportMethod"
+              ></vxe-button>
+            </template>
+            <template #buttons>
+              <el-button
+                v-if="isHasAuth('create')"
+                icon="el-icon-plus"
+                type="primary"
+                size="small"
+                @click="isShowAdd = true"
+                >新增</el-button
+              >
+              <el-button
+                v-if="isHasAuth('search')"
+                icon="el-icon-search"
+                type="primary"
+                plain
+                size="small"
+                @click="getList"
+                >搜索</el-button
+              >
             </template>
+          </vxe-toolbar>
+        </slot>
+      </template>
 
-            <vxe-table
-                    ref="table"
-                    stripe
-                    style="margin-top: 10px"
-                    :loading="loading"
-                    :height="tableHeight"
-                    keep-source
-                    show-overflow
-                    :menu-config="{
-                      className: 'my-menus',
-                      body: {
-                        options: [
-                          [
-                            { code: 'copy', name: '复制', prefixConfig: { icon: 'vxe-icon-copy' }, suffixConfig: { content: 'Ctrl+C' } },
-                            { code: 'remove', name: '删除', prefixConfig: { icon: 'vxe-icon-delete-fill', className: 'color-red' } }
-                          ],
-                        ]
-                      }
-                    }"
-                    @menu-click="contextMenuClickEvent"
-                    :row-config="{ isCurrent: true, isHover: true }"
-                    :column-config="{ resizable: true }"
-                    :export-config="{}"
-                    :edit-rules="validRules"
-                    :edit-config="{
+      <vxe-table
+        ref="table"
+        stripe
+        style="margin-top: 10px"
+        :loading="loading"
+        :height="tableHeight"
+        keep-source
+        show-overflow
+        :menu-config="{
+          className: 'my-menus',
+          body: {
+            options: [
+              [
+                {
+                  code: 'copy',
+                  name: '复制',
+                  prefixConfig: { icon: 'vxe-icon-copy' },
+                  suffixConfig: { content: 'Ctrl+C' },
+                },
+                {
+                  code: 'remove',
+                  name: '删除',
+                  prefixConfig: {
+                    icon: 'vxe-icon-delete-fill',
+                    className: 'color-red',
+                  },
+                },
+              ],
+            ],
+          },
+        }"
+        @menu-click="contextMenuClickEvent"
+        :row-config="{ isCurrent: true, isHover: true }"
+        :column-config="{ resizable: true }"
+        :export-config="{}"
+        :edit-rules="validRules"
+        :edit-config="{
           trigger: 'manual',
           mode: 'row',
           showStatus: true,
           isHover: true,
           autoClear: false,
         }"
-                    
-                    :align="allAlign"
-                    :data="tableData"
-            >
-                <vxe-column type="checkbox" width="50" align="center" />
-                <vxe-column type="seq" width="58" align="center"  />
-                
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="name"
-                                width="160"
-                                title="名称"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                field="aspiration_id"
-                                width="180"
-                                title="归属总表"
-                                :edit-render="{ name: 'VxeSelect', options: aspiration, props: { multiple: false }, optionProps: { value: 'id', label: 'name' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                align="right"
-                                field="sort"
-                                width="160"
-                                title="排序"
-                                :edit-render="{ name: 'input', attrs: { type: 'number' } }"
-                        />
-                        
-                <vxe-column field="operate" header-align="center" title="操作" min-width="220" fixed="right">
-                    <template #default="{ row }">
-                        <template v-if="isActiveStatus(row)">
-                            <el-button size="small" type="primary" @click="saveRowEvent(row)"
-                            >保存</el-button
-                            >
-                            <el-button
-                                    size="small"
-                                    type="primary"
-                                    plain
-                                    @click="cancelRowEvent(row)"
-                            >取消</el-button
-                            >
-                        </template>
-                        <template v-else>
-                            <el-button v-if="isHasAuth('detail')" size="small" type="primary" plain @click="detail(row)"
-                            >查看</el-button
-                            >
-                            <el-button v-if="isHasAuth('edit')" size="small" type="warning" @click="editRowEvent(row)"
-                            >编辑</el-button
-                            >
-                            <el-button
-                                    v-if="isHasAuth('delete')"
-                                    size="small"
-                                    type="danger"
-                                    @click="destroyRowEvent(row)"
-                            >删除</el-button
-                            >
-                        </template>
-                    </template>
-                </vxe-column>
-            </vxe-table>
+        :align="allAlign"
+        :data="tableData"
+      >
+        <vxe-column type="checkbox" width="50" align="center" />
+        <vxe-column type="seq" width="58" align="center" />
+
+        <vxe-column
+          header-align="center"
+          field="name"
+          width="160"
+          title="名称"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          align="center"
+          field="aspiration_id"
+          width="180"
+          title="归属总表"
+          :edit-render="{
+            name: 'VxeSelect',
+            options: aspiration,
+            props: { multiple: false },
+            optionProps: { value: 'id', label: 'name' },
+          }"
+        />
+
+        <vxe-column
+          header-align="center"
+          align="right"
+          field="sort"
+          width="160"
+          title="排序"
+          :edit-render="{ name: 'input', attrs: { type: 'number' } }"
+        />
+
+        <vxe-column
+          field="operate"
+          header-align="center"
+          title="操作"
+          min-width="220"
+          fixed="right"
+        >
+          <template #default="{ row }">
+            <template v-if="isActiveStatus(row)">
+              <el-button size="small" type="primary" @click="saveRowEvent(row)"
+                >保存</el-button
+              >
+              <el-button
+                size="small"
+                type="primary"
+                plain
+                @click="cancelRowEvent(row)"
+                >取消</el-button
+              >
+            </template>
+            <template v-else>
+              <el-button
+                v-if="isHasAuth('detail')"
+                size="small"
+                type="primary"
+                plain
+                @click="detail(row)"
+                >查看</el-button
+              >
+              <el-button
+                v-if="isHasAuth('edit')"
+                size="small"
+                type="warning"
+                @click="editRowEvent(row)"
+                >编辑</el-button
+              >
+              <el-button
+                v-if="isHasAuth('delete')"
+                size="small"
+                type="danger"
+                @click="destroyRowEvent(row)"
+                >删除</el-button
+              >
+            </template>
+          </template>
+        </vxe-column>
+      </vxe-table>
 
-            
-                <el-pagination
-                        style="margin-top: 10px;display: flex;justify-content: flex-end;"
-                        :current-page.sync="select.page"
-                        :page-sizes="[20, 30, 40, 50]"
-                        :page-size.sync="select.page_size"
-                        layout="total, sizes, prev, pager, next, jumper"
-                        :total="total"
-                        @size-change="
+      <el-pagination
+        style="margin-top: 10px; display: flex; justify-content: flex-end"
+        :current-page.sync="select.page"
+        :page-sizes="[20, 30, 40, 50]"
+        :page-size.sync="select.page_size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        @size-change="
           (e) => {
             select.page_size = e;
             select.page = 1;
             getList();
           }
         "
-                        @current-change="
+        @current-change="
           (e) => {
             select.page = e;
             getList();
           }
         "
-                />
-            
-        </el-card>
+      />
+    </el-card>
 
-        <AddBatch
-                ref="AddBatch"
-                
-                    :aspiration="aspiration"
-                  
-                :is-show.sync="isShowAdd"
-                @refresh="getList"
-        />
-        <ShowBatch
-                ref="ShowBatch"
-        
-                :aspiration="aspiration"
-                
-                :is-show.sync="isShowDetail"
-        />
-        
-    </div>
+    <AddBatch
+      ref="AddBatch"
+      :aspiration="aspiration"
+      :is-show.sync="isShowAdd"
+      @refresh="getList"
+    />
+    <ShowBatch
+      ref="ShowBatch"
+      :aspiration="aspiration"
+      :is-show.sync="isShowDetail"
+    />
+  </div>
 </template>
 
 <script>
-  import VxeUI from "vxe-pc-ui";
-  
-  import { authMixin } from "@/mixin/authMixin"
-  import { uploadSize } from "@/settings";
-  import { deepCopy } from "@/utils";
-  import { download } from "@/utils/downloadRequest";
-  import { destroy, index, save } from "@/api/batch/batch";
-  import AddBatch from "./components/AddBatch.vue";
-  import ShowBatch from "./components/ShowBatch.vue";
-  import axios from "axios";
-  import { getToken } from "@/utils/auth";
-  
-        import { index as aspirationIndex } from '@/api/aspiration/aspiration';
-      
-  export default {
-    name: "Batch",
-    mixins: [authMixin],
-    components: {
-        
-      AddBatch,
-      ShowBatch,
-    },
-    data() {
-      return {
-        uploadSize,
-        examineKey: 0,
-        isShowAdd: false,
-        isShowDetail: false,
+import VxeUI from "vxe-pc-ui";
+
+import { authMixin } from "@/mixin/authMixin";
+import { uploadSize } from "@/settings";
+import { deepCopy } from "@/utils";
+import { download } from "@/utils/downloadRequest";
+import { destroy, index, save } from "@/api/batch/batch";
+import AddBatch from "./components/AddBatch.vue";
+import ShowBatch from "./components/ShowBatch.vue";
+import axios from "axios";
+import { getToken } from "@/utils/auth";
 
-        loading: false,
-        tableHeight: 400,
-        select: {
-          page: 1,
-          page_size: 20,
-          keyword: '',
-          show_relation: [],
-          
-        },
-        total: 0,
-        allAlign: null,
-        tableData: [],
-        form: {
-          id: '',
-          
-            name: '',
-          
-            aspiration_id: '',
-          
-            sort: '',
-          
-        },
+import { index as aspirationIndex } from "@/api/aspiration/aspiration";
+
+export default {
+  name: "Batch",
+  mixins: [authMixin],
+  components: {
+    AddBatch,
+    ShowBatch,
+  },
+  data() {
+    return {
+      uploadSize,
+      examineKey: 0,
+      isShowAdd: false,
+      isShowDetail: false,
+
+      loading: false,
+      tableHeight: 400,
+      select: {
+        page: 1,
+        page_size: 20,
+        keyword: "",
+        show_relation: [],
+      },
+      total: 0,
+      allAlign: null,
+      tableData: [],
+      form: {
+        id: "",
+
+        name: "",
+
+        aspiration_id: "",
+
+        sort: "",
+      },
       validRules: {
-          
-          aspiration_id: [
-            
+        aspiration_id: [
           {
             required: true,
-            message: '归属总表'+'必填'
+            message: "归属总表" + "必填",
           },
-          
         ],
-          
       },
 
-        
-               aspiration: [],
-             
-      };
-    },
-    computed: {
-      isActiveStatus() {
-        return function (row) {
-          if (this.$refs["table"]) {
-            return this.$refs["table"].isEditByRow(row);
-          }
-        };
-      },
-      isHasAuth() {
-        return function (auth) {
-          return this.auths_auth_mixin.indexOf(auth) !== -1
+      aspiration: [],
+    };
+  },
+  computed: {
+    isActiveStatus() {
+      return function (row) {
+        if (this.$refs["table"]) {
+          return this.$refs["table"].isEditByRow(row);
         }
-      }
-    },
-    created() {
-      
-         this.getAspiration()
-         
-      this.getList();
+      };
     },
-    mounted() {
-      this.bindToolbar()
-      this.calcTableHeight()
+    isHasAuth() {
+      return function (auth) {
+        return this.auths_auth_mixin.indexOf(auth) !== -1;
+      };
     },
-    methods: {
-      exportMethod() {
-        this.$confirm("请选择导出方式", "提示", {
-          confirmButtonText: "全量导出",
-          cancelButtonText: "部分导出",
-          distinguishCancelAndClose: true
-        }).then(_ => {
-          download('/api/admin/school/index', 'get', {
+  },
+  created() {
+    this.getAspiration();
+
+    this.getList();
+  },
+  mounted() {
+    this.bindToolbar();
+    this.calcTableHeight();
+  },
+  methods: {
+    exportMethod() {
+      this.$confirm("请选择导出方式", "提示", {
+        confirmButtonText: "全量导出",
+        cancelButtonText: "部分导出",
+        distinguishCancelAndClose: true,
+      })
+        .then((_) => {
+          download("/api/admin/school/index", "get", {
             ...this.select,
             page: 1,
             page_size: 9999,
             is_export: 1,
-            export_fields: Object.keys(this.form)
-          })
-        }).catch(action => {
-          if (action === 'cancel' && this.$refs['table']) {
-            this.$refs['table'].openExport()
+            export_fields: Object.keys(this.form),
+          });
+        })
+        .catch((action) => {
+          if (action === "cancel" && this.$refs["table"]) {
+            this.$refs["table"].openExport();
           }
         });
-      },
-      calcTableHeight() {
-        let clientHeight = document.documentElement.clientHeight;
-        let cardTitle = document.querySelector(".el-card__header")?.getBoundingClientRect()?.height;
-        let search = document.querySelector(".vxe-toolbar")?.getBoundingClientRect()?.height;
-        let paginationHeight = (document.querySelector(".el-pagination")?.getBoundingClientRect()?.height ?? 0) + 10; //分页的高度
-        let topHeight = 50; //页面 头部
-        let padding = 80;
-        let margin = 20;
-        this.tableHeight =
-          clientHeight - cardTitle - search - paginationHeight - topHeight - padding - margin;
-      },
-      contextMenuClickEvent ({ menu, row, column }) {
-        switch (menu.code) {
-          case 'copy':
-            // 示例
-            if (row && column) {
-              if (VxeUI.clipboard.copy(row[column.field])) {
-                this.$message.success('已复制到剪贴板！')
-              }
-            }
-            break
-          case 'remove':
-            if (row && column) {
-              this.destroyRowEvent(row)
+    },
+    calcTableHeight() {
+      let clientHeight = document.documentElement.clientHeight;
+      let cardTitle = document
+        .querySelector(".el-card__header")
+        ?.getBoundingClientRect()?.height;
+      let search = document
+        .querySelector(".vxe-toolbar")
+        ?.getBoundingClientRect()?.height;
+      let paginationHeight =
+        (document.querySelector(".el-pagination")?.getBoundingClientRect()
+          ?.height ?? 0) + 10; //分页的高度
+      let topHeight = 50; //页面 头部
+      let padding = 80;
+      let margin = 20;
+      this.tableHeight =
+        clientHeight -
+        cardTitle -
+        search -
+        paginationHeight -
+        topHeight -
+        padding -
+        margin;
+    },
+    contextMenuClickEvent({ menu, row, column }) {
+      switch (menu.code) {
+        case "copy":
+          // 示例
+          if (row && column) {
+            if (VxeUI.clipboard.copy(row[column.field])) {
+              this.$message.success("已复制到剪贴板！");
             }
-          default:
-        }
-      },
-      async detail (row) {
-        await this.$refs["ShowBatch"].getDetail(row.id)
-        this.isShowDetail = true
-      },
+          }
+          break;
+        case "remove":
+          if (row && column) {
+            this.destroyRowEvent(row);
+          }
+        default:
+      }
+    },
+    async detail(row) {
+      await this.$refs["ShowBatch"].getDetail(row.id);
+      this.isShowDetail = true;
+    },
 
-      
-           async getAspiration() {
-             try {
-               const res = await aspirationIndex({
-                 page: 1,
-                 page_size: 999,
-                 
-               }, false)
-               this.aspiration = res.data
-             } catch(err) {
-               console.error(err)
-             }
-           },
-         
+    async getAspiration() {
+      try {
+        const res = await aspirationIndex(
+          {
+            page: 1,
+            page_size: 999,
+          },
+          false
+        );
+        this.aspiration = res.data;
+      } catch (err) {
+        console.error(err);
+      }
+    },
 
-      uploadMethod(file) {
-        const formData = new FormData()
-        formData.append('file', file)
-        window.$_uploading = true
-        return axios.post(process.env.VUE_APP_UPLOAD_API, formData, {
+    uploadMethod(file) {
+      const formData = new FormData();
+      formData.append("file", file);
+      window.$_uploading = true;
+      return axios
+        .post(process.env.VUE_APP_UPLOAD_API, formData, {
           headers: {
             Authorization: `Bearer ${getToken()}`,
-          }
-        }).then((response) => {
-          window.$_uploading = false
+          },
+        })
+        .then((response) => {
+          window.$_uploading = false;
           if (response.status === 200 && !response.data.code) {
             return {
               response: response.data,
               name: response.data.original_name,
-              url: response.data.url
-            }
+              url: response.data.url,
+            };
           } else {
-            this.$message.error("上传失败")
+            this.$message.error("上传失败");
           }
-        }).catch(_ => {
-          window.$_uploading = false
         })
-      },
-      bindToolbar() {
-        this.$nextTick(() => {
-          if (this.$refs["table"] && this.$refs["toolbar"]) {
-            this.$refs["table"].connect(this.$refs["toolbar"]);
-          }
+        .catch((_) => {
+          window.$_uploading = false;
         });
-      },
-
-      editRowEvent(row) {
-        if (this.$refs["table"]) {
-          this.$refs["table"].setEditRow(row);
-        }
-      },
-      cancelRowEvent(row) {
-        if (this.$refs["table"]) {
-          this.$refs["table"].clearEdit().then(() => {
-            // 还原行数据
-            this.$refs["table"].revertData(row);
-          });
+    },
+    bindToolbar() {
+      this.$nextTick(() => {
+        if (this.$refs["table"] && this.$refs["toolbar"]) {
+          this.$refs["table"].connect(this.$refs["toolbar"]);
         }
-      },
+      });
+    },
 
-      async getList() {
-        this.loading = true;
-        try {
-          const res = await index(this.select, false);
-          this.tableData = res.data;
-          this.total = res.total;
-          this.loading = false;
-        } catch (err) {
-          console.error(err);
-          this.loading = false;
-        }
-      },
+    editRowEvent(row) {
+      if (this.$refs["table"]) {
+        this.$refs["table"].setEditRow(row);
+      }
+    },
+    cancelRowEvent(row) {
+      if (this.$refs["table"]) {
+        this.$refs["table"].clearEdit().then(() => {
+          // 还原行数据
+          this.$refs["table"].revertData(row);
+        });
+      }
+    },
 
-      async saveRowEvent(row) {
-        if (window.$_uploading) {
-          this.$message.warning("文件正在上传中")
-          return
+    async getList() {
+      this.loading = true;
+      try {
+        const res = await index(this.select, false);
+        this.tableData = res.data;
+        this.total = res.total;
+        this.loading = false;
+      } catch (err) {
+        console.error(err);
+        this.loading = false;
+      }
+    },
+
+    async saveRowEvent(row) {
+      if (window.$_uploading) {
+        this.$message.warning("文件正在上传中");
+        return;
+      }
+      try {
+        const errMap = await this.$refs["table"].validate();
+        if (errMap) {
+          throw new Error(errMap);
         }
-        try {
-          const errMap = await this.$refs["table"].validate();
-          if (errMap) {
-            throw new Error(errMap);
-          }
-          await this.$confirm("确认保存？", "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "取消",
-          });
-          await this.$refs["table"].clearEdit();
-          let form = deepCopy(this.form);
-          for (const key in form) {
-            form[key] = row[key];
-          }
-          
-          this.loading = true;
-          await save(form, false);
-          await this.getList();
-          this.loading = false;
-        } catch (err) {
-          this.loading = false;
+        await this.$confirm("确认保存？", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+        });
+        await this.$refs["table"].clearEdit();
+        let form = deepCopy(this.form);
+        for (const key in form) {
+          form[key] = row[key];
         }
-      },
-      async destroyRowEvent(row) {
-        try {
-          await this.$confirm("确认删除？", "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "取消",
-          });
-          this.loading = true;
-          if (row.id) {
-            await destroy({
+
+        this.loading = true;
+        await save(form, false);
+        await this.getList();
+        this.loading = false;
+      } catch (err) {
+        this.loading = false;
+      }
+    },
+    async destroyRowEvent(row) {
+      try {
+        await this.$confirm("确认删除？", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+        });
+        this.loading = true;
+        if (row.id) {
+          await destroy(
+            {
               id: row.id,
-            },false);
-            await this.getList();
-          } else {
-            console.log(row);
-            this.tableData.splice(
-              this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
-              1
-            );
-          }
-          this.loading = false;
-        } catch (err) {
-          this.loading = false;
+            },
+            false
+          );
+          await this.getList();
+        } else {
+          console.log(row);
+          this.tableData.splice(
+            this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
+            1
+          );
         }
-      },
-
+        this.loading = false;
+      } catch (err) {
+        this.loading = false;
+      }
     },
-  };
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  ::v-deep .el-card__header {
-    padding: 6px 20px;
-  }
-  ::v-deep .el-tag + .el-tag {
-    margin-left: 4px;
-  }
+::v-deep .el-card__header {
+  padding: 6px 20px;
+}
+::v-deep .el-tag + .el-tag {
+  margin-left: 4px;
+}
 </style>
diff --git a/src/views/Batch/components/AddBatch.vue b/src/views/Batch/components/AddBatch.vue
index 1e06c66..e86f286 100644
--- a/src/views/Batch/components/AddBatch.vue
+++ b/src/views/Batch/components/AddBatch.vue
@@ -1,65 +1,94 @@
-
 <template>
-    <div>
-        <el-drawer
-                :title="$route.meta.title"
-                direction="rtl"
-                size="68%"
-                :visible.sync="visible"
-                append-to-body
-                :before-close="handleClose"
-                @close="$emit('update:isShow',false)">
-            <section class="drawer-container">
-                <el-form class="drawer-container__form" ref="elForm" :model="form" :rules="rules" label-position="top" label-width="120px" size="small">
-                    <div class="form-layout">
-                        
-                                 <el-form-item label="名称" prop="name">
-                                   <el-input v-model="form['name']" clearable placeholder="请填写名称" style="width: 100%;"></el-input>
-                                 </el-form-item>
-                               
-                                   <el-form-item label="归属总表" prop="aspiration_id" clearable>
-                                     <el-select v-model="form['aspiration_id']" clearable placeholder="请填写归属总表"  style="width: 100%;">
-                                       <el-option v-for="(option, optionIndex) in aspiration" :key="optionIndex" :label="option['name']" :value="option['id']"></el-option>
-                                     </el-select>
-                                   </el-form-item>
-                               
-                                    <el-form-item label="排序" prop="sort">
-                                      <el-input-number v-model="form['sort']" clearable placeholder="请填写排序" :precision="2" controls-position="right" style="width: 100%;"></el-input-number>
-                                    </el-form-item>
-                               
-                    </div>
-                </el-form>
+  <div>
+    <el-drawer
+      :title="$route.meta.title"
+      direction="rtl"
+      size="68%"
+      :visible.sync="visible"
+      append-to-body
+      :before-close="handleClose"
+      @close="$emit('update:isShow', false)"
+    >
+      <section class="drawer-container">
+        <el-form
+          class="drawer-container__form"
+          ref="elForm"
+          :model="form"
+          :rules="rules"
+          label-position="top"
+          label-width="120px"
+          size="small"
+        >
+          <div class="form-layout">
+            <el-form-item label="名称" prop="name">
+              <el-input
+                v-model="form['name']"
+                clearable
+                placeholder="请填写名称"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="归属总表" prop="aspiration_id" clearable>
+              <el-select
+                v-model="form['aspiration_id']"
+                clearable
+                placeholder="请填写归属总表"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(option, optionIndex) in aspiration"
+                  :key="optionIndex"
+                  :label="option['name']"
+                  :value="option['id']"
+                ></el-option>
+              </el-select>
+            </el-form-item>
 
-                <div class="drawer-container__footer">
-                    <el-button @click="reset">重 置</el-button>
-                    <el-button type="primary" @click="submit" :loading="loading">{{ loading ? '提交中 ...' : '确 定' }}</el-button>
-                </div>
-            </section>
-        </el-drawer>
-    </div>
+            <el-form-item label="排序" prop="sort">
+              <el-input-number
+                v-model="form['sort']"
+                clearable
+                placeholder="请填写排序"
+                :precision="2"
+                controls-position="right"
+                style="width: 100%"
+              ></el-input-number>
+            </el-form-item>
+          </div>
+        </el-form>
+
+        <div class="drawer-container__footer">
+          <el-button @click="reset">重 置</el-button>
+          <el-button type="primary" @click="submit" :loading="loading">{{
+            loading ? "提交中 ..." : "确 定"
+          }}</el-button>
+        </div>
+      </section>
+    </el-drawer>
+  </div>
 </template>
 
 <script>
-  import { save, show } from "@/api/batch/batch";
-  import axios from "axios";
-  import { getToken } from "@/utils/auth";
-  import { uploadSize } from "@/settings";
-  import { formatFileSize } from "@/utils";
+import { save, show } from "@/api/batch/batch";
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import { uploadSize } from "@/settings";
+import { formatFileSize } from "@/utils";
 
-  export default {
+export default {
   name: "BatchDrawer",
   props: {
     isShow: {
       type: Boolean,
       default: false,
-      required: true
+      required: true,
+    },
+
+    aspiration: {
+      type: Array,
+      default: () => [],
     },
-    
-           aspiration : {
-             type: Array,
-             default: () => []
-           },
-         
   },
   data() {
     return {
@@ -68,34 +97,28 @@
       loading: false,
       visible: false,
       form: {
-        
-          name: '',
-        
-          aspiration_id: '',
-        
-          sort: '',
-        
+        name: "",
+
+        aspiration_id: "",
+
+        sort: "",
       },
       rules: {
-          
-          aspiration_id: [
-              
+        aspiration_id: [
           {
             required: true,
-            message: '归属总表'+'必填'
+            message: "归属总表" + "必填",
           },
-              
         ],
-          
       },
-    }
+    };
   },
   watch: {
     isShow(newVal) {
-      this.visible = newVal
+      this.visible = newVal;
     },
     visible(newVal) {
-      this.$emit('update:isShow', newVal)
+      this.$emit("update:isShow", newVal);
     },
   },
   methods: {
@@ -107,23 +130,23 @@
         });
         return false;
       }
-      window.$_uploading = true
+      window.$_uploading = true;
     },
     uploadSuccess(response, file, fileList, fieldName) {
-      window.$_uploading = false
+      window.$_uploading = false;
       fileList.forEach((file) => {
         if (file.response?.data && !file.response?.code) {
           file.response = file.response.data;
         }
       });
-      this.form[fieldName] = fileList
+      this.form[fieldName] = fileList;
     },
     uploadRemove(file, fileList, fieldName) {
-      this.form[fieldName] = fileList
+      this.form[fieldName] = fileList;
     },
     uploadError(err, file, fileList, fieldName) {
-      window.$_uploading = false
-      this.form[fieldName] = fileList
+      window.$_uploading = false;
+      this.form[fieldName] = fileList;
       this.$message({
         type: "warning",
         message: err,
@@ -132,49 +155,47 @@
     formatFileSize,
     getToken,
     handleClose(done) {
-      this.$confirm('确定关闭窗口？')
-        .then(_ => {
+      this.$confirm("确定关闭窗口？")
+        .then((_) => {
           done();
         })
-        .catch(_ => {});
+        .catch((_) => {});
     },
 
     reset() {
       this.form = {
-          
-          name: '',
-          
-          aspiration_id: '',
-          
-          sort: '',
-          
-      }
-      this.$refs['elForm'].resetFields()
+        name: "",
+
+        aspiration_id: "",
+
+        sort: "",
+      };
+      this.$refs["elForm"].resetFields();
     },
     submit() {
       if (window.$_uploading) {
-        this.$message.warning("文件正在上传中")
-        return
+        this.$message.warning("文件正在上传中");
+        return;
       }
-      
-      this.$refs['elForm'].validate(async valid => {
+
+      this.$refs["elForm"].validate(async (valid) => {
         if (valid) {
-          this.loading = true
+          this.loading = true;
           try {
-            await save(this.form)
-            this.$message.success('新增成功')
-            this.$emit('refresh')
-            this.$emit('update:isShow', false)
-            this.loading = false
-            this.reset()
+            await save(this.form);
+            this.$message.success("新增成功");
+            this.$emit("refresh");
+            this.$emit("update:isShow", false);
+            this.loading = false;
+            this.reset();
           } catch (err) {
-            this.loading = false
+            this.loading = false;
           }
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/Batch/components/ShowBatch.vue b/src/views/Batch/components/ShowBatch.vue
index e7fb3d7..a5d41a2 100644
--- a/src/views/Batch/components/ShowBatch.vue
+++ b/src/views/Batch/components/ShowBatch.vue
@@ -1,109 +1,122 @@
-
 <template>
-    <div>
-        <el-drawer
-                :title="$route.meta.title"
-                direction="rtl"
-                size="68%"
-                :visible.sync="visible"
-                append-to-body
-                @close="$emit('update:isShow',false)">
-            <section class="drawer-container">
-                <el-descriptions class="drawer-container__desc" size="small" border ref="elDesc" :column="2" direction="vertical" :labelStyle="{ 'font-weight': '500', 'font-size': '15px' }">
-                    
-                    <el-descriptions-item label="名称">
-                        {{ form['name'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="归属总表">
-                        {{ aspiration.find(i => i['id'] === form['aspiration_id']) ? aspiration.find(i => i['id'] === form['aspiration_id'])['name'] : '' }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="排序">
-                        {{ typeof form['sort'] === 'number' ? form['sort'].toFixed(2) : form['sort'] }}
-                    </el-descriptions-item>
-                    
-                </el-descriptions>
-            </section>
-        </el-drawer>
-    </div>
+  <div>
+    <el-drawer
+      :title="$route.meta.title"
+      direction="rtl"
+      size="68%"
+      :visible.sync="visible"
+      append-to-body
+      @close="$emit('update:isShow', false)"
+    >
+      <section class="drawer-container">
+        <el-descriptions
+          class="drawer-container__desc"
+          size="small"
+          border
+          ref="elDesc"
+          :column="2"
+          direction="vertical"
+          :labelStyle="{ 'font-weight': '500', 'font-size': '15px' }"
+        >
+          <el-descriptions-item label="名称">
+            {{ form["name"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="归属总表">
+            {{
+              aspiration.find((i) => i["id"] === form["aspiration_id"])
+                ? aspiration.find((i) => i["id"] === form["aspiration_id"])[
+                    "name"
+                  ]
+                : ""
+            }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="排序">
+            {{
+              typeof form["sort"] === "number"
+                ? form["sort"].toFixed(2)
+                : form["sort"]
+            }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </section>
+    </el-drawer>
+  </div>
 </template>
 
 <script>
-  import { show } from "@/api/batch/batch";
+import { show } from "@/api/batch/batch";
 
-  export default {
-    name: "BatchShow",
-    props: {
-      isShow: {
-        type: Boolean,
-        default: false,
-        required: true
-      },
-  
-  aspiration : {
-    type: Array,
-  default: () => []
-  },
-  
+export default {
+  name: "BatchShow",
+  props: {
+    isShow: {
+      type: Boolean,
+      default: false,
+      required: true,
+    },
+
+    aspiration: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
       loading: false,
       visible: false,
       form: {
-      
-      name: '',
-      
-      aspiration_id: '',
-      
-      sort: '',
-      
-  },
-  }
+        name: "",
+
+        aspiration_id: "",
+
+        sort: "",
+      },
+    };
   },
   watch: {
     isShow(newVal) {
-      this.visible = newVal
+      this.visible = newVal;
     },
     visible(newVal) {
-      this.$emit('update:isShow', newVal)
+      this.$emit("update:isShow", newVal);
     },
   },
   methods: {
     async getDetail(id) {
       try {
         const detail = await show({
-          id
-        })
+          id,
+        });
         for (let key in this.form) {
           if (detail.hasOwnProperty(key)) {
-            this.form[key] = detail[key]
+            this.form[key] = detail[key];
           }
         }
       } catch (err) {
-        console.error(err)
+        console.error(err);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  .span2 {
-    grid-column: span 2;
-  }
-  ::v-deep .el-form-item > * {
-    max-width: 100%;
-  }
-  .drawer-container {
-    height: 100%;
-    padding: 20px;
-    display: flex;
-    flex-direction: column;
+.span2 {
+  grid-column: span 2;
+}
+::v-deep .el-form-item > * {
+  max-width: 100%;
+}
+.drawer-container {
+  height: 100%;
+  padding: 20px;
+  display: flex;
+  flex-direction: column;
 
-    & > * {
-      flex: 1;
-    }
+  & > * {
+    flex: 1;
   }
+}
 </style>
diff --git a/src/views/BatchSub/BatchSub.vue b/src/views/BatchSub/BatchSub.vue
index d99aa81..51fed46 100644
--- a/src/views/BatchSub/BatchSub.vue
+++ b/src/views/BatchSub/BatchSub.vue
@@ -1,502 +1,539 @@
-
 <template>
-    <div>
-        <el-card shadow="never" style="margin-top: 20px;">
-            <template #header>
-                <slot name="header">
-                    <vxe-toolbar :print="isHasAuth('print')" custom ref="toolbar">
-                        <template #toolSuffix>
-                            <vxe-button style="margin-right: 10px;" v-if="isHasAuth('export')" icon="vxe-icon-download" circle @click="exportMethod"></vxe-button>
-                        </template>
-                        <template #buttons>
-                            <el-button
-                                    v-if="isHasAuth('create')"
-                                    icon="el-icon-plus"
-                                    type="primary"
-                                    size="small"
-                                    @click="isShowAdd = true"
-                            >新增</el-button
-                            >
-                            <el-button
-                                    v-if="isHasAuth('search')"
-                                    icon="el-icon-search"
-                                    type="primary"
-                                    plain
-                                    size="small"
-                                    @click="getList"
-                            >搜索</el-button
-                            >
-                        </template>
-                    </vxe-toolbar>
-                </slot>
+  <div>
+    <el-card shadow="never" style="margin-top: 20px">
+      <template #header>
+        <slot name="header">
+          <vxe-toolbar :print="isHasAuth('print')" custom ref="toolbar">
+            <template #toolSuffix>
+              <vxe-button
+                style="margin-right: 10px"
+                v-if="isHasAuth('export')"
+                icon="vxe-icon-download"
+                circle
+                @click="exportMethod"
+              ></vxe-button>
+            </template>
+            <template #buttons>
+              <el-button
+                v-if="isHasAuth('create')"
+                icon="el-icon-plus"
+                type="primary"
+                size="small"
+                @click="isShowAdd = true"
+                >新增</el-button
+              >
+              <el-button
+                v-if="isHasAuth('search')"
+                icon="el-icon-search"
+                type="primary"
+                plain
+                size="small"
+                @click="getList"
+                >搜索</el-button
+              >
             </template>
+          </vxe-toolbar>
+        </slot>
+      </template>
 
-            <vxe-table
-                    ref="table"
-                    stripe
-                    style="margin-top: 10px"
-                    :loading="loading"
-                    :height="tableHeight"
-                    keep-source
-                    show-overflow
-                    :menu-config="{
-                      className: 'my-menus',
-                      body: {
-                        options: [
-                          [
-                            { code: 'copy', name: '复制', prefixConfig: { icon: 'vxe-icon-copy' }, suffixConfig: { content: 'Ctrl+C' } },
-                            { code: 'remove', name: '删除', prefixConfig: { icon: 'vxe-icon-delete-fill', className: 'color-red' } }
-                          ],
-                        ]
-                      }
-                    }"
-                    @menu-click="contextMenuClickEvent"
-                    :row-config="{ isCurrent: true, isHover: true }"
-                    :column-config="{ resizable: true }"
-                    :export-config="{}"
-                    :edit-rules="validRules"
-                    :edit-config="{
+      <vxe-table
+        ref="table"
+        stripe
+        style="margin-top: 10px"
+        :loading="loading"
+        :height="tableHeight"
+        keep-source
+        show-overflow
+        :menu-config="{
+          className: 'my-menus',
+          body: {
+            options: [
+              [
+                {
+                  code: 'copy',
+                  name: '复制',
+                  prefixConfig: { icon: 'vxe-icon-copy' },
+                  suffixConfig: { content: 'Ctrl+C' },
+                },
+                {
+                  code: 'remove',
+                  name: '删除',
+                  prefixConfig: {
+                    icon: 'vxe-icon-delete-fill',
+                    className: 'color-red',
+                  },
+                },
+              ],
+            ],
+          },
+        }"
+        @menu-click="contextMenuClickEvent"
+        :row-config="{ isCurrent: true, isHover: true }"
+        :column-config="{ resizable: true }"
+        :export-config="{}"
+        :edit-rules="validRules"
+        :edit-config="{
           trigger: 'manual',
           mode: 'row',
           showStatus: true,
           isHover: true,
           autoClear: false,
         }"
-                    
-                    :align="allAlign"
-                    :data="tableData"
-            >
-                <vxe-column type="checkbox" width="50" align="center" />
-                <vxe-column type="seq" width="58" align="center"  />
-                
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="name"
-                                width="160"
-                                title="名称"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                field="batch_id"
-                                width="180"
-                                title="归属批次"
-                                :edit-render="{ name: 'VxeSelect', options: batch, props: { multiple: false }, optionProps: { value: 'id', label: 'name' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                align="right"
-                                field="sort"
-                                width="160"
-                                title="排序"
-                                :edit-render="{ name: 'input', attrs: { type: 'number' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                field="show_school_obey"
-                                width="180"
-                                title="是否显示学校服从"
-                                :edit-render="{ name: 'VxeSelect', options: [{'value':1,'label':'是'},{'value':0,'label':'否'}], props: { multiple: false }, optionProps: { value: 'value', label: 'label' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                field="show_specialty_obey"
-                                width="180"
-                                title="是否显示专业服从"
-                                :edit-render="{ name: 'VxeSelect', options: [{'value':1,'label':'是'},{'value':0,'label':'否'}], props: { multiple: false }, optionProps: { value: 'value', label: 'label' } }"
-                        />
-                        
-                <vxe-column field="operate" header-align="center" title="操作" min-width="220" fixed="right">
-                    <template #default="{ row }">
-                        <template v-if="isActiveStatus(row)">
-                            <el-button size="small" type="primary" @click="saveRowEvent(row)"
-                            >保存</el-button
-                            >
-                            <el-button
-                                    size="small"
-                                    type="primary"
-                                    plain
-                                    @click="cancelRowEvent(row)"
-                            >取消</el-button
-                            >
-                        </template>
-                        <template v-else>
-                            <el-button v-if="isHasAuth('detail')" size="small" type="primary" plain @click="detail(row)"
-                            >查看</el-button
-                            >
-                            <el-button v-if="isHasAuth('edit')" size="small" type="warning" @click="editRowEvent(row)"
-                            >编辑</el-button
-                            >
-                            <el-button
-                                    v-if="isHasAuth('delete')"
-                                    size="small"
-                                    type="danger"
-                                    @click="destroyRowEvent(row)"
-                            >删除</el-button
-                            >
-                        </template>
-                    </template>
-                </vxe-column>
-            </vxe-table>
+        :align="allAlign"
+        :data="tableData"
+      >
+        <vxe-column type="checkbox" width="50" align="center" />
+        <vxe-column type="seq" width="58" align="center" />
+
+        <vxe-column
+          header-align="center"
+          field="name"
+          width="160"
+          title="名称"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          align="center"
+          field="batch_id"
+          width="180"
+          title="归属批次"
+          :edit-render="{
+            name: 'VxeSelect',
+            options: batch,
+            props: { multiple: false },
+            optionProps: { value: 'id', label: 'name' },
+          }"
+        />
+
+        <vxe-column
+          header-align="center"
+          align="right"
+          field="sort"
+          width="160"
+          title="排序"
+          :edit-render="{ name: 'input', attrs: { type: 'number' } }"
+        />
+
+        <vxe-column
+          align="center"
+          field="show_school_obey"
+          width="180"
+          title="是否显示学校服从"
+          :edit-render="{
+            name: 'VxeSelect',
+            options: [
+              { value: 1, label: '是' },
+              { value: 0, label: '否' },
+            ],
+            props: { multiple: false },
+            optionProps: { value: 'value', label: 'label' },
+          }"
+        />
+
+        <vxe-column
+          align="center"
+          field="show_specialty_obey"
+          width="180"
+          title="是否显示专业服从"
+          :edit-render="{
+            name: 'VxeSelect',
+            options: [
+              { value: 1, label: '是' },
+              { value: 0, label: '否' },
+            ],
+            props: { multiple: false },
+            optionProps: { value: 'value', label: 'label' },
+          }"
+        />
 
-            
-                <el-pagination
-                        style="margin-top: 10px;display: flex;justify-content: flex-end;"
-                        :current-page.sync="select.page"
-                        :page-sizes="[20, 30, 40, 50]"
-                        :page-size.sync="select.page_size"
-                        layout="total, sizes, prev, pager, next, jumper"
-                        :total="total"
-                        @size-change="
+        <vxe-column
+          field="operate"
+          header-align="center"
+          title="操作"
+          min-width="220"
+          fixed="right"
+        >
+          <template #default="{ row }">
+            <template v-if="isActiveStatus(row)">
+              <el-button size="small" type="primary" @click="saveRowEvent(row)"
+                >保存</el-button
+              >
+              <el-button
+                size="small"
+                type="primary"
+                plain
+                @click="cancelRowEvent(row)"
+                >取消</el-button
+              >
+            </template>
+            <template v-else>
+              <el-button
+                v-if="isHasAuth('detail')"
+                size="small"
+                type="primary"
+                plain
+                @click="detail(row)"
+                >查看</el-button
+              >
+              <el-button
+                v-if="isHasAuth('edit')"
+                size="small"
+                type="warning"
+                @click="editRowEvent(row)"
+                >编辑</el-button
+              >
+              <el-button
+                v-if="isHasAuth('delete')"
+                size="small"
+                type="danger"
+                @click="destroyRowEvent(row)"
+                >删除</el-button
+              >
+            </template>
+          </template>
+        </vxe-column>
+      </vxe-table>
+
+      <el-pagination
+        style="margin-top: 10px; display: flex; justify-content: flex-end"
+        :current-page.sync="select.page"
+        :page-sizes="[20, 30, 40, 50]"
+        :page-size.sync="select.page_size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        @size-change="
           (e) => {
             select.page_size = e;
             select.page = 1;
             getList();
           }
         "
-                        @current-change="
+        @current-change="
           (e) => {
             select.page = e;
             getList();
           }
         "
-                />
-            
-        </el-card>
+      />
+    </el-card>
 
-        <AddBatchSub
-                ref="AddBatchSub"
-                
-                    :batch="batch"
-                  
-                :is-show.sync="isShowAdd"
-                @refresh="getList"
-        />
-        <ShowBatchSub
-                ref="ShowBatchSub"
-        
-                :batch="batch"
-                
-                :is-show.sync="isShowDetail"
-        />
-        
-    </div>
+    <AddBatchSub
+      ref="AddBatchSub"
+      :batch="batch"
+      :is-show.sync="isShowAdd"
+      @refresh="getList"
+    />
+    <ShowBatchSub
+      ref="ShowBatchSub"
+      :batch="batch"
+      :is-show.sync="isShowDetail"
+    />
+  </div>
 </template>
 
 <script>
-  import VxeUI from "vxe-pc-ui";
-  
-  import { authMixin } from "@/mixin/authMixin"
-  import { uploadSize } from "@/settings";
-  import { deepCopy } from "@/utils";
-  import { download } from "@/utils/downloadRequest";
-  import { destroy, index, save } from "@/api/batch-sub/batch-sub";
-  import AddBatchSub from "./components/AddBatchSub.vue";
-  import ShowBatchSub from "./components/ShowBatchSub.vue";
-  import axios from "axios";
-  import { getToken } from "@/utils/auth";
-  
-        import { index as batchIndex } from '@/api/batch/batch';
-      
-  export default {
-    name: "BatchSub",
-    mixins: [authMixin],
-    components: {
-        
-      AddBatchSub,
-      ShowBatchSub,
-    },
-    data() {
-      return {
-        uploadSize,
-        examineKey: 0,
-        isShowAdd: false,
-        isShowDetail: false,
+import VxeUI from "vxe-pc-ui";
+
+import { authMixin } from "@/mixin/authMixin";
+import { uploadSize } from "@/settings";
+import { deepCopy } from "@/utils";
+import { download } from "@/utils/downloadRequest";
+import { destroy, index, save } from "@/api/batch-sub/batch-sub";
+import AddBatchSub from "./components/AddBatchSub.vue";
+import ShowBatchSub from "./components/ShowBatchSub.vue";
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+
+import { index as batchIndex } from "@/api/batch/batch";
+
+export default {
+  name: "BatchSub",
+  mixins: [authMixin],
+  components: {
+    AddBatchSub,
+    ShowBatchSub,
+  },
+  data() {
+    return {
+      uploadSize,
+      examineKey: 0,
+      isShowAdd: false,
+      isShowDetail: false,
+
+      loading: false,
+      tableHeight: 400,
+      select: {
+        page: 1,
+        page_size: 20,
+        keyword: "",
+        show_relation: [],
+      },
+      total: 0,
+      allAlign: null,
+      tableData: [],
+      form: {
+        id: "",
+
+        name: "",
+
+        batch_id: "",
 
-        loading: false,
-        tableHeight: 400,
-        select: {
-          page: 1,
-          page_size: 20,
-          keyword: '',
-          show_relation: [],
-          
-        },
-        total: 0,
-        allAlign: null,
-        tableData: [],
-        form: {
-          id: '',
-          
-            name: '',
-          
-            batch_id: '',
-          
-            sort: '',
-          
-            show_school_obey: '',
-          
-            show_specialty_obey: '',
-          
-        },
+        sort: "",
+
+        show_school_obey: "",
+
+        show_specialty_obey: "",
+      },
       validRules: {
-          
-          name: [
-            
+        name: [
           {
             required: true,
-            message: '名称'+'必填'
+            message: "名称" + "必填",
           },
-          
         ],
-          
-          batch_id: [
-            
+
+        batch_id: [
           {
             required: true,
-            message: '归属批次'+'必填'
+            message: "归属批次" + "必填",
           },
-          
         ],
-          
       },
 
-        
-               batch: [],
-             
-      };
-    },
-    computed: {
-      isActiveStatus() {
-        return function (row) {
-          if (this.$refs["table"]) {
-            return this.$refs["table"].isEditByRow(row);
-          }
-        };
-      },
-      isHasAuth() {
-        return function (auth) {
-          return this.auths_auth_mixin.indexOf(auth) !== -1
+      batch: [],
+    };
+  },
+  computed: {
+    isActiveStatus() {
+      return function (row) {
+        if (this.$refs["table"]) {
+          return this.$refs["table"].isEditByRow(row);
         }
-      }
-    },
-    created() {
-      
-         this.getBatch()
-         
-      this.getList();
+      };
     },
-    mounted() {
-      this.bindToolbar()
-      this.calcTableHeight()
+    isHasAuth() {
+      return function (auth) {
+        return this.auths_auth_mixin.indexOf(auth) !== -1;
+      };
     },
-    methods: {
-      exportMethod() {
-        this.$confirm("请选择导出方式", "提示", {
-          confirmButtonText: "全量导出",
-          cancelButtonText: "部分导出",
-          distinguishCancelAndClose: true
-        }).then(_ => {
-          download('/api/admin/school/index', 'get', {
+  },
+  created() {
+    this.getBatch();
+
+    this.getList();
+  },
+  mounted() {
+    this.bindToolbar();
+    this.calcTableHeight();
+  },
+  methods: {
+    exportMethod() {
+      this.$confirm("请选择导出方式", "提示", {
+        confirmButtonText: "全量导出",
+        cancelButtonText: "部分导出",
+        distinguishCancelAndClose: true,
+      })
+        .then((_) => {
+          download("/api/admin/school/index", "get", {
             ...this.select,
             page: 1,
             page_size: 9999,
             is_export: 1,
-            export_fields: Object.keys(this.form)
-          })
-        }).catch(action => {
-          if (action === 'cancel' && this.$refs['table']) {
-            this.$refs['table'].openExport()
+            export_fields: Object.keys(this.form),
+          });
+        })
+        .catch((action) => {
+          if (action === "cancel" && this.$refs["table"]) {
+            this.$refs["table"].openExport();
           }
         });
-      },
-      calcTableHeight() {
-        let clientHeight = document.documentElement.clientHeight;
-        let cardTitle = document.querySelector(".el-card__header")?.getBoundingClientRect()?.height;
-        let search = document.querySelector(".vxe-toolbar")?.getBoundingClientRect()?.height;
-        let paginationHeight = (document.querySelector(".el-pagination")?.getBoundingClientRect()?.height ?? 0) + 10; //分页的高度
-        let topHeight = 50; //页面 头部
-        let padding = 80;
-        let margin = 20;
-        this.tableHeight =
-          clientHeight - cardTitle - search - paginationHeight - topHeight - padding - margin;
-      },
-      contextMenuClickEvent ({ menu, row, column }) {
-        switch (menu.code) {
-          case 'copy':
-            // 示例
-            if (row && column) {
-              if (VxeUI.clipboard.copy(row[column.field])) {
-                this.$message.success('已复制到剪贴板！')
-              }
-            }
-            break
-          case 'remove':
-            if (row && column) {
-              this.destroyRowEvent(row)
+    },
+    calcTableHeight() {
+      let clientHeight = document.documentElement.clientHeight;
+      let cardTitle = document
+        .querySelector(".el-card__header")
+        ?.getBoundingClientRect()?.height;
+      let search = document
+        .querySelector(".vxe-toolbar")
+        ?.getBoundingClientRect()?.height;
+      let paginationHeight =
+        (document.querySelector(".el-pagination")?.getBoundingClientRect()
+          ?.height ?? 0) + 10; //分页的高度
+      let topHeight = 50; //页面 头部
+      let padding = 80;
+      let margin = 20;
+      this.tableHeight =
+        clientHeight -
+        cardTitle -
+        search -
+        paginationHeight -
+        topHeight -
+        padding -
+        margin;
+    },
+    contextMenuClickEvent({ menu, row, column }) {
+      switch (menu.code) {
+        case "copy":
+          // 示例
+          if (row && column) {
+            if (VxeUI.clipboard.copy(row[column.field])) {
+              this.$message.success("已复制到剪贴板！");
             }
-          default:
-        }
-      },
-      async detail (row) {
-        await this.$refs["ShowBatchSub"].getDetail(row.id)
-        this.isShowDetail = true
-      },
+          }
+          break;
+        case "remove":
+          if (row && column) {
+            this.destroyRowEvent(row);
+          }
+        default:
+      }
+    },
+    async detail(row) {
+      await this.$refs["ShowBatchSub"].getDetail(row.id);
+      this.isShowDetail = true;
+    },
 
-      
-           async getBatch() {
-             try {
-               const res = await batchIndex({
-                 page: 1,
-                 page_size: 999,
-                 
-               }, false)
-               this.batch = res.data
-             } catch(err) {
-               console.error(err)
-             }
-           },
-         
+    async getBatch() {
+      try {
+        const res = await batchIndex(
+          {
+            page: 1,
+            page_size: 999,
+          },
+          false
+        );
+        this.batch = res.data;
+      } catch (err) {
+        console.error(err);
+      }
+    },
 
-      uploadMethod(file) {
-        const formData = new FormData()
-        formData.append('file', file)
-        window.$_uploading = true
-        return axios.post(process.env.VUE_APP_UPLOAD_API, formData, {
+    uploadMethod(file) {
+      const formData = new FormData();
+      formData.append("file", file);
+      window.$_uploading = true;
+      return axios
+        .post(process.env.VUE_APP_UPLOAD_API, formData, {
           headers: {
             Authorization: `Bearer ${getToken()}`,
-          }
-        }).then((response) => {
-          window.$_uploading = false
+          },
+        })
+        .then((response) => {
+          window.$_uploading = false;
           if (response.status === 200 && !response.data.code) {
             return {
               response: response.data,
               name: response.data.original_name,
-              url: response.data.url
-            }
+              url: response.data.url,
+            };
           } else {
-            this.$message.error("上传失败")
+            this.$message.error("上传失败");
           }
-        }).catch(_ => {
-          window.$_uploading = false
         })
-      },
-      bindToolbar() {
-        this.$nextTick(() => {
-          if (this.$refs["table"] && this.$refs["toolbar"]) {
-            this.$refs["table"].connect(this.$refs["toolbar"]);
-          }
+        .catch((_) => {
+          window.$_uploading = false;
         });
-      },
-
-      editRowEvent(row) {
-        if (this.$refs["table"]) {
-          this.$refs["table"].setEditRow(row);
-        }
-      },
-      cancelRowEvent(row) {
-        if (this.$refs["table"]) {
-          this.$refs["table"].clearEdit().then(() => {
-            // 还原行数据
-            this.$refs["table"].revertData(row);
-          });
+    },
+    bindToolbar() {
+      this.$nextTick(() => {
+        if (this.$refs["table"] && this.$refs["toolbar"]) {
+          this.$refs["table"].connect(this.$refs["toolbar"]);
         }
-      },
+      });
+    },
 
-      async getList() {
-        this.loading = true;
-        try {
-          const res = await index(this.select, false);
-          this.tableData = res.data;
-          this.total = res.total;
-          this.loading = false;
-        } catch (err) {
-          console.error(err);
-          this.loading = false;
-        }
-      },
+    editRowEvent(row) {
+      if (this.$refs["table"]) {
+        this.$refs["table"].setEditRow(row);
+      }
+    },
+    cancelRowEvent(row) {
+      if (this.$refs["table"]) {
+        this.$refs["table"].clearEdit().then(() => {
+          // 还原行数据
+          this.$refs["table"].revertData(row);
+        });
+      }
+    },
+
+    async getList() {
+      this.loading = true;
+      try {
+        const res = await index(this.select, false);
+        this.tableData = res.data;
+        this.total = res.total;
+        this.loading = false;
+      } catch (err) {
+        console.error(err);
+        this.loading = false;
+      }
+    },
 
-      async saveRowEvent(row) {
-        if (window.$_uploading) {
-          this.$message.warning("文件正在上传中")
-          return
+    async saveRowEvent(row) {
+      if (window.$_uploading) {
+        this.$message.warning("文件正在上传中");
+        return;
+      }
+      try {
+        const errMap = await this.$refs["table"].validate();
+        if (errMap) {
+          throw new Error(errMap);
         }
-        try {
-          const errMap = await this.$refs["table"].validate();
-          if (errMap) {
-            throw new Error(errMap);
-          }
-          await this.$confirm("确认保存？", "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "取消",
-          });
-          await this.$refs["table"].clearEdit();
-          let form = deepCopy(this.form);
-          for (const key in form) {
-            form[key] = row[key];
-          }
-          
-          this.loading = true;
-          await save(form, false);
-          await this.getList();
-          this.loading = false;
-        } catch (err) {
-          this.loading = false;
+        await this.$confirm("确认保存？", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+        });
+        await this.$refs["table"].clearEdit();
+        let form = deepCopy(this.form);
+        for (const key in form) {
+          form[key] = row[key];
         }
-      },
-      async destroyRowEvent(row) {
-        try {
-          await this.$confirm("确认删除？", "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "取消",
-          });
-          this.loading = true;
-          if (row.id) {
-            await destroy({
+
+        this.loading = true;
+        await save(form, false);
+        await this.getList();
+        this.loading = false;
+      } catch (err) {
+        this.loading = false;
+      }
+    },
+    async destroyRowEvent(row) {
+      try {
+        await this.$confirm("确认删除？", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+        });
+        this.loading = true;
+        if (row.id) {
+          await destroy(
+            {
               id: row.id,
-            },false);
-            await this.getList();
-          } else {
-            console.log(row);
-            this.tableData.splice(
-              this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
-              1
-            );
-          }
-          this.loading = false;
-        } catch (err) {
-          this.loading = false;
+            },
+            false
+          );
+          await this.getList();
+        } else {
+          console.log(row);
+          this.tableData.splice(
+            this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
+            1
+          );
         }
-      },
-
+        this.loading = false;
+      } catch (err) {
+        this.loading = false;
+      }
     },
-  };
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  ::v-deep .el-card__header {
-    padding: 6px 20px;
-  }
-  ::v-deep .el-tag + .el-tag {
-    margin-left: 4px;
-  }
+::v-deep .el-card__header {
+  padding: 6px 20px;
+}
+::v-deep .el-tag + .el-tag {
+  margin-left: 4px;
+}
 </style>
diff --git a/src/views/BatchSub/components/AddBatchSub.vue b/src/views/BatchSub/components/AddBatchSub.vue
index 3a359f5..fd4740c 100644
--- a/src/views/BatchSub/components/AddBatchSub.vue
+++ b/src/views/BatchSub/components/AddBatchSub.vue
@@ -1,77 +1,140 @@
-
 <template>
-    <div>
-        <el-drawer
-                :title="$route.meta.title"
-                direction="rtl"
-                size="68%"
-                :visible.sync="visible"
-                append-to-body
-                :before-close="handleClose"
-                @close="$emit('update:isShow',false)">
-            <section class="drawer-container">
-                <el-form class="drawer-container__form" ref="elForm" :model="form" :rules="rules" label-position="top" label-width="120px" size="small">
-                    <div class="form-layout">
-                        
-                                 <el-form-item label="名称" prop="name">
-                                   <el-input v-model="form['name']" clearable placeholder="请填写名称" style="width: 100%;"></el-input>
-                                 </el-form-item>
-                               
-                                   <el-form-item label="归属批次" prop="batch_id" clearable>
-                                     <el-select v-model="form['batch_id']" clearable placeholder="请填写归属批次"  style="width: 100%;">
-                                       <el-option v-for="(option, optionIndex) in batch" :key="optionIndex" :label="option['name']" :value="option['id']"></el-option>
-                                     </el-select>
-                                   </el-form-item>
-                               
-                                    <el-form-item label="排序" prop="sort">
-                                      <el-input-number v-model="form['sort']" clearable placeholder="请填写排序" :precision="2" controls-position="right" style="width: 100%;"></el-input-number>
-                                    </el-form-item>
-                               
-                                   <el-form-item label="是否显示学校服从" prop="show_school_obey" clearable>
-                                     <el-select v-model="form['show_school_obey']" clearable placeholder="请填写是否显示学校服从"  style="width: 100%;">
-                                       <el-option v-for="(option, optionIndex) in [{'value':1,'label':'是'},{'value':0,'label':'否'}]" :key="optionIndex" :label="option['label']" :value="option['value']"></el-option>
-                                     </el-select>
-                                   </el-form-item>
-                               
-                                   <el-form-item label="是否显示专业服从" prop="show_specialty_obey" clearable>
-                                     <el-select v-model="form['show_specialty_obey']" clearable placeholder="请填写是否显示专业服从"  style="width: 100%;">
-                                       <el-option v-for="(option, optionIndex) in [{'value':1,'label':'是'},{'value':0,'label':'否'}]" :key="optionIndex" :label="option['label']" :value="option['value']"></el-option>
-                                     </el-select>
-                                   </el-form-item>
-                               
-                    </div>
-                </el-form>
-
-                <div class="drawer-container__footer">
-                    <el-button @click="reset">重 置</el-button>
-                    <el-button type="primary" @click="submit" :loading="loading">{{ loading ? '提交中 ...' : '确 定' }}</el-button>
-                </div>
-            </section>
-        </el-drawer>
-    </div>
+  <div>
+    <el-drawer
+      :title="$route.meta.title"
+      direction="rtl"
+      size="68%"
+      :visible.sync="visible"
+      append-to-body
+      :before-close="handleClose"
+      @close="$emit('update:isShow', false)"
+    >
+      <section class="drawer-container">
+        <el-form
+          class="drawer-container__form"
+          ref="elForm"
+          :model="form"
+          :rules="rules"
+          label-position="top"
+          label-width="120px"
+          size="small"
+        >
+          <div class="form-layout">
+            <el-form-item label="名称" prop="name">
+              <el-input
+                v-model="form['name']"
+                clearable
+                placeholder="请填写名称"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="归属批次" prop="batch_id" clearable>
+              <el-select
+                v-model="form['batch_id']"
+                clearable
+                placeholder="请填写归属批次"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(option, optionIndex) in batch"
+                  :key="optionIndex"
+                  :label="option['name']"
+                  :value="option['id']"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="排序" prop="sort">
+              <el-input-number
+                v-model="form['sort']"
+                clearable
+                placeholder="请填写排序"
+                :precision="2"
+                controls-position="right"
+                style="width: 100%"
+              ></el-input-number>
+            </el-form-item>
+
+            <el-form-item
+              label="是否显示学校服从"
+              prop="show_school_obey"
+              clearable
+            >
+              <el-select
+                v-model="form['show_school_obey']"
+                clearable
+                placeholder="请填写是否显示学校服从"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(option, optionIndex) in [
+                    { value: 1, label: '是' },
+                    { value: 0, label: '否' },
+                  ]"
+                  :key="optionIndex"
+                  :label="option['label']"
+                  :value="option['value']"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item
+              label="是否显示专业服从"
+              prop="show_specialty_obey"
+              clearable
+            >
+              <el-select
+                v-model="form['show_specialty_obey']"
+                clearable
+                placeholder="请填写是否显示专业服从"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(option, optionIndex) in [
+                    { value: 1, label: '是' },
+                    { value: 0, label: '否' },
+                  ]"
+                  :key="optionIndex"
+                  :label="option['label']"
+                  :value="option['value']"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-form>
+
+        <div class="drawer-container__footer">
+          <el-button @click="reset">重 置</el-button>
+          <el-button type="primary" @click="submit" :loading="loading">{{
+            loading ? "提交中 ..." : "确 定"
+          }}</el-button>
+        </div>
+      </section>
+    </el-drawer>
+  </div>
 </template>
 
 <script>
-  import { save, show } from "@/api/batch-sub/batch-sub";
-  import axios from "axios";
-  import { getToken } from "@/utils/auth";
-  import { uploadSize } from "@/settings";
-  import { formatFileSize } from "@/utils";
+import { save, show } from "@/api/batch-sub/batch-sub";
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import { uploadSize } from "@/settings";
+import { formatFileSize } from "@/utils";
 
-  export default {
+export default {
   name: "BatchSubDrawer",
   props: {
     isShow: {
       type: Boolean,
       default: false,
-      required: true
+      required: true,
+    },
+
+    batch: {
+      type: Array,
+      default: () => [],
     },
-    
-           batch : {
-             type: Array,
-             default: () => []
-           },
-         
   },
   data() {
     return {
@@ -80,47 +143,39 @@
       loading: false,
       visible: false,
       form: {
-        
-          name: '',
-        
-          batch_id: '',
-        
-          sort: '',
-        
-          show_school_obey: '',
-        
-          show_specialty_obey: '',
-        
+        name: "",
+
+        batch_id: "",
+
+        sort: "",
+
+        show_school_obey: "",
+
+        show_specialty_obey: "",
       },
       rules: {
-          
-          name: [
-              
+        name: [
           {
             required: true,
-            message: '名称'+'必填'
+            message: "名称" + "必填",
           },
-              
         ],
-          
-          batch_id: [
-              
+
+        batch_id: [
           {
             required: true,
-            message: '归属批次'+'必填'
+            message: "归属批次" + "必填",
           },
-              
         ],
-          
       },
-    }
+    };
   },
   watch: {
     isShow(newVal) {
-      this.visible = newVal
+      this.visible = newVal;
     },
     visible(newVal) {
-      this.$emit('update:isShow', newVal)
+      this.$emit("update:isShow", newVal);
     },
   },
   methods: {
@@ -132,23 +187,23 @@
         });
         return false;
       }
-      window.$_uploading = true
+      window.$_uploading = true;
     },
     uploadSuccess(response, file, fileList, fieldName) {
-      window.$_uploading = false
+      window.$_uploading = false;
       fileList.forEach((file) => {
         if (file.response?.data && !file.response?.code) {
           file.response = file.response.data;
         }
       });
-      this.form[fieldName] = fileList
+      this.form[fieldName] = fileList;
     },
     uploadRemove(file, fileList, fieldName) {
-      this.form[fieldName] = fileList
+      this.form[fieldName] = fileList;
     },
     uploadError(err, file, fileList, fieldName) {
-      window.$_uploading = false
-      this.form[fieldName] = fileList
+      window.$_uploading = false;
+      this.form[fieldName] = fileList;
       this.$message({
         type: "warning",
         message: err,
@@ -157,53 +212,51 @@
     formatFileSize,
     getToken,
     handleClose(done) {
-      this.$confirm('确定关闭窗口？')
-        .then(_ => {
+      this.$confirm("确定关闭窗口？")
+        .then((_) => {
           done();
         })
-        .catch(_ => {});
+        .catch((_) => {});
     },
 
     reset() {
       this.form = {
-          
-          name: '',
-          
-          batch_id: '',
-          
-          sort: '',
-          
-          show_school_obey: '',
-          
-          show_specialty_obey: '',
-          
-      }
-      this.$refs['elForm'].resetFields()
+        name: "",
+
+        batch_id: "",
+
+        sort: "",
+
+        show_school_obey: "",
+
+        show_specialty_obey: "",
+      };
+      this.$refs["elForm"].resetFields();
     },
     submit() {
       if (window.$_uploading) {
-        this.$message.warning("文件正在上传中")
-        return
+        this.$message.warning("文件正在上传中");
+        return;
       }
-      
-      this.$refs['elForm'].validate(async valid => {
+
+      this.$refs["elForm"].validate(async (valid) => {
         if (valid) {
-          this.loading = true
+          this.loading = true;
           try {
-            await save(this.form)
-            this.$message.success('新增成功')
-            this.$emit('refresh')
-            this.$emit('update:isShow', false)
-            this.loading = false
-            this.reset()
+            await save(this.form);
+            this.$message.success("新增成功");
+            this.$emit("refresh");
+            this.$emit("update:isShow", false);
+            this.loading = false;
+            this.reset();
           } catch (err) {
-            this.loading = false
+            this.loading = false;
           }
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/BatchSub/components/ShowBatchSub.vue b/src/views/BatchSub/components/ShowBatchSub.vue
index 63fcd9d..f4a1572 100644
--- a/src/views/BatchSub/components/ShowBatchSub.vue
+++ b/src/views/BatchSub/components/ShowBatchSub.vue
@@ -1,121 +1,156 @@
-
 <template>
-    <div>
-        <el-drawer
-                :title="$route.meta.title"
-                direction="rtl"
-                size="68%"
-                :visible.sync="visible"
-                append-to-body
-                @close="$emit('update:isShow',false)">
-            <section class="drawer-container">
-                <el-descriptions class="drawer-container__desc" size="small" border ref="elDesc" :column="2" direction="vertical" :labelStyle="{ 'font-weight': '500', 'font-size': '15px' }">
-                    
-                    <el-descriptions-item label="名称">
-                        {{ form['name'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="归属批次">
-                        {{ batch.find(i => i['id'] === form['batch_id']) ? batch.find(i => i['id'] === form['batch_id'])['name'] : '' }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="排序">
-                        {{ typeof form['sort'] === 'number' ? form['sort'].toFixed(2) : form['sort'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="是否显示学校服从">
-                        {{ [{'value':1,'label':'是'},{'value':0,'label':'否'}].find(i => i['value'] === form['show_school_obey']) ? [{'value':1,'label':'是'},{'value':0,'label':'否'}].find(i => i['value'] === form['show_school_obey'])['label'] : '' }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="是否显示专业服从">
-                        {{ [{'value':1,'label':'是'},{'value':0,'label':'否'}].find(i => i['value'] === form['show_specialty_obey']) ? [{'value':1,'label':'是'},{'value':0,'label':'否'}].find(i => i['value'] === form['show_specialty_obey'])['label'] : '' }}
-                    </el-descriptions-item>
-                    
-                </el-descriptions>
-            </section>
-        </el-drawer>
-    </div>
+  <div>
+    <el-drawer
+      :title="$route.meta.title"
+      direction="rtl"
+      size="68%"
+      :visible.sync="visible"
+      append-to-body
+      @close="$emit('update:isShow', false)"
+    >
+      <section class="drawer-container">
+        <el-descriptions
+          class="drawer-container__desc"
+          size="small"
+          border
+          ref="elDesc"
+          :column="2"
+          direction="vertical"
+          :labelStyle="{ 'font-weight': '500', 'font-size': '15px' }"
+        >
+          <el-descriptions-item label="名称">
+            {{ form["name"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="归属批次">
+            {{
+              batch.find((i) => i["id"] === form["batch_id"])
+                ? batch.find((i) => i["id"] === form["batch_id"])["name"]
+                : ""
+            }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="排序">
+            {{
+              typeof form["sort"] === "number"
+                ? form["sort"].toFixed(2)
+                : form["sort"]
+            }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="是否显示学校服从">
+            {{
+              [
+                { value: 1, label: "是" },
+                { value: 0, label: "否" },
+              ].find((i) => i["value"] === form["show_school_obey"])
+                ? [
+                    { value: 1, label: "是" },
+                    { value: 0, label: "否" },
+                  ].find((i) => i["value"] === form["show_school_obey"])[
+                    "label"
+                  ]
+                : ""
+            }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="是否显示专业服从">
+            {{
+              [
+                { value: 1, label: "是" },
+                { value: 0, label: "否" },
+              ].find((i) => i["value"] === form["show_specialty_obey"])
+                ? [
+                    { value: 1, label: "是" },
+                    { value: 0, label: "否" },
+                  ].find((i) => i["value"] === form["show_specialty_obey"])[
+                    "label"
+                  ]
+                : ""
+            }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </section>
+    </el-drawer>
+  </div>
 </template>
 
 <script>
-  import { show } from "@/api/batch-sub/batch-sub";
+import { show } from "@/api/batch-sub/batch-sub";
 
-  export default {
-    name: "BatchSubShow",
-    props: {
-      isShow: {
-        type: Boolean,
-        default: false,
-        required: true
-      },
-  
-  batch : {
-    type: Array,
-  default: () => []
-  },
-  
+export default {
+  name: "BatchSubShow",
+  props: {
+    isShow: {
+      type: Boolean,
+      default: false,
+      required: true,
+    },
+
+    batch: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
       loading: false,
       visible: false,
       form: {
-      
-      name: '',
-      
-      batch_id: '',
-      
-      sort: '',
-      
-      show_school_obey: '',
-      
-      show_specialty_obey: '',
-      
-  },
-  }
+        name: "",
+
+        batch_id: "",
+
+        sort: "",
+
+        show_school_obey: "",
+
+        show_specialty_obey: "",
+      },
+    };
   },
   watch: {
     isShow(newVal) {
-      this.visible = newVal
+      this.visible = newVal;
     },
     visible(newVal) {
-      this.$emit('update:isShow', newVal)
+      this.$emit("update:isShow", newVal);
     },
   },
   methods: {
     async getDetail(id) {
       try {
         const detail = await show({
-          id
-        })
+          id,
+        });
         for (let key in this.form) {
           if (detail.hasOwnProperty(key)) {
-            this.form[key] = detail[key]
+            this.form[key] = detail[key];
           }
         }
       } catch (err) {
-        console.error(err)
+        console.error(err);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  .span2 {
-    grid-column: span 2;
-  }
-  ::v-deep .el-form-item > * {
-    max-width: 100%;
-  }
-  .drawer-container {
-    height: 100%;
-    padding: 20px;
-    display: flex;
-    flex-direction: column;
+.span2 {
+  grid-column: span 2;
+}
+::v-deep .el-form-item > * {
+  max-width: 100%;
+}
+.drawer-container {
+  height: 100%;
+  padding: 20px;
+  display: flex;
+  flex-direction: column;
 
-    & > * {
-      flex: 1;
-    }
+  & > * {
+    flex: 1;
   }
+}
 </style>
diff --git a/src/views/IndependentRecruitment/IndependentRecruitment.vue b/src/views/IndependentRecruitment/IndependentRecruitment.vue
index 6893eca..74ce70e 100644
--- a/src/views/IndependentRecruitment/IndependentRecruitment.vue
+++ b/src/views/IndependentRecruitment/IndependentRecruitment.vue
@@ -1,631 +1,650 @@
-
 <template>
-    <div>
-        <el-card shadow="never" style="margin-top: 20px;">
-            <template #header>
-                <slot name="header">
-                    <vxe-toolbar :print="isHasAuth('print')" custom ref="toolbar">
-                        <template #toolSuffix>
-                            <vxe-button style="margin-right: 10px;" v-if="isHasAuth('export')" icon="vxe-icon-download" circle @click="exportMethod"></vxe-button>
-                        </template>
-                        <template #buttons>
-                            <el-button
-                                    v-if="isHasAuth('create')"
-                                    icon="el-icon-plus"
-                                    type="primary"
-                                    size="small"
-                                    @click="isShowAdd = true"
-                            >新增</el-button
-                            >
-                            <el-button
-                                    v-if="isHasAuth('search')"
-                                    icon="el-icon-search"
-                                    type="primary"
-                                    plain
-                                    size="small"
-                                    @click="getList"
-                            >搜索</el-button
-                            >
-                        </template>
-                    </vxe-toolbar>
-                </slot>
+  <div>
+    <el-card shadow="never" style="margin-top: 20px">
+      <template #header>
+        <slot name="header">
+          <vxe-toolbar :print="isHasAuth('print')" custom ref="toolbar">
+            <template #toolSuffix>
+              <vxe-button
+                style="margin-right: 10px"
+                v-if="isHasAuth('export')"
+                icon="vxe-icon-download"
+                circle
+                @click="exportMethod"
+              ></vxe-button>
+            </template>
+            <template #buttons>
+              <el-button
+                v-if="isHasAuth('create')"
+                icon="el-icon-plus"
+                type="primary"
+                size="small"
+                @click="isShowAdd = true"
+                >新增</el-button
+              >
+              <el-button
+                v-if="isHasAuth('search')"
+                icon="el-icon-search"
+                type="primary"
+                plain
+                size="small"
+                @click="getList"
+                >搜索</el-button
+              >
             </template>
+          </vxe-toolbar>
+        </slot>
+      </template>
 
-            <vxe-table
-                    ref="table"
-                    stripe
-                    style="margin-top: 10px"
-                    :loading="loading"
-                    :height="tableHeight"
-                    keep-source
-                    show-overflow
-                    :menu-config="{
-                      className: 'my-menus',
-                      body: {
-                        options: [
-                          [
-                            { code: 'copy', name: '复制', prefixConfig: { icon: 'vxe-icon-copy' }, suffixConfig: { content: 'Ctrl+C' } },
-                            { code: 'remove', name: '删除', prefixConfig: { icon: 'vxe-icon-delete-fill', className: 'color-red' } }
-                          ],
-                        ]
-                      }
-                    }"
-                    @menu-click="contextMenuClickEvent"
-                    :row-config="{ isCurrent: true, isHover: true }"
-                    :column-config="{ resizable: true }"
-                    :export-config="{}"
-                    :edit-rules="validRules"
-                    :edit-config="{
+      <vxe-table
+        ref="table"
+        stripe
+        style="margin-top: 10px"
+        :loading="loading"
+        :height="tableHeight"
+        keep-source
+        show-overflow
+        :menu-config="{
+          className: 'my-menus',
+          body: {
+            options: [
+              [
+                {
+                  code: 'copy',
+                  name: '复制',
+                  prefixConfig: { icon: 'vxe-icon-copy' },
+                  suffixConfig: { content: 'Ctrl+C' },
+                },
+                {
+                  code: 'remove',
+                  name: '删除',
+                  prefixConfig: {
+                    icon: 'vxe-icon-delete-fill',
+                    className: 'color-red',
+                  },
+                },
+              ],
+            ],
+          },
+        }"
+        @menu-click="contextMenuClickEvent"
+        :row-config="{ isCurrent: true, isHover: true }"
+        :column-config="{ resizable: true }"
+        :export-config="{}"
+        :edit-rules="validRules"
+        :edit-config="{
           trigger: 'manual',
           mode: 'row',
           showStatus: true,
           isHover: true,
           autoClear: false,
         }"
-                    
-                    :align="allAlign"
-                    :data="tableData"
-            >
-                <vxe-column type="checkbox" width="50" align="center" />
-                <vxe-column type="seq" width="58" align="center"  />
-                
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="name"
-                                width="160"
-                                title="名称"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                field="area_id"
-                                width="180"
-                                title="区域"
-                                :edit-render="{ name: 'VxeSelect', options: area, props: { multiple: false }, optionProps: { value: 'id', label: 'name' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                field="year"
-                                width="180"
-                                title="年份"
-                                :edit-render="{}"
-                        >
-                            <template #edit="{ row }">
-                                <el-date-picker v-model="row['year']" style="width: 100%;" size="small" type="year" value-format="yyyy-MM-dd"></el-date-picker>
-                            </template>
-                        </vxe-column>
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                field="sex"
-                                width="180"
-                                title="性别"
-                                :edit-render="{ name: 'VxeSelect', options: [{'value':'男','label':'男'},{'value':'女','label':'女'},{'value':'保密','label':'保密'}], props: { multiple: false }, optionProps: { value: 'value', label: 'label' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="number"
-                                width="160"
-                                title="编号"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="type"
-                                width="160"
-                                title="考试类型"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="nationality"
-                                width="160"
-                                title="民族"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="address"
-                                width="160"
-                                title="地址"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="mobile"
-                                width="160"
-                                title="手机号"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="school"
-                                width="160"
-                                title="学校"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="school_code"
-                                width="160"
-                                title="学校代码"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="school_name"
-                                width="160"
-                                title="学校名称"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                field="is_independent"
-                                width="180"
-                                title="是否独立招生"
-                                :edit-render="{ name: 'VxeSelect', options: [{'value':1,'label':'是'},{'value':0,'label':'否'}], props: { multiple: false }, optionProps: { value: 'value', label: 'label' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="evaluation"
-                                width="160"
-                                title="评估信息"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                <vxe-column field="operate" header-align="center" title="操作" min-width="220" fixed="right">
-                    <template #default="{ row }">
-                        <template v-if="isActiveStatus(row)">
-                            <el-button size="small" type="primary" @click="saveRowEvent(row)"
-                            >保存</el-button
-                            >
-                            <el-button
-                                    size="small"
-                                    type="primary"
-                                    plain
-                                    @click="cancelRowEvent(row)"
-                            >取消</el-button
-                            >
-                        </template>
-                        <template v-else>
-                            <el-button v-if="isHasAuth('detail')" size="small" type="primary" plain @click="detail(row)"
-                            >查看</el-button
-                            >
-                            <el-button v-if="isHasAuth('edit')" size="small" type="warning" @click="editRowEvent(row)"
-                            >编辑</el-button
-                            >
-                            <el-button
-                                    v-if="isHasAuth('delete')"
-                                    size="small"
-                                    type="danger"
-                                    @click="destroyRowEvent(row)"
-                            >删除</el-button
-                            >
-                        </template>
-                    </template>
-                </vxe-column>
-            </vxe-table>
-
-            
-                <el-pagination
-                        style="margin-top: 10px;display: flex;justify-content: flex-end;"
-                        :current-page.sync="select.page"
-                        :page-sizes="[20, 30, 40, 50]"
-                        :page-size.sync="select.page_size"
-                        layout="total, sizes, prev, pager, next, jumper"
-                        :total="total"
-                        @size-change="
+        :align="allAlign"
+        :data="tableData"
+      >
+        <vxe-column type="checkbox" width="50" align="center" />
+        <vxe-column type="seq" width="58" align="center" />
+
+        <vxe-column
+          header-align="center"
+          field="name"
+          width="160"
+          title="名称"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          align="center"
+          field="area_id"
+          width="180"
+          title="区域"
+          :edit-render="{
+            name: 'VxeSelect',
+            options: area,
+            props: { multiple: false },
+            optionProps: { value: 'id', label: 'name' },
+          }"
+        />
+
+        <vxe-column
+          align="center"
+          field="year"
+          width="180"
+          title="年份"
+          :edit-render="{}"
+        >
+          <template #edit="{ row }">
+            <el-date-picker
+              v-model="row['year']"
+              style="width: 100%"
+              size="small"
+              type="year"
+              value-format="yyyy-MM-dd"
+            ></el-date-picker>
+          </template>
+        </vxe-column>
+
+        <vxe-column
+          align="center"
+          field="sex"
+          width="180"
+          title="性别"
+          :edit-render="{
+            name: 'VxeSelect',
+            options: [
+              { value: '男', label: '男' },
+              { value: '女', label: '女' },
+              { value: '保密', label: '保密' },
+            ],
+            props: { multiple: false },
+            optionProps: { value: 'value', label: 'label' },
+          }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="number"
+          width="160"
+          title="编号"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="type"
+          width="160"
+          title="考试类型"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="nationality"
+          width="160"
+          title="民族"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="address"
+          width="160"
+          title="地址"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="mobile"
+          width="160"
+          title="手机号"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="school"
+          width="160"
+          title="学校"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="school_code"
+          width="160"
+          title="学校代码"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="school_name"
+          width="160"
+          title="学校名称"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          align="center"
+          field="is_independent"
+          width="180"
+          title="是否独立招生"
+          :edit-render="{
+            name: 'VxeSelect',
+            options: [
+              { value: 1, label: '是' },
+              { value: 0, label: '否' },
+            ],
+            props: { multiple: false },
+            optionProps: { value: 'value', label: 'label' },
+          }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="evaluation"
+          width="160"
+          title="评估信息"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          field="operate"
+          header-align="center"
+          title="操作"
+          min-width="220"
+          fixed="right"
+        >
+          <template #default="{ row }">
+            <template v-if="isActiveStatus(row)">
+              <el-button size="small" type="primary" @click="saveRowEvent(row)"
+                >保存</el-button
+              >
+              <el-button
+                size="small"
+                type="primary"
+                plain
+                @click="cancelRowEvent(row)"
+                >取消</el-button
+              >
+            </template>
+            <template v-else>
+              <el-button
+                v-if="isHasAuth('detail')"
+                size="small"
+                type="primary"
+                plain
+                @click="detail(row)"
+                >查看</el-button
+              >
+              <el-button
+                v-if="isHasAuth('edit')"
+                size="small"
+                type="warning"
+                @click="editRowEvent(row)"
+                >编辑</el-button
+              >
+              <el-button
+                v-if="isHasAuth('delete')"
+                size="small"
+                type="danger"
+                @click="destroyRowEvent(row)"
+                >删除</el-button
+              >
+            </template>
+          </template>
+        </vxe-column>
+      </vxe-table>
+
+      <el-pagination
+        style="margin-top: 10px; display: flex; justify-content: flex-end"
+        :current-page.sync="select.page"
+        :page-sizes="[20, 30, 40, 50]"
+        :page-size.sync="select.page_size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        @size-change="
           (e) => {
             select.page_size = e;
             select.page = 1;
             getList();
           }
         "
-                        @current-change="
+        @current-change="
           (e) => {
             select.page = e;
             getList();
           }
         "
-                />
-            
-        </el-card>
-
-        <AddIndependentRecruitment
-                ref="AddIndependentRecruitment"
-                
-                    :area="area"
-                  
-                :is-show.sync="isShowAdd"
-                @refresh="getList"
-        />
-        <ShowIndependentRecruitment
-                ref="ShowIndependentRecruitment"
-        
-                :area="area"
-                
-                :is-show.sync="isShowDetail"
-        />
-        
-    </div>
+      />
+    </el-card>
+
+    <AddIndependentRecruitment
+      ref="AddIndependentRecruitment"
+      :area="area"
+      :is-show.sync="isShowAdd"
+      @refresh="getList"
+    />
+    <ShowIndependentRecruitment
+      ref="ShowIndependentRecruitment"
+      :area="area"
+      :is-show.sync="isShowDetail"
+    />
+  </div>
 </template>
 
 <script>
-  import VxeUI from "vxe-pc-ui";
-  
-  import { authMixin } from "@/mixin/authMixin"
-  import { uploadSize } from "@/settings";
-  import { deepCopy } from "@/utils";
-  import { download } from "@/utils/downloadRequest";
-  import { destroy, index, save } from "@/api/independent-recruitment/independent-recruitment";
-  import AddIndependentRecruitment from "./components/AddIndependentRecruitment.vue";
-  import ShowIndependentRecruitment from "./components/ShowIndependentRecruitment.vue";
-  import axios from "axios";
-  import { getToken } from "@/utils/auth";
-  
-        import { index as areaIndex } from '@/api/area/area';
-      
-  export default {
-    name: "IndependentRecruitment",
-    mixins: [authMixin],
-    components: {
-        
-      AddIndependentRecruitment,
-      ShowIndependentRecruitment,
-    },
-    data() {
-      return {
-        uploadSize,
-        examineKey: 0,
-        isShowAdd: false,
-        isShowDetail: false,
-
-        loading: false,
-        tableHeight: 400,
-        select: {
-          page: 1,
-          page_size: 20,
-          keyword: '',
-          show_relation: [],
-          
-        },
-        total: 0,
-        allAlign: null,
-        tableData: [],
-        form: {
-          id: '',
-          
-            name: '',
-          
-            area_id: '',
-          
-            year: '',
-          
-            sex: '',
-          
-            number: '',
-          
-            type: '',
-          
-            nationality: '',
-          
-            address: '',
-          
-            mobile: '',
-          
-            school: '',
-          
-            school_code: '',
-          
-            school_name: '',
-          
-            is_independent: '',
-          
-            evaluation: '',
-          
-        },
+import VxeUI from "vxe-pc-ui";
+
+import { authMixin } from "@/mixin/authMixin";
+import { uploadSize } from "@/settings";
+import { deepCopy } from "@/utils";
+import { download } from "@/utils/downloadRequest";
+import {
+  destroy,
+  index,
+  save,
+} from "@/api/independent-recruitment/independent-recruitment";
+import AddIndependentRecruitment from "./components/AddIndependentRecruitment.vue";
+import ShowIndependentRecruitment from "./components/ShowIndependentRecruitment.vue";
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+
+import { index as areaIndex } from "@/api/area/area";
+
+export default {
+  name: "IndependentRecruitment",
+  mixins: [authMixin],
+  components: {
+    AddIndependentRecruitment,
+    ShowIndependentRecruitment,
+  },
+  data() {
+    return {
+      uploadSize,
+      examineKey: 0,
+      isShowAdd: false,
+      isShowDetail: false,
+
+      loading: false,
+      tableHeight: 400,
+      select: {
+        page: 1,
+        page_size: 20,
+        keyword: "",
+        show_relation: [],
+      },
+      total: 0,
+      allAlign: null,
+      tableData: [],
+      form: {
+        id: "",
+
+        name: "",
+
+        area_id: "",
+
+        year: "",
+
+        sex: "",
+
+        number: "",
+
+        type: "",
+
+        nationality: "",
+
+        address: "",
+
+        mobile: "",
+
+        school: "",
+
+        school_code: "",
+
+        school_name: "",
+
+        is_independent: "",
+
+        evaluation: "",
+      },
       validRules: {
-          
-          name: [
-            
+        name: [
           {
             required: true,
-            message: '名称'+'必填'
+            message: "名称" + "必填",
           },
-          
         ],
-          
-          area_id: [
-            
+
+        area_id: [
           {
             required: true,
-            message: '区域'+'必填'
+            message: "区域" + "必填",
           },
-          
         ],
-          
-          mobile: [
-            
+
+        mobile: [
           {
             pattern: /(^$)|(^1[3456789]\d{9})|(^(0\d{2,3}(-)*)?\d{7})$/,
-            message: '手机号'+'验证失败'
+            message: "手机号" + "验证失败",
           },
-          
         ],
-          
       },
 
-        
-               area: [],
-             
-      };
-    },
-    computed: {
-      isActiveStatus() {
-        return function (row) {
-          if (this.$refs["table"]) {
-            return this.$refs["table"].isEditByRow(row);
-          }
-        };
-      },
-      isHasAuth() {
-        return function (auth) {
-          return this.auths_auth_mixin.indexOf(auth) !== -1
+      area: [],
+    };
+  },
+  computed: {
+    isActiveStatus() {
+      return function (row) {
+        if (this.$refs["table"]) {
+          return this.$refs["table"].isEditByRow(row);
         }
-      }
-    },
-    created() {
-      
-         this.getArea()
-         
-      this.getList();
+      };
     },
-    mounted() {
-      this.bindToolbar()
-      this.calcTableHeight()
+    isHasAuth() {
+      return function (auth) {
+        return this.auths_auth_mixin.indexOf(auth) !== -1;
+      };
     },
-    methods: {
-      exportMethod() {
-        this.$confirm("请选择导出方式", "提示", {
-          confirmButtonText: "全量导出",
-          cancelButtonText: "部分导出",
-          distinguishCancelAndClose: true
-        }).then(_ => {
-          download('/api/admin/school/index', 'get', {
+  },
+  created() {
+    this.getArea();
+
+    this.getList();
+  },
+  mounted() {
+    this.bindToolbar();
+    this.calcTableHeight();
+  },
+  methods: {
+    exportMethod() {
+      this.$confirm("请选择导出方式", "提示", {
+        confirmButtonText: "全量导出",
+        cancelButtonText: "部分导出",
+        distinguishCancelAndClose: true,
+      })
+        .then((_) => {
+          download("/api/admin/school/index", "get", {
             ...this.select,
             page: 1,
             page_size: 9999,
             is_export: 1,
-            export_fields: Object.keys(this.form)
-          })
-        }).catch(action => {
-          if (action === 'cancel' && this.$refs['table']) {
-            this.$refs['table'].openExport()
+            export_fields: Object.keys(this.form),
+          });
+        })
+        .catch((action) => {
+          if (action === "cancel" && this.$refs["table"]) {
+            this.$refs["table"].openExport();
           }
         });
-      },
-      calcTableHeight() {
-        let clientHeight = document.documentElement.clientHeight;
-        let cardTitle = document.querySelector(".el-card__header")?.getBoundingClientRect()?.height;
-        let search = document.querySelector(".vxe-toolbar")?.getBoundingClientRect()?.height;
-        let paginationHeight = (document.querySelector(".el-pagination")?.getBoundingClientRect()?.height ?? 0) + 10; //分页的高度
-        let topHeight = 50; //页面 头部
-        let padding = 80;
-        let margin = 20;
-        this.tableHeight =
-          clientHeight - cardTitle - search - paginationHeight - topHeight - padding - margin;
-      },
-      contextMenuClickEvent ({ menu, row, column }) {
-        switch (menu.code) {
-          case 'copy':
-            // 示例
-            if (row && column) {
-              if (VxeUI.clipboard.copy(row[column.field])) {
-                this.$message.success('已复制到剪贴板！')
-              }
-            }
-            break
-          case 'remove':
-            if (row && column) {
-              this.destroyRowEvent(row)
+    },
+    calcTableHeight() {
+      let clientHeight = document.documentElement.clientHeight;
+      let cardTitle = document
+        .querySelector(".el-card__header")
+        ?.getBoundingClientRect()?.height;
+      let search = document
+        .querySelector(".vxe-toolbar")
+        ?.getBoundingClientRect()?.height;
+      let paginationHeight =
+        (document.querySelector(".el-pagination")?.getBoundingClientRect()
+          ?.height ?? 0) + 10; //分页的高度
+      let topHeight = 50; //页面 头部
+      let padding = 80;
+      let margin = 20;
+      this.tableHeight =
+        clientHeight -
+        cardTitle -
+        search -
+        paginationHeight -
+        topHeight -
+        padding -
+        margin;
+    },
+    contextMenuClickEvent({ menu, row, column }) {
+      switch (menu.code) {
+        case "copy":
+          // 示例
+          if (row && column) {
+            if (VxeUI.clipboard.copy(row[column.field])) {
+              this.$message.success("已复制到剪贴板！");
             }
-          default:
-        }
-      },
-      async detail (row) {
-        await this.$refs["ShowIndependentRecruitment"].getDetail(row.id)
-        this.isShowDetail = true
-      },
+          }
+          break;
+        case "remove":
+          if (row && column) {
+            this.destroyRowEvent(row);
+          }
+        default:
+      }
+    },
+    async detail(row) {
+      await this.$refs["ShowIndependentRecruitment"].getDetail(row.id);
+      this.isShowDetail = true;
+    },
 
-      
-           async getArea() {
-             try {
-               const res = await areaIndex({
-                 page: 1,
-                 page_size: 999,
-                 
-               }, false)
-               this.area = res.data
-             } catch(err) {
-               console.error(err)
-             }
-           },
-         
-
-      uploadMethod(file) {
-        const formData = new FormData()
-        formData.append('file', file)
-        window.$_uploading = true
-        return axios.post(process.env.VUE_APP_UPLOAD_API, formData, {
+    async getArea() {
+      try {
+        const res = await areaIndex(
+          {
+            page: 1,
+            page_size: 999,
+          },
+          false
+        );
+        this.area = res.data;
+      } catch (err) {
+        console.error(err);
+      }
+    },
+
+    uploadMethod(file) {
+      const formData = new FormData();
+      formData.append("file", file);
+      window.$_uploading = true;
+      return axios
+        .post(process.env.VUE_APP_UPLOAD_API, formData, {
           headers: {
             Authorization: `Bearer ${getToken()}`,
-          }
-        }).then((response) => {
-          window.$_uploading = false
+          },
+        })
+        .then((response) => {
+          window.$_uploading = false;
           if (response.status === 200 && !response.data.code) {
             return {
               response: response.data,
               name: response.data.original_name,
-              url: response.data.url
-            }
+              url: response.data.url,
+            };
           } else {
-            this.$message.error("上传失败")
+            this.$message.error("上传失败");
           }
-        }).catch(_ => {
-          window.$_uploading = false
         })
-      },
-      bindToolbar() {
-        this.$nextTick(() => {
-          if (this.$refs["table"] && this.$refs["toolbar"]) {
-            this.$refs["table"].connect(this.$refs["toolbar"]);
-          }
+        .catch((_) => {
+          window.$_uploading = false;
         });
-      },
-
-      editRowEvent(row) {
-        if (this.$refs["table"]) {
-          this.$refs["table"].setEditRow(row);
-        }
-      },
-      cancelRowEvent(row) {
-        if (this.$refs["table"]) {
-          this.$refs["table"].clearEdit().then(() => {
-            // 还原行数据
-            this.$refs["table"].revertData(row);
-          });
+    },
+    bindToolbar() {
+      this.$nextTick(() => {
+        if (this.$refs["table"] && this.$refs["toolbar"]) {
+          this.$refs["table"].connect(this.$refs["toolbar"]);
         }
-      },
+      });
+    },
 
-      async getList() {
-        this.loading = true;
-        try {
-          const res = await index(this.select, false);
-          this.tableData = res.data;
-          this.total = res.total;
-          this.loading = false;
-        } catch (err) {
-          console.error(err);
-          this.loading = false;
-        }
-      },
+    editRowEvent(row) {
+      if (this.$refs["table"]) {
+        this.$refs["table"].setEditRow(row);
+      }
+    },
+    cancelRowEvent(row) {
+      if (this.$refs["table"]) {
+        this.$refs["table"].clearEdit().then(() => {
+          // 还原行数据
+          this.$refs["table"].revertData(row);
+        });
+      }
+    },
+
+    async getList() {
+      this.loading = true;
+      try {
+        const res = await index(this.select, false);
+        this.tableData = res.data;
+        this.total = res.total;
+        this.loading = false;
+      } catch (err) {
+        console.error(err);
+        this.loading = false;
+      }
+    },
 
-      async saveRowEvent(row) {
-        if (window.$_uploading) {
-          this.$message.warning("文件正在上传中")
-          return
+    async saveRowEvent(row) {
+      if (window.$_uploading) {
+        this.$message.warning("文件正在上传中");
+        return;
+      }
+      try {
+        const errMap = await this.$refs["table"].validate();
+        if (errMap) {
+          throw new Error(errMap);
         }
-        try {
-          const errMap = await this.$refs["table"].validate();
-          if (errMap) {
-            throw new Error(errMap);
-          }
-          await this.$confirm("确认保存？", "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "取消",
-          });
-          await this.$refs["table"].clearEdit();
-          let form = deepCopy(this.form);
-          for (const key in form) {
-            form[key] = row[key];
-          }
-          
-          this.loading = true;
-          await save(form, false);
-          await this.getList();
-          this.loading = false;
-        } catch (err) {
-          this.loading = false;
+        await this.$confirm("确认保存？", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+        });
+        await this.$refs["table"].clearEdit();
+        let form = deepCopy(this.form);
+        for (const key in form) {
+          form[key] = row[key];
         }
-      },
-      async destroyRowEvent(row) {
-        try {
-          await this.$confirm("确认删除？", "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "取消",
-          });
-          this.loading = true;
-          if (row.id) {
-            await destroy({
+
+        this.loading = true;
+        await save(form, false);
+        await this.getList();
+        this.loading = false;
+      } catch (err) {
+        this.loading = false;
+      }
+    },
+    async destroyRowEvent(row) {
+      try {
+        await this.$confirm("确认删除？", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+        });
+        this.loading = true;
+        if (row.id) {
+          await destroy(
+            {
               id: row.id,
-            },false);
-            await this.getList();
-          } else {
-            console.log(row);
-            this.tableData.splice(
-              this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
-              1
-            );
-          }
-          this.loading = false;
-        } catch (err) {
-          this.loading = false;
+            },
+            false
+          );
+          await this.getList();
+        } else {
+          console.log(row);
+          this.tableData.splice(
+            this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
+            1
+          );
         }
-      },
-
+        this.loading = false;
+      } catch (err) {
+        this.loading = false;
+      }
     },
-  };
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  ::v-deep .el-card__header {
-    padding: 6px 20px;
-  }
-  ::v-deep .el-tag + .el-tag {
-    margin-left: 4px;
-  }
+::v-deep .el-card__header {
+  padding: 6px 20px;
+}
+::v-deep .el-tag + .el-tag {
+  margin-left: 4px;
+}
 </style>
diff --git a/src/views/IndependentRecruitment/components/AddIndependentRecruitment.vue b/src/views/IndependentRecruitment/components/AddIndependentRecruitment.vue
index 094f0a6..94a040a 100644
--- a/src/views/IndependentRecruitment/components/AddIndependentRecruitment.vue
+++ b/src/views/IndependentRecruitment/components/AddIndependentRecruitment.vue
@@ -1,113 +1,221 @@
-
 <template>
-    <div>
-        <el-drawer
-                :title="$route.meta.title"
-                direction="rtl"
-                size="68%"
-                :visible.sync="visible"
-                append-to-body
-                :before-close="handleClose"
-                @close="$emit('update:isShow',false)">
-            <section class="drawer-container">
-                <el-form class="drawer-container__form" ref="elForm" :model="form" :rules="rules" label-position="top" label-width="120px" size="small">
-                    <div class="form-layout">
-                        
-                                 <el-form-item label="名称" prop="name">
-                                   <el-input v-model="form['name']" clearable placeholder="请填写名称" style="width: 100%;"></el-input>
-                                 </el-form-item>
-                               
-                                   <el-form-item label="区域" prop="area_id" clearable>
-                                     <el-select v-model="form['area_id']" clearable placeholder="请填写区域"  style="width: 100%;">
-                                       <el-option v-for="(option, optionIndex) in area" :key="optionIndex" :label="option['name']" :value="option['id']"></el-option>
-                                     </el-select>
-                                   </el-form-item>
-                               
-                                    <el-form-item label="年份" prop="year" clearable>
-                                      <el-date-picker v-model="form['year']" clearable placeholder="请填写年份" type="year" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
-                                    </el-form-item>
-                               
-                                   <el-form-item label="性别" prop="sex" clearable>
-                                     <el-select v-model="form['sex']" clearable placeholder="请填写性别"  style="width: 100%;">
-                                       <el-option v-for="(option, optionIndex) in [{'value':'男','label':'男'},{'value':'女','label':'女'},{'value':'保密','label':'保密'}]" :key="optionIndex" :label="option['label']" :value="option['value']"></el-option>
-                                     </el-select>
-                                   </el-form-item>
-                               
-                                 <el-form-item label="编号" prop="number">
-                                   <el-input v-model="form['number']" clearable placeholder="请填写编号" style="width: 100%;"></el-input>
-                                 </el-form-item>
-                               
-                                 <el-form-item label="考试类型" prop="type">
-                                   <el-input v-model="form['type']" clearable placeholder="请填写考试类型" style="width: 100%;"></el-input>
-                                 </el-form-item>
-                               
-                                 <el-form-item label="民族" prop="nationality">
-                                   <el-input v-model="form['nationality']" clearable placeholder="请填写民族" style="width: 100%;"></el-input>
-                                 </el-form-item>
-                               
-                                    <el-form-item label="地址" prop="address">
-                                      <el-input v-model="form['address']" clearable placeholder="请填写地址" type="textarea" :autosize="{ minRows: 2 }" style="width: 100%;"></el-input>
-                                    </el-form-item>
-                               
-                                 <el-form-item label="手机号" prop="mobile">
-                                   <el-input v-model="form['mobile']" clearable placeholder="请填写手机号" style="width: 100%;"></el-input>
-                                 </el-form-item>
-                               
-                                 <el-form-item label="学校" prop="school">
-                                   <el-input v-model="form['school']" clearable placeholder="请填写学校" style="width: 100%;"></el-input>
-                                 </el-form-item>
-                               
-                                 <el-form-item label="学校代码" prop="school_code">
-                                   <el-input v-model="form['school_code']" clearable placeholder="请填写学校代码" style="width: 100%;"></el-input>
-                                 </el-form-item>
-                               
-                                 <el-form-item label="学校名称" prop="school_name">
-                                   <el-input v-model="form['school_name']" clearable placeholder="请填写学校名称" style="width: 100%;"></el-input>
-                                 </el-form-item>
-                               
-                                   <el-form-item label="是否独立招生" prop="is_independent" clearable>
-                                     <el-select v-model="form['is_independent']" clearable placeholder="请填写是否独立招生"  style="width: 100%;">
-                                       <el-option v-for="(option, optionIndex) in [{'value':1,'label':'是'},{'value':0,'label':'否'}]" :key="optionIndex" :label="option['label']" :value="option['value']"></el-option>
-                                     </el-select>
-                                   </el-form-item>
-                               
-                                    <el-form-item label="评估信息" prop="evaluation">
-                                      <el-input v-model="form['evaluation']" clearable placeholder="请填写评估信息" type="textarea" :autosize="{ minRows: 2 }" style="width: 100%;"></el-input>
-                                    </el-form-item>
-                               
-                    </div>
-                </el-form>
-
-                <div class="drawer-container__footer">
-                    <el-button @click="reset">重 置</el-button>
-                    <el-button type="primary" @click="submit" :loading="loading">{{ loading ? '提交中 ...' : '确 定' }}</el-button>
-                </div>
-            </section>
-        </el-drawer>
-    </div>
+  <div>
+    <el-drawer
+      :title="$route.meta.title"
+      direction="rtl"
+      size="68%"
+      :visible.sync="visible"
+      append-to-body
+      :before-close="handleClose"
+      @close="$emit('update:isShow', false)"
+    >
+      <section class="drawer-container">
+        <el-form
+          class="drawer-container__form"
+          ref="elForm"
+          :model="form"
+          :rules="rules"
+          label-position="top"
+          label-width="120px"
+          size="small"
+        >
+          <div class="form-layout">
+            <el-form-item label="名称" prop="name">
+              <el-input
+                v-model="form['name']"
+                clearable
+                placeholder="请填写名称"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="区域" prop="area_id" clearable>
+              <el-select
+                v-model="form['area_id']"
+                clearable
+                placeholder="请填写区域"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(option, optionIndex) in area"
+                  :key="optionIndex"
+                  :label="option['name']"
+                  :value="option['id']"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="年份" prop="year" clearable>
+              <el-date-picker
+                v-model="form['year']"
+                clearable
+                placeholder="请填写年份"
+                type="year"
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+              ></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="性别" prop="sex" clearable>
+              <el-select
+                v-model="form['sex']"
+                clearable
+                placeholder="请填写性别"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(option, optionIndex) in [
+                    { value: '男', label: '男' },
+                    { value: '女', label: '女' },
+                    { value: '保密', label: '保密' },
+                  ]"
+                  :key="optionIndex"
+                  :label="option['label']"
+                  :value="option['value']"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="编号" prop="number">
+              <el-input
+                v-model="form['number']"
+                clearable
+                placeholder="请填写编号"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="考试类型" prop="type">
+              <el-input
+                v-model="form['type']"
+                clearable
+                placeholder="请填写考试类型"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="民族" prop="nationality">
+              <el-input
+                v-model="form['nationality']"
+                clearable
+                placeholder="请填写民族"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="地址" prop="address">
+              <el-input
+                v-model="form['address']"
+                clearable
+                placeholder="请填写地址"
+                type="textarea"
+                :autosize="{ minRows: 2 }"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="手机号" prop="mobile">
+              <el-input
+                v-model="form['mobile']"
+                clearable
+                placeholder="请填写手机号"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="学校" prop="school">
+              <el-input
+                v-model="form['school']"
+                clearable
+                placeholder="请填写学校"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="学校代码" prop="school_code">
+              <el-input
+                v-model="form['school_code']"
+                clearable
+                placeholder="请填写学校代码"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="学校名称" prop="school_name">
+              <el-input
+                v-model="form['school_name']"
+                clearable
+                placeholder="请填写学校名称"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="是否独立招生" prop="is_independent" clearable>
+              <el-select
+                v-model="form['is_independent']"
+                clearable
+                placeholder="请填写是否独立招生"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(option, optionIndex) in [
+                    { value: 1, label: '是' },
+                    { value: 0, label: '否' },
+                  ]"
+                  :key="optionIndex"
+                  :label="option['label']"
+                  :value="option['value']"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="评估信息" prop="evaluation">
+              <el-input
+                v-model="form['evaluation']"
+                clearable
+                placeholder="请填写评估信息"
+                type="textarea"
+                :autosize="{ minRows: 2 }"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+          </div>
+        </el-form>
+
+        <div class="drawer-container__footer">
+          <el-button @click="reset">重 置</el-button>
+          <el-button type="primary" @click="submit" :loading="loading">{{
+            loading ? "提交中 ..." : "确 定"
+          }}</el-button>
+        </div>
+      </section>
+    </el-drawer>
+  </div>
 </template>
 
 <script>
-  import { save, show } from "@/api/independent-recruitment/independent-recruitment";
-  import axios from "axios";
-  import { getToken } from "@/utils/auth";
-  import { uploadSize } from "@/settings";
-  import { formatFileSize } from "@/utils";
+import {
+  save,
+  show,
+} from "@/api/independent-recruitment/independent-recruitment";
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import { uploadSize } from "@/settings";
+import { formatFileSize } from "@/utils";
 
-  export default {
+export default {
   name: "IndependentRecruitmentDrawer",
   props: {
     isShow: {
       type: Boolean,
       default: false,
-      required: true
+      required: true,
+    },
+
+    area: {
+      type: Array,
+      default: () => [],
     },
-    
-           area : {
-             type: Array,
-             default: () => []
-           },
-         
   },
   data() {
     return {
@@ -116,80 +224,72 @@
       loading: false,
       visible: false,
       form: {
-        
-          name: '',
-        
-          area_id: '',
-        
-          year: '',
-        
-          sex: '',
-        
-          number: '',
-        
-          type: '',
-        
-          nationality: '',
-        
-          address: '',
-        
-          mobile: '',
-        
-          school: '',
-        
-          school_code: '',
-        
-          school_name: '',
-        
-          is_independent: '',
-        
-          evaluation: '',
-        
+        name: "",
+
+        area_id: "",
+
+        year: "",
+
+        sex: "",
+
+        number: "",
+
+        type: "",
+
+        nationality: "",
+
+        address: "",
+
+        mobile: "",
+
+        school: "",
+
+        school_code: "",
+
+        school_name: "",
+
+        is_independent: "",
+
+        evaluation: "",
       },
       rules: {
-          
-          name: [
-              
+        name: [
           {
             required: true,
-            message: '名称'+'必填'
+            message: "名称" + "必填",
           },
-              
         ],
-          
-          area_id: [
-              
+
+        area_id: [
           {
             required: true,
-            message: '区域'+'必填'
+            message: "区域" + "必填",
           },
-              
         ],
-          
-          mobile: [
-              
+
+        mobile: [
           {
             validator: (rule, value, callback) => {
-              if (/(^$)|(^1[3456789]\d{9})|(^(0\d{2,3}(-)*)?\d{7})$/.test(value)) {
-                callback()
+              if (
+                /(^$)|(^1[3456789]\d{9})|(^(0\d{2,3}(-)*)?\d{7})$/.test(value)
+              ) {
+                callback();
               } else {
-                callback(new Error('手机号'+'验证失败'))
+                callback(new Error("手机号" + "验证失败"));
               }
             },
-            message: '手机号'+'验证失败'
+            message: "手机号" + "验证失败",
           },
-              
         ],
-          
       },
-    }
+    };
   },
   watch: {
     isShow(newVal) {
-      this.visible = newVal
+      this.visible = newVal;
     },
     visible(newVal) {
-      this.$emit('update:isShow', newVal)
+      this.$emit("update:isShow", newVal);
     },
   },
   methods: {
@@ -201,23 +301,23 @@
         });
         return false;
       }
-      window.$_uploading = true
+      window.$_uploading = true;
     },
     uploadSuccess(response, file, fileList, fieldName) {
-      window.$_uploading = false
+      window.$_uploading = false;
       fileList.forEach((file) => {
         if (file.response?.data && !file.response?.code) {
           file.response = file.response.data;
         }
       });
-      this.form[fieldName] = fileList
+      this.form[fieldName] = fileList;
     },
     uploadRemove(file, fileList, fieldName) {
-      this.form[fieldName] = fileList
+      this.form[fieldName] = fileList;
     },
     uploadError(err, file, fileList, fieldName) {
-      window.$_uploading = false
-      this.form[fieldName] = fileList
+      window.$_uploading = false;
+      this.form[fieldName] = fileList;
       this.$message({
         type: "warning",
         message: err,
@@ -226,71 +326,69 @@
     formatFileSize,
     getToken,
     handleClose(done) {
-      this.$confirm('确定关闭窗口？')
-        .then(_ => {
+      this.$confirm("确定关闭窗口？")
+        .then((_) => {
           done();
         })
-        .catch(_ => {});
+        .catch((_) => {});
     },
 
     reset() {
       this.form = {
-          
-          name: '',
-          
-          area_id: '',
-          
-          year: '',
-          
-          sex: '',
-          
-          number: '',
-          
-          type: '',
-          
-          nationality: '',
-          
-          address: '',
-          
-          mobile: '',
-          
-          school: '',
-          
-          school_code: '',
-          
-          school_name: '',
-          
-          is_independent: '',
-          
-          evaluation: '',
-          
-      }
-      this.$refs['elForm'].resetFields()
+        name: "",
+
+        area_id: "",
+
+        year: "",
+
+        sex: "",
+
+        number: "",
+
+        type: "",
+
+        nationality: "",
+
+        address: "",
+
+        mobile: "",
+
+        school: "",
+
+        school_code: "",
+
+        school_name: "",
+
+        is_independent: "",
+
+        evaluation: "",
+      };
+      this.$refs["elForm"].resetFields();
     },
     submit() {
       if (window.$_uploading) {
-        this.$message.warning("文件正在上传中")
-        return
+        this.$message.warning("文件正在上传中");
+        return;
       }
-      
-      this.$refs['elForm'].validate(async valid => {
+
+      this.$refs["elForm"].validate(async (valid) => {
         if (valid) {
-          this.loading = true
+          this.loading = true;
           try {
-            await save(this.form)
-            this.$message.success('新增成功')
-            this.$emit('refresh')
-            this.$emit('update:isShow', false)
-            this.loading = false
-            this.reset()
+            await save(this.form);
+            this.$message.success("新增成功");
+            this.$emit("refresh");
+            this.$emit("update:isShow", false);
+            this.loading = false;
+            this.reset();
           } catch (err) {
-            this.loading = false
+            this.loading = false;
           }
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/IndependentRecruitment/components/ShowIndependentRecruitment.vue b/src/views/IndependentRecruitment/components/ShowIndependentRecruitment.vue
index 4c4d547..d2b3207 100644
--- a/src/views/IndependentRecruitment/components/ShowIndependentRecruitment.vue
+++ b/src/views/IndependentRecruitment/components/ShowIndependentRecruitment.vue
@@ -1,175 +1,204 @@
-
 <template>
-    <div>
-        <el-drawer
-                :title="$route.meta.title"
-                direction="rtl"
-                size="68%"
-                :visible.sync="visible"
-                append-to-body
-                @close="$emit('update:isShow',false)">
-            <section class="drawer-container">
-                <el-descriptions class="drawer-container__desc" size="small" border ref="elDesc" :column="2" direction="vertical" :labelStyle="{ 'font-weight': '500', 'font-size': '15px' }">
-                    
-                    <el-descriptions-item label="名称">
-                        {{ form['name'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="区域">
-                        {{ area.find(i => i['id'] === form['area_id']) ? area.find(i => i['id'] === form['area_id'])['name'] : '' }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="年份">
-                        {{ form['year'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="性别">
-                        {{ [{'value':'男','label':'男'},{'value':'女','label':'女'},{'value':'保密','label':'保密'}].find(i => i['value'] === form['sex']) ? [{'value':'男','label':'男'},{'value':'女','label':'女'},{'value':'保密','label':'保密'}].find(i => i['value'] === form['sex'])['label'] : '' }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="编号">
-                        {{ form['number'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="考试类型">
-                        {{ form['type'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="民族">
-                        {{ form['nationality'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="地址" span="2">
-                        <div v-html="form['address']"></div>
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="手机号">
-                        {{ form['mobile'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="学校">
-                        {{ form['school'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="学校代码">
-                        {{ form['school_code'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="学校名称">
-                        {{ form['school_name'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="是否独立招生">
-                        {{ [{'value':1,'label':'是'},{'value':0,'label':'否'}].find(i => i['value'] === form['is_independent']) ? [{'value':1,'label':'是'},{'value':0,'label':'否'}].find(i => i['value'] === form['is_independent'])['label'] : '' }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="评估信息" span="2">
-                        <div v-html="form['evaluation']"></div>
-                    </el-descriptions-item>
-                    
-                </el-descriptions>
-            </section>
-        </el-drawer>
-    </div>
+  <div>
+    <el-drawer
+      :title="$route.meta.title"
+      direction="rtl"
+      size="68%"
+      :visible.sync="visible"
+      append-to-body
+      @close="$emit('update:isShow', false)"
+    >
+      <section class="drawer-container">
+        <el-descriptions
+          class="drawer-container__desc"
+          size="small"
+          border
+          ref="elDesc"
+          :column="2"
+          direction="vertical"
+          :labelStyle="{ 'font-weight': '500', 'font-size': '15px' }"
+        >
+          <el-descriptions-item label="名称">
+            {{ form["name"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="区域">
+            {{
+              area.find((i) => i["id"] === form["area_id"])
+                ? area.find((i) => i["id"] === form["area_id"])["name"]
+                : ""
+            }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="年份">
+            {{ form["year"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="性别">
+            {{
+              [
+                { value: "男", label: "男" },
+                { value: "女", label: "女" },
+                { value: "保密", label: "保密" },
+              ].find((i) => i["value"] === form["sex"])
+                ? [
+                    { value: "男", label: "男" },
+                    { value: "女", label: "女" },
+                    { value: "保密", label: "保密" },
+                  ].find((i) => i["value"] === form["sex"])["label"]
+                : ""
+            }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="编号">
+            {{ form["number"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="考试类型">
+            {{ form["type"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="民族">
+            {{ form["nationality"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="地址" span="2">
+            <div v-html="form['address']"></div>
+          </el-descriptions-item>
+
+          <el-descriptions-item label="手机号">
+            {{ form["mobile"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="学校">
+            {{ form["school"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="学校代码">
+            {{ form["school_code"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="学校名称">
+            {{ form["school_name"] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="是否独立招生">
+            {{
+              [
+                { value: 1, label: "是" },
+                { value: 0, label: "否" },
+              ].find((i) => i["value"] === form["is_independent"])
+                ? [
+                    { value: 1, label: "是" },
+                    { value: 0, label: "否" },
+                  ].find((i) => i["value"] === form["is_independent"])["label"]
+                : ""
+            }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="评估信息" span="2">
+            <div v-html="form['evaluation']"></div>
+          </el-descriptions-item>
+        </el-descriptions>
+      </section>
+    </el-drawer>
+  </div>
 </template>
 
 <script>
-  import { show } from "@/api/independent-recruitment/independent-recruitment";
-
-  export default {
-    name: "IndependentRecruitmentShow",
-    props: {
-      isShow: {
-        type: Boolean,
-        default: false,
-        required: true
-      },
-  
-  area : {
-    type: Array,
-  default: () => []
-  },
-  
+import { show } from "@/api/independent-recruitment/independent-recruitment";
+
+export default {
+  name: "IndependentRecruitmentShow",
+  props: {
+    isShow: {
+      type: Boolean,
+      default: false,
+      required: true,
+    },
+
+    area: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
       loading: false,
       visible: false,
       form: {
-      
-      name: '',
-      
-      area_id: '',
-      
-      year: '',
-      
-      sex: '',
-      
-      number: '',
-      
-      type: '',
-      
-      nationality: '',
-      
-      address: '',
-      
-      mobile: '',
-      
-      school: '',
-      
-      school_code: '',
-      
-      school_name: '',
-      
-      is_independent: '',
-      
-      evaluation: '',
-      
-  },
-  }
+        name: "",
+
+        area_id: "",
+
+        year: "",
+
+        sex: "",
+
+        number: "",
+
+        type: "",
+
+        nationality: "",
+
+        address: "",
+
+        mobile: "",
+
+        school: "",
+
+        school_code: "",
+
+        school_name: "",
+
+        is_independent: "",
+
+        evaluation: "",
+      },
+    };
   },
   watch: {
     isShow(newVal) {
-      this.visible = newVal
+      this.visible = newVal;
     },
     visible(newVal) {
-      this.$emit('update:isShow', newVal)
+      this.$emit("update:isShow", newVal);
     },
   },
   methods: {
     async getDetail(id) {
       try {
         const detail = await show({
-          id
-        })
+          id,
+        });
         for (let key in this.form) {
           if (detail.hasOwnProperty(key)) {
-            this.form[key] = detail[key]
+            this.form[key] = detail[key];
           }
         }
       } catch (err) {
-        console.error(err)
+        console.error(err);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  .span2 {
-    grid-column: span 2;
-  }
-  ::v-deep .el-form-item > * {
-    max-width: 100%;
-  }
-  .drawer-container {
-    height: 100%;
-    padding: 20px;
-    display: flex;
-    flex-direction: column;
-
-    & > * {
-      flex: 1;
-    }
+.span2 {
+  grid-column: span 2;
+}
+::v-deep .el-form-item > * {
+  max-width: 100%;
+}
+.drawer-container {
+  height: 100%;
+  padding: 20px;
+  display: flex;
+  flex-direction: column;
+
+  & > * {
+    flex: 1;
   }
+}
 </style>
diff --git a/src/views/MiddleSchoolIndicator/MiddleSchoolIndicator.vue b/src/views/MiddleSchoolIndicator/MiddleSchoolIndicator.vue
index 9d093ea..6f94970 100644
--- a/src/views/MiddleSchoolIndicator/MiddleSchoolIndicator.vue
+++ b/src/views/MiddleSchoolIndicator/MiddleSchoolIndicator.vue
@@ -23,14 +23,21 @@
                 >新增</el-button
               >
               <template v-if="isHasAuth('search')">
-                <el-date-picker type="year" value-format="yyyy" style="width: 120px;" v-model="select['filter[0][value]']" placeholder="年份.." size="small"></el-date-picker>
+                <el-date-picker
+                  type="year"
+                  value-format="yyyy"
+                  style="width: 120px"
+                  v-model="select['filter[0][value]']"
+                  placeholder="年份.."
+                  size="small"
+                ></el-date-picker>
                 <el-button
                   icon="el-icon-search"
                   type="primary"
                   plain
                   size="small"
                   @click="getList"
-                >搜索</el-button
+                  >搜索</el-button
                 >
               </template>
             </template>
@@ -82,7 +89,7 @@
           autoClear: false,
         }"
         :expand-config="{
-          padding: true
+          padding: true,
         }"
         :align="allAlign"
         :data="tableData"
@@ -95,13 +102,25 @@
               stripe
               :height="500"
               :data="row['details']"
-              :column-config="{ resizable: true }">
+              :column-config="{ resizable: true }"
+            >
               <vxe-column type="seq" width="70" align="center">
                 <template #header>
-                  <el-button :disabled="!isActiveStatus(row)" size="small" icon="el-icon-plus" type="primary" @click="row.details.push({ name: '', total: 0 })"></el-button>
+                  <el-button
+                    :disabled="!isActiveStatus(row)"
+                    size="small"
+                    icon="el-icon-plus"
+                    type="primary"
+                    @click="row.details.push({ name: '', total: 0 })"
+                  ></el-button>
                 </template>
               </vxe-column>
-              <vxe-column field="name" min-width="140" title="详细名称" align="center">
+              <vxe-column
+                field="name"
+                min-width="140"
+                title="详细名称"
+                align="center"
+              >
                 <template #default="{ row: row1 }">
                   <el-input
                     v-model="row1['name']"
@@ -112,7 +131,12 @@
                   ></el-input>
                 </template>
               </vxe-column>
-              <vxe-column field="total" min-width="140" title="数量" align="center">
+              <vxe-column
+                field="total"
+                min-width="140"
+                title="数量"
+                align="center"
+              >
                 <template #default="{ row: row1 }">
                   <el-input
                     v-model="row1['total']"
@@ -123,7 +147,13 @@
                   ></el-input>
                 </template>
               </vxe-column>
-              <vxe-column :visible="isActiveStatus(row)" field="operate" title="操作" min-width="140" header-align="center">
+              <vxe-column
+                :visible="isActiveStatus(row)"
+                field="operate"
+                title="操作"
+                min-width="140"
+                header-align="center"
+              >
                 <el-button size="small" type="danger">删除</el-button>
               </vxe-column>
             </vxe-table>
@@ -150,7 +180,13 @@
           :edit-render="{}"
         >
           <template #edit="{ row }">
-            <el-date-picker style="width: 100%;" size="small" type="year" value-format="yyyy" v-model="row['year']"></el-date-picker>
+            <el-date-picker
+              style="width: 100%"
+              size="small"
+              type="year"
+              value-format="yyyy"
+              v-model="row['year']"
+            ></el-date-picker>
           </template>
         </vxe-column>
 
@@ -288,9 +324,9 @@ export default {
         page_size: 20,
         keyword: "",
         show_relation: ["details"],
-        'filter[0][key]': 'year',
-        'filter[0][op]': 'eq',
-        'filter[0][value]': '',
+        "filter[0][key]": "year",
+        "filter[0][op]": "eq",
+        "filter[0][value]": "",
       },
       total: 0,
       allAlign: null,
diff --git a/src/views/MiddleSchoolIndicator/components/AddMiddleSchoolIndicator.vue b/src/views/MiddleSchoolIndicator/components/AddMiddleSchoolIndicator.vue
index b5066ca..2990d64 100644
--- a/src/views/MiddleSchoolIndicator/components/AddMiddleSchoolIndicator.vue
+++ b/src/views/MiddleSchoolIndicator/components/AddMiddleSchoolIndicator.vue
@@ -63,13 +63,23 @@
                 stripe
                 :height="500"
                 :data="form['details']"
-                :column-config="{ resizable: true }">
+                :column-config="{ resizable: true }"
+              >
                 <vxe-column type="seq" width="70" align="center">
                   <template #header>
-                    <el-button icon="el-icon-plus" type="primary" @click="form.details.push({ name: '', total: 0 })"></el-button>
+                    <el-button
+                      icon="el-icon-plus"
+                      type="primary"
+                      @click="form.details.push({ name: '', total: 0 })"
+                    ></el-button>
                   </template>
                 </vxe-column>
-                <vxe-column field="name" min-width="140" title="详细名称" align="center">
+                <vxe-column
+                  field="name"
+                  min-width="140"
+                  title="详细名称"
+                  align="center"
+                >
                   <template #default="{ row }">
                     <el-input
                       v-model="row['name']"
@@ -79,7 +89,12 @@
                     ></el-input>
                   </template>
                 </vxe-column>
-                <vxe-column field="total" min-width="140" title="数量" align="center">
+                <vxe-column
+                  field="total"
+                  min-width="140"
+                  title="数量"
+                  align="center"
+                >
                   <template #default="{ row }">
                     <el-input
                       v-model="row['total']"
@@ -95,12 +110,11 @@
                       size="small"
                       type="danger"
                       @click="form.details.splice(rowIndex, 1)"
-                    >删除</el-button
+                      >删除</el-button
                     >
                   </template>
                 </vxe-column>
               </vxe-table>
-
             </el-form-item>
           </div>
         </el-form>
diff --git a/src/views/MiddleSchoolIndicator/components/ShowMiddleSchoolIndicator.vue b/src/views/MiddleSchoolIndicator/components/ShowMiddleSchoolIndicator.vue
index e79f204..fcf21b1 100644
--- a/src/views/MiddleSchoolIndicator/components/ShowMiddleSchoolIndicator.vue
+++ b/src/views/MiddleSchoolIndicator/components/ShowMiddleSchoolIndicator.vue
@@ -43,10 +43,21 @@
               stripe
               :height="500"
               :data="form['details']"
-              :column-config="{ resizable: true }">
+              :column-config="{ resizable: true }"
+            >
               <vxe-column type="seq" width="70" align="center" />
-              <vxe-column field="name" min-width="140" title="详细名称" align="center" />
-              <vxe-column field="total" min-width="140" title="数量" align="center" />
+              <vxe-column
+                field="name"
+                min-width="140"
+                title="详细名称"
+                align="center"
+              />
+              <vxe-column
+                field="total"
+                min-width="140"
+                title="数量"
+                align="center"
+              />
             </vxe-table>
           </el-descriptions-item>
         </el-descriptions>
@@ -97,7 +108,7 @@ export default {
       try {
         const detail = await show({
           id,
-          show_relation: ["details"]
+          show_relation: ["details"],
         });
         for (let key in this.form) {
           if (detail.hasOwnProperty(key)) {