Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-12 827c151dac25d873c21929b5b0ded81e82937854

 src/views/user/student/list.vue

@@ -4,6 +4,14 @@
      <el-form-item label="真实姓名：">
        <el-input v-model="queryParam.userName" size="small" clearable></el-input>
      </el-form-item>
      <el-form-item label="部门：">
        <el-cascader
          clearable
          v-model="queryParam.departmentId"
          :options="depts"
          :props="{ emitPath: false, value: 'id', label: 'name',  checkStrictly: true, multiple: true }"
          ></el-cascader>
      </el-form-item>
      <el-form-item >
       <div style="display: flex">
         <el-button type="primary" @click="submitForm" size="small">查询</el-button>
@@ -29,9 +37,9 @@
      <el-table-column prop="userName" label="用户名"/>
      <el-table-column prop="realName" label="真实姓名" width="150"/>
      <el-table-column prop="deptNames" label="部门" />
      <el-table-column label="标签" prop="tagNames" width="80px">
      <el-table-column label="标签" prop="tagNames" align="center">
        <template slot-scope="{row}">
          <el-tag style="margin: 5px;" v-for="(item,index) in row.tagNames" :key="index">{{ item }}</el-tag>
          <el-tag v-for="item, index in row.tagNames" :key="index">{{ item }}</el-tag>
        </template>
      </el-table-column>
      <el-table-column label="人员状态" prop="condition" align="center" width="100px">
@@ -126,12 +134,14 @@
  },
  data () {
    return {
      depts: [],
      user:{},
      statusVisible: false,
      upLoadUrl:'/api/admin/user/import',
      fileList:[],
      queryParam: {
        userName: '',
        departmentId: [],
        roles: [1],
        pageIndex: 1,
        pageSize: 10
@@ -162,7 +172,10 @@
    }
  },
  created () {
    this.search()
    this.search();
    department.getDeptAdmins().then(res => {
      this.depts = res.response;
    })
  },
  methods: {
    deptAdmin() {