Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-27 3bc00a9f9ccfad8cacc78c3fb68b6880f5522d5c

Merge remote-tracking branch 'origin/master'

 src/views/user/student/list.vue

@@ -39,7 +39,7 @@
          <el-tag :type="row.condition == '正常' || row.condition == null  ? 'success' : 'warning'">{{ row.condition ? row.condition : '正常' }}</el-tag>
        </template>
      </el-table-column>
      <el-table-column prop="sex" label="性别" width="60px;" :formatter="sexFormatter"/>
      <el-table-column prop="sex" label="性别" width="60px;" :formatter="sexFormatter" align="center"/>
      <el-table-column prop="phone" label="手机号" width="120"/>
      <el-table-column prop="createTime" label="创建时间" width="160px"/>
      <el-table-column label="状态" prop="status" width="70px">
@@ -60,7 +60,7 @@
          <router-link :to="{path:'/log/user/list', query:{userId:row.id}}" class="link-left">
            <el-button size="mini" >日志</el-button>
          </router-link>
          <el-button  size="mini" @click="status(row)" class="link-left">状态</el-button>
          <el-button type="primary" size="mini" @click="status(row)" class="link-left">状态</el-button>
          <el-button type="primary" size="mini" @click="transposition(row)" class="link-left">调动</el-button>
          <el-popconfirm title="确认删除吗" @confirm="deleteUser(row)">
            <el-button v-if="!deptAdmin()" slot="reference" size="mini" type="danger" class="link-left">删除</el-button>
@@ -197,6 +197,10 @@
      })
    },
    transposition(item) {
      if (item.conditionExamineResult) {
        this.$message.warning("该用户状态待审核");
        return
      }
      this.examine.userId = item.id
      this.examine.departmentId = item.deptIdList
      this.examine.nowDepartmentIds = item.deptIdList.join(',')
@@ -210,6 +214,10 @@
      })
    },
    status(user) {
      if (user.conditionExamineResult) {
        this.$message.warning("该用户状态待审核");
        return
      }
      this.statusVisible = true;
      this.conditionExamine.sourceCondition = user.condition ? user.condition : '0';
      this.conditionExamine.userId = user.id