From 251d2411f235e23209d57173857e05b637729ce8 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期日, 02 四月 2023 01:01:56 +0800
Subject: [PATCH] refactor ts

---
 src/views/system/role/authUser.vue |  246 +++++++++++++++++++++++--------------------------
 1 files changed, 116 insertions(+), 130 deletions(-)

diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 66b5f5e..a9e2225 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -1,172 +1,158 @@
-
-<template>
-   <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
-         <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
-            <el-input
-               v-model="queryParams.userName"
-               placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
-               clearable
-               style="width: 240px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
-            <el-input
-               v-model="queryParams.phonenumber"
-               placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
-               clearable
-               style="width: 240px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
-            <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
-         </el-form-item>
-      </el-form>
-
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="primary"
-               plain
-               icon="Plus"
-               @click="openSelectUser"
-               v-hasPermi="['system:role:add']"
-            >娣诲姞鐢ㄦ埛</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="CircleClose"
-               :disabled="multiple"
-               @click="cancelAuthUserAll"
-               v-hasPermi="['system:role:remove']"
-            >鎵归噺鍙栨秷鎺堟潈</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button 
-               type="warning" 
-               plain 
-               icon="Close"
-               @click="handleClose"
-            >鍏抽棴</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-
-      <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="鐢ㄦ埛鍚嶇О" prop="userName" :show-overflow-tooltip="true" />
-         <el-table-column label="鐢ㄦ埛鏄电О" prop="nickName" :show-overflow-tooltip="true" />
-         <el-table-column label="閭" prop="email" :show-overflow-tooltip="true" />
-         <el-table-column label="鎵嬫満" prop="phonenumber" :show-overflow-tooltip="true" />
-         <el-table-column label="鐘舵��" align="center" prop="status">
-            <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-            </template>
-         </el-table-column>
-         <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)" v-hasPermi="['system:role:remove']">鍙栨秷鎺堟潈</el-button>
-            </template>
-         </el-table-column>
-      </el-table>
-
-      <pagination
-         v-show="total > 0"
-         :total="total"
-         v-model:page="queryParams.pageNum"
-         v-model:limit="queryParams.pageSize"
-         @pagination="getList"
-      />
-      <select-user ref="selectRef" :roleId="queryParams.roleId" @ok="handleQuery" />
-   </div>
-</template>
-
-<script setup name="AuthUser">
-import selectUser from "./selectUser";
+<script setup name="AuthUser" lang="ts">
 import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role";
+import { UserQuery } from "@/api/system/user/types";
+import { ComponentInternalInstance } from "vue";
+import { UserVO } from "@/api/system/user/types";
+import SelectUser from "./selectUser.vue";
+// import { ElForm, ElSelect} from 'element-plus';
+
 
 const route = useRoute();
-const { proxy } = getCurrentInstance();
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"));
 
