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

gaoluyang

2025-05-26 10d4c82e729694bd49a29f589d607690dc4b71f8

 src/views/system/role/authUser.vue

@@ -7,7 +7,6 @@
               v-model="queryParams.userName"

               placeholder="请输入用户名称"

               clearable

               size="small"

               style="width: 240px"

               @keyup.enter="handleQuery"

            />

@@ -17,14 +16,13 @@
               v-model="queryParams.phonenumber"

               placeholder="请输入手机号码"

               clearable

               size="small"

               style="width: 240px"

               @keyup.enter="handleQuery"

            />

         </el-form-item>

         <el-form-item>

            <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>

            <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>

            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>

            <el-button icon="Refresh" @click="resetQuery">重置</el-button>

         </el-form-item>

      </el-form>



@@ -34,7 +32,6 @@
               type="primary"

               plain

               icon="Plus"

               size="mini"

               @click="openSelectUser"

               v-hasPermi="['system:role:add']"

            >添加用户</el-button>

@@ -44,7 +41,6 @@
               type="danger"

               plain

               icon="CircleClose"

               size="mini"

               :disabled="multiple"

               @click="cancelAuthUserAll"

               v-hasPermi="['system:role:remove']"

@@ -55,7 +51,6 @@
               type="warning" 

               plain 

               icon="Close"

               size="mini" 
               @click="handleClose"

            >关闭</el-button>

         </el-col>

@@ -80,13 +75,7 @@
         </el-table-column>

         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

            <template #default="scope">

               <el-button

                  size="mini"

                  type="text"

                  icon="CircleClose"

                  @click="cancelAuthUser(scope.row)"

                  v-hasPermi="['system:role:remove']"

               >取消授权</el-button>

               <el-button link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)" v-hasPermi="['system:role:remove']">取消授权</el-button>

            </template>

         </el-table-column>

      </el-table>

@@ -103,19 +92,19 @@
</template>



<script setup name="AuthUser">

import selectUser from "./selectUser";

import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role";

import selectUser from "./selectUser"

import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role"



const route = useRoute();

const { proxy } = getCurrentInstance();

const { sys_normal_disable } = proxy.useDict("sys_normal_disable");

const route = useRoute()

const { proxy } = getCurrentInstance()

const { sys_normal_disable } = proxy.useDict("sys_normal_disable")



const userList = ref([]);

const loading = ref(true);

const showSearch = ref(true);

const multiple = ref(true);

const total = ref(0);

const userIds = ref([]);

const userList = ref([])

const loading = ref(true)

const showSearch = ref(true)

const multiple = ref(true)

const total = ref(0)

const userIds = ref([])



const queryParams = reactive({

  pageNum: 1,

@@ -123,61 +112,68 @@
  roleId: route.params.roleId,

  userName: undefined,

  phonenumber: undefined,

});

})



/** 查询授权用户列表 */

function getList() {

  loading.value = true;

  loading.value = true

  allocatedUserList(queryParams).then(response => {

    userList.value = response.rows;

    total.value = response.total;

    loading.value = false;

  });

    userList.value = response.rows

    total.value = response.total

    loading.value = false

  })

}

// 返回按钮



/** 返回按钮 */

function handleClose() {

  const obj = { path: "/system/role" };

  proxy.$tab.closeOpenPage(obj);

  const obj = { path: "/system/role" }

  proxy.$tab.closeOpenPage(obj)

}



/** 搜索按钮操作 */

function handleQuery() {

  queryParams.pageNum = 1;

  getList();

  queryParams.pageNum = 1

  getList()

}



/** 重置按钮操作 */

function resetQuery() {

  proxy.resetForm("queryRef");

  handleQuery();

  proxy.resetForm("queryRef")

  handleQuery()

}

// 多选框选中数据



/** 多选框选中数据 */

function handleSelectionChange(selection) {

  userIds.value = selection.map(item => item.userId);

  multiple.value = !selection.length;

  userIds.value = selection.map(item => item.userId)

  multiple.value = !selection.length

}



/** 打开授权用户表弹窗 */

function openSelectUser() {

  proxy.$refs["selectRef"].show();

  proxy.$refs["selectRef"].show()

}



/** 取消授权按钮操作 */

function cancelAuthUser(row) {

  proxy.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function () {

    return authUserCancel({ userId: row.userId, roleId: queryParams.roleId });

    return authUserCancel({ userId: row.userId, roleId: queryParams.roleId })

  }).then(() => {

    getList();

    proxy.$modal.msgSuccess("取消授权成功");

  }).catch(() => {});

}

/** 批量取消授权按钮操作 */

function cancelAuthUserAll(row) {

  const roleId = queryParams.roleId;

  const uIds = userIds.value.join(",");

  proxy.$modal.confirm("是否取消选中用户授权数据项?").then(function () {

    return authUserCancelAll({ roleId: roleId, userIds: uIds });

  }).then(() => {

    getList();

    proxy.$modal.msgSuccess("取消授权成功");

  }).catch(() => {});

    getList()

    proxy.$modal.msgSuccess("取消授权成功")

  }).catch(() => {})

}



getList();

/** 批量取消授权按钮操作 */

function cancelAuthUserAll(row) {

  const roleId = queryParams.roleId

  const uIds = userIds.value.join(",")

  proxy.$modal.confirm("是否取消选中用户授权数据项?").then(function () {

    return authUserCancelAll({ roleId: roleId, userIds: uIds })

  }).then(() => {

    getList()

    proxy.$modal.msgSuccess("取消授权成功")

  }).catch(() => {})

}



getList()

</script>