Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

 company/src/views/system/user.vue

@@ -2,21 +2,12 @@
  <TableLayout :permissions="['system:user:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="80px" inline>
<!--      <el-form-item label="用户名" prop="username">-->
<!--        <el-input v-model="searchForm.username" v-trim placeholder="请输入用户名" @keypress.enter.native="search"/>-->
<!--      </el-form-item>-->
      <el-form-item label="姓名" prop="realname">
        <el-input v-model="searchForm.realname" v-trim placeholder="请输入" @keypress.enter.native="search"/>
      </el-form-item>
<!--      <el-form-item label="手机号码" prop="mobile">-->
<!--        <el-input v-model="searchForm.mobile" v-trim placeholder="请输入手机号码" @keypress.enter.native="search"/>-->
<!--      </el-form-item>-->
<!--            <el-form-item label="所属部门" prop="rootDeptId">-->
<!--        <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="请选择所属部门" clearable/>-->
<!--      </el-form-item>-->
<!--      <el-form-item label="岗位" prop="positionId">-->
<!--        <PositionSelect v-model="searchForm.positionId" placeholder="请选择岗位" clearable/>-->
<!--      </el-form-item>-->
         <el-form-item label="所属部门" prop="companyDepartmentPathName">
            <el-input v-model="searchForm.companyDepartmentPathName" v-trim placeholder="请输入" @keypress.enter.native="search"/>
         </el-form-item>
      <section>
        <el-button type="primary" icon="el-icon-search" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
@@ -44,6 +35,19 @@
        <el-table-column prop="username" label="账号" min-width="120px"></el-table-column>
        <el-table-column prop="realname" label="姓名" min-width="100px"></el-table-column>
        <el-table-column prop="mobile" label="联系方式" min-width="100px"></el-table-column>
            <el-table-column label="主管" min-width="100px">
               <template slot-scope="{ row }">
                  <el-switch
                        v-model="row.headStatus"
                        @change="setHeadStatus($event, row)"
                        active-color="#13ce66"
                        inactive-color="#ff4949"
                        :active-value="1"
                        :inactive-value="0">
                  </el-switch>
               </template>
            </el-table-column>
            <el-table-column prop="companyDepartmentPathName" label="所在部门" min-width="100px"></el-table-column>
        <el-table-column prop="roles" label="角色" min-width="160px" class-name="table-column-strings">
          <template slot-scope="{row}">
            <ul>
@@ -72,8 +76,8 @@
        >
<!--          row.id !== userInfo.id &&-->
          <template v-if="isAdmin || (row.roles.findIndex(r => r.code === adminCode) === -1)" slot-scope="{row}">
            <el-button type="text" icon="el-icon-edit" @click="$refs.operaUserWindow.open('编辑用户', row)" v-permissions="['system:user:update']">编辑</el-button>
            <el-button type="text" @click="$refs.allocationEnterprises.open('分配企业', row)" v-if="userInfo.type !== 1">分配企业</el-button>
                  <el-button type="text" icon="el-icon-edit" @click="$refs.operaUserWindow.open('编辑用户', {...row, departmentId: row.companyDepartmentPathId ? row.companyDepartmentPathId.substring(0, row.companyDepartmentPathId.length - 1).split('/').map(val => +val) : '' })" v-permissions="['system:user:update']">编辑</el-button>
                  <el-button type="text" @click="$refs.allocationEnterprises.open('分配企业', row)" v-if="[0,2].includes(userInfo.type)">分配企业</el-button>
            <el-button type="text" icon="el-icon-s-custom" @click="$refs.roleConfigWindow.open(row)" v-permissions="['system:user:createUserRole']">配置角色</el-button>
            <el-button type="text" @click="$refs.resetPwdWindow.open(row)" v-permissions="['system:user:resetPwd']">重置密码</el-button>
<!--            <el-button v-if="!row.fixed" type="text" icon="el-icon-delete" @click="deleteById(row)" v-permissions="['system:user:delete']">删除</el-button>-->
@@ -107,11 +111,14 @@
import ResetPwdWindow from '@/components/system/user/ResetPwdWindow'
import DepartmentSelect from '@/components/common/DepartmentSelect'
import PositionSelect from '@/components/common/PositionSelect'
import { updUserStatus } from '@/api/system/user'

  import { updUserStatus, updateHead } from '@/api/system/user'
  import { mapState } from 'vuex'
export default {
  name: 'SystemUser',
  extends: BaseTable,
    computed: {
      ...mapState(['userInfo'])
    },
  components: { allocationEnterprises, PositionSelect, DepartmentSelect, ResetPwdWindow, RoleConfigWindow, OperaUserWindow, TableLayout, Pagination },
  data () {
    return {
@@ -121,7 +128,9 @@
        realname: '', // 姓名
        rootDeptId: null, // 部门ID
        positionId: null, // 岗位ID
        mobile: '' // 手机号码
          mobile: '', // 手机号码
          type: '',
          companyDepartmentPathName: ''   // 部门名称
      }
    }
  },
@@ -135,9 +144,17 @@
        direction: 'DESC'
      }]
    })
      this.searchForm.type = this.userInfo.type
    this.search()
  },
  methods: {
      // 设置取消主管
      setHeadStatus(e, row) {
        updateHead({ id: row.id, headStatus: row.headStatus })
          .then(res => {
            this.search()
          })
      },
    changeStatus(status, row) {
      updUserStatus({
        id: row.id,