Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-17 f68cd81000a7480050e84d2f32c1251648d59b4d

Merge remote-tracking branch 'origin/master'

 src/router.js

@@ -478,6 +478,12 @@
        name: 'UserStudentPageList',
        meta: { title: '学生列表', noCache: true }
      },
      {
        path: 'departmentExamine/list',
        component: () => import('@/views/user/departmentExamine/list'),
        name: 'departmentExamineList',
        meta: { title: '调动审核', noCache: true }
      },
    ]
  },
  {

 src/views/user/departmentExamine/list.vue

@@ -2,7 +2,7 @@
  <div class="app-container">
    <el-form :model="queryParam" ref="queryForm" :inline="true">
      <el-form-item label="用户名：">
        <el-input v-model="queryParam.userName" clearable @clear="search"></el-input>
        <el-input v-model="queryParam.userName"></el-input>
      </el-form-item>
      <el-form-item>
        <div style="display: flex">
@@ -23,7 +23,7 @@
      <el-table-column prop="remark" label="审核意见" show-overflow-tooltip />
      <el-table-column prop="createUserName" label="创建人" />
      <el-table-column prop="createTime" label="创建时间" width="160px" />
      <el-table-column label="操作" align="center">
      <el-table-column label="操作" align="center" v-if="isDeptAdmin()">
        <template slot-scope="{row}">
          <el-button v-if="row.result === '待审核'" type="primary" size="mini" @click="transposition(row)" class="link-left">审核</el-button>
          <el-popconfirm title="确认删除" @confirm="deleteUser(row)">
@@ -78,6 +78,9 @@
    this.search()
  },
  methods: {
    isDeptAdmin() {
      return sessionStorage.getItem('deptAdmin') !== '1'
    },
    transposition(user) {
      this.statusVisible = true;
      this.user = { ...user };