-const userList = ref([]);
+const userList = ref<UserVO[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const userIds = ref([]);
+const userIds = ref<Array<string | number>>([]);
 
-const queryParams = reactive({
+const queryFormRef = ref(ElForm);
+const selectRef = ref(SelectUser);
+
+const queryParams = reactive<UserQuery>({
   pageNum: 1,
   pageSize: 10,
-  roleId: route.params.roleId,
+  roleId: route.params.roleId as string,
   userName: undefined,
   phonenumber: undefined,
 });
 
 /** 鏌ヨ鎺堟潈鐢ㄦ埛鍒楄〃 */
-function getList() {
+const getList = async () => {
   loading.value = true;
-  allocatedUserList(queryParams).then(response => {
-    userList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
+	const res = await allocatedUserList(queryParams);
+	userList.value = res.rows;
+	total.value = res.total;
+	loading.value = false;
 }
 // 杩斿洖鎸夐挳
-function handleClose() {
+const handleClose = () => {
   const obj = { path: "/system/role" };
-  proxy.$tab.closeOpenPage(obj);
+  proxy?.$tab.closeOpenPage(obj);
 }
 /** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
+const handleQuery=() => {
   queryParams.pageNum = 1;
   getList();
 }
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
-  proxy.resetForm("queryRef");
+const resetQuery=() =>{
+  queryFormRef.value.resetFields();
   handleQuery();
 }
 // 澶氶�夋閫変腑鏁版嵁
-function handleSelectionChange(selection) {
+const handleSelectionChange = (selection: UserVO[]) =>{
   userIds.value = selection.map(item => item.userId);
   multiple.value = !selection.length;
 }
 /** 鎵撳紑鎺堟潈鐢ㄦ埛琛ㄥ脊绐� */
-function openSelectUser() {
-  proxy.$refs["selectRef"].show();
+const openSelectUser = () => {
+  selectRef.value.show();
 }
 /** 鍙栨秷鎺堟潈鎸夐挳鎿嶄綔 */
-function cancelAuthUser(row) {
-  proxy.$modal.confirm('纭瑕佸彇娑堣鐢ㄦ埛"' + row.userName + '"瑙掕壊鍚楋紵').then(function () {
-    return authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
-  }).catch(() => {});
+const cancelAuthUser = async (row: UserVO) => {
+	await proxy?.$modal.confirm('纭瑕佸彇娑堣鐢ㄦ埛"' + row.userName + '"瑙掕壊鍚楋紵');
+	await authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
+	getList();
+	proxy?.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
 }
 /** 鎵归噺鍙栨秷鎺堟潈鎸夐挳鎿嶄綔 */
-function cancelAuthUserAll(row) {
+const cancelAuthUserAll = async () => {
   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(() => {});
+	await proxy?.$modal.confirm("鏄惁鍙栨秷閫変腑鐢ㄦ埛鎺堟潈鏁版嵁椤�?");
+	await authUserCancelAll({ roleId: roleId, userIds: uIds });
+	getList();
+	proxy?.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
 }
 
-getList();
+onMounted(() => {
+  getList();
+});
 </script>
+
+<template>
+	<div class="p-2">
+		<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+			<div class="search" v-show="showSearch">
+				<el-form :model="queryParams" ref="queryFormRef" :inline="true">
+					<el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
+						<el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable style="width: 240px" @keyup.enter="handleQuery" />
+					</el-form-item>
+					<el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
+						<el-input v-model="queryParams.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable style="width: 240px" @keyup.enter="handleQuery" />
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+						<el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</transition>
+		<el-card shadow="never">
+			<template #header>
+				<el-row :gutter="10">
+					<el-col :span="1.5">
+						<el-button type="primary" plain icon="Plus" @click="openSelectUser" v-hasPermi="['system:role:add']">娣诲姞鐢ㄦ埛</el-button>
+					</el-col>
+					<el-col :span="1.5">
+						<el-button type="danger" plain icon="CircleClose" :disabled="multiple" @click="cancelAuthUserAll" v-hasPermi="['system:role:remove']">
+							鎵归噺鍙栨秷鎺堟潈
+						</el-button>
+					</el-col>
+					<el-col :span="1.5">
+						<el-button type="warning" plain icon="Close" @click="handleClose">鍏抽棴</el-button>
+					</el-col>
+					<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :search="true"></right-toolbar>
+				</el-row>
+			</template>
+			<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+				<el-table-column type="selection" width="55" align="center" />
+				<el-table-column label="鐢ㄦ埛鍚嶇О" prop="userName" :show-overflow-tooltip="true" />
+				<el-table-column label="鐢ㄦ埛鏄电О" prop="nickName" :show-overflow-tooltip="true" />
+				<el-table-column label="閭" prop="email" :show-overflow-tooltip="true" />
+				<el-table-column label="鎵嬫満" prop="phonenumber" :show-overflow-tooltip="true" />
+				<el-table-column label="鐘舵��" align="center" prop="status">
+					<template #default="scope">
+						<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+					</template>
+				</el-table-column>
+				<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+					<template #default="scope">
+						<span>{{ scope.row.createTime }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+					<template #default="scope">
+						<el-tooltip content="鍙栨秷鎺堟潈" placement="top">
+							<el-button link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)" v-hasPermi="['system:role:remove']"> </el-button>
+						</el-tooltip>
+					</template>
+				</el-table-column>
+			</el-table>
+
+			<pagination
+				v-show="total > 0"
+				:total="total"
+				v-model:page="queryParams.pageNum"
+				v-model:limit="queryParams.pageSize"
+				@pagination="handleQuery"
+			/>
+			<select-user ref="selectRef" :roleId="queryParams.roleId" @ok="handleQuery" />
+		</el-card>
+	</div>
+</template>
+
+<style lang="scss" scoped></style>

--
Gitblit v1.9.3