Merge remote-tracking branch 'origin/main'

frontend/src/views/teachOffice/office/index.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="app-container teach-office">
     <!-- 查询条件区域 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="88px" v-show="showSearch">
@@ -29,6 +29,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="状态" prop="ty">
+        <el-select v-model="queryParams.ty" placeholder="全部" clearable style="width: 100px">
+          <el-option label="启用" :value="0" />
+          <el-option label="停用" :value="1" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -48,11 +54,11 @@
 
     <!-- 数据列表区域 -->
     <el-table v-loading="loading" :data="officeList" border :height="tableHeight">
+      <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="教研室代号" align="center" prop="jysdh" min-width="110" />
       <el-table-column label="教研室名称" align="center" prop="jysmc" min-width="160" :show-overflow-tooltip="true" />
       <el-table-column label="简称" align="center" prop="jc" min-width="90" />
       <el-table-column label="部系" align="center" prop="bx" min-width="100" />
-      <el-table-column label="序号" align="center" prop="xh" min-width="80" />
       <el-table-column label="机关性质" align="center" min-width="90">
         <template slot-scope="scope">
           <el-tag :type="scope.row.jgxz ? 'primary' : 'info'" size="mini">{{ scope.row.jgxz ? '是' : '否' }}</el-tag>
@@ -169,7 +175,8 @@ export default {
         pageSize: 20,
         jysdh: undefined,
         jysmc: undefined,
-        bx: undefined
+        bx: undefined,
+        ty: undefined
       },
       // 表单参数
       form: {},