From a61bd8abfb6bedacccbc1f1cdb01e4f433e58fd7 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期一, 24 二月 2025 11:32:15 +0800
Subject: [PATCH] start bug；重复导入文件bug
---
src/views/project/yw/systemManage/userMgr/UserMgr.vue | 93 ++++++++++++++++++++++++----------------------
1 files changed, 48 insertions(+), 45 deletions(-)
diff --git a/src/views/project/yw/systemManage/userMgr/UserMgr.vue b/src/views/project/yw/systemManage/userMgr/UserMgr.vue
index c418dc8..7644ec0 100644
--- a/src/views/project/yw/systemManage/userMgr/UserMgr.vue
+++ b/src/views/project/yw/systemManage/userMgr/UserMgr.vue
@@ -7,8 +7,7 @@
</el-form-item>
<el-form-item>
- <el-button icon="ele-Refresh" @click="resetQuery">閲嶇疆 </el-button>
- <el-button icon="ele-Plus" @click="openOptDlg()"> 娣诲姞 </el-button>
+ <el-button icon="ele-Plus" @click="openOptDlg()" type="primary"> 娣诲姞 </el-button>
</el-form-item>
</el-form>
</template>
@@ -23,8 +22,9 @@
:data="displayTableData"
highlight-current-row
>
- <el-table-column prop="user_name" label="鐢ㄦ埛鍚�" width="120" fixed="left" show-overflow-tooltip> </el-table-column>
- <el-table-column label="涓枃鍚�" prop="real_name" width="90" show-overflow-tooltip> </el-table-column>
+ <el-table-column type="index" label="搴忓彿" width="55" fixed="left" align="center"></el-table-column>
+ <el-table-column prop="user_name" label="鐢ㄦ埛ID" width="120" fixed="left" show-overflow-tooltip> </el-table-column>
+ <el-table-column label="濮撳悕" prop="real_name" width="90" show-overflow-tooltip> </el-table-column>
<el-table-column label="鎬у埆" prop="sex" width="70" show-overflow-tooltip> </el-table-column>
<el-table-column label="瑙掕壊" prop="user_roles" width="250" show-overflow-tooltip>
<template #default="{ row }">
@@ -33,11 +33,16 @@
}}</el-tag>
</template>
</el-table-column>
- <el-table-column label="閮ㄩ棬" prop="part" width="100" show-overflow-tooltip> </el-table-column>
+ <el-table-column label="閮ㄩ棬" prop="part_id" width="100" show-overflow-tooltip>
+ <template #default="scope">
+ {{ departmentMap[scope.row.part_id]?.name }}
+ </template>
+
+ </el-table-column>
<el-table-column label="鎵嬫満鍙�" prop="phone" width="120" show-overflow-tooltip> </el-table-column>
<el-table-column label="閭欢" prop="email" width="190" show-overflow-tooltip> </el-table-column>
-
+ <el-table-column label="鍒涘缓鏃堕棿" prop="create_time" width="105" show-overflow-tooltip> </el-table-column>
<el-table-column prop="note" label="璇存槑" show-overflow-tooltip />
<el-table-column label="鎿嶄綔" width="180" fixed="right" show-overflow-tooltip>
@@ -58,6 +63,12 @@
@click="openOptRoleDlg(scope.row)"
></i>
</el-tooltip>
+ <el-tooltip effect="dark" content="鎻愰棶绀轰緥" placement="top">
+ <i
+ class="ywifont ywicon-lizi !text-[15px] text-blue-400 cursor-pointer font-bold"
+ @click="openUserSampleDrawer(scope.row)"
+ ></i>
+ </el-tooltip>
<el-tooltip effect="dark" content="鍒犻櫎" placement="top">
<i class="ywifont ywicon-shanchu !text-[17px] text-red-400 cursor-pointer" @click="deleteCurrentRow(scope.row)"></i>
</el-tooltip>
@@ -68,15 +79,15 @@
</div>
</template>
- <OptDlg v-model="optDlgIsShow" :item="optDlgMapRow" @insert="insertOpt" @update="updateOpt" :roleList="roleList"></OptDlg>
+ <OptDlg v-model="optDlgIsShow" :item="optDlgMapRow" @insert="insertOpt" @update="updateOpt" :roleList="roleList" :departmentList="departmentList"></OptDlg>
<OptPasswordDlg
v-model="optPasswordDlgIsShow"
:item="optPasswordDlgMapRow"
@update="updatePasswordOpt"
:roleList="roleList"
></OptPasswordDlg>
- <OptRoleDlg v-model="optRoleDlgIsShow" :item="optRoleDlgMapRow" @update="updateRoleOpt" :roleList="roleList"></OptRoleDlg>
-
+ <OptRoleDlg v-model="optRoleDlgIsShow" :item="optRoleDlgMapRow" @update="updateRoleOpt" :roleList="roleList" ></OptRoleDlg>
+ <OptSampleDrawer v-model:isShow="sampleDrawerIsShow" :user="sampleMapUser"/>
<!-- <MetricPrompt v-model="infoDlgIsShow" :metricItem="infoDlgMapRow"></MetricPrompt>
<MetricName v-model="metricNameIsShow" :metricItem="metricNameMapRow"></MetricName> -->
</HMContainer>
@@ -96,11 +107,12 @@
import * as userApi from '/@/api/auth/user';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { computed } from 'vue';
+import OptSampleDrawer from './optDlg/OptSampleDrawer.vue';
import { getRoleInfoListByPost } from '/@/api/auth/role';
import HMContainer from '/@/components/layout/HMContainer.vue';
-import { ElMessageBox, ElMessage } from 'element-plus';
-import { computed } from 'vue';
-
+import { get_department_list } from '/@/api/department';
//#region ====================== 琛ㄦ牸鏁版嵁锛宼able init ======================
const tableLoading = ref(false);
const tableData = ref([]);
@@ -118,6 +130,7 @@
email: item.email,
note: item.note,
user_roles: item.roles,
+ create_time: item.create_time?.slice(0, 10),
}));
};
//#endregion
@@ -228,39 +241,6 @@
//#endregion
-//#region ====================== 鏀瑰彉鍙戝竷鐘舵�� ======================
-// const publishStatusChange = async (published: SupervisorPublished, id, index) => {
-// const res = await updatePublishStatus(
-// {
-// id: id,
-// publish: published,
-// },
-// {
-// loading: false,
-// }
-// );
-// const origin = published === SupervisorPublished.Y ? SupervisorPublished.N : SupervisorPublished.Y;
-// const final = res.publish ?? origin;
-// if (final === origin) {
-// ElMessage.warning('鎿嶄綔澶辫触' + (res.fail_msg ? `锛�${res.fail_msg}` : ''));
-// return;
-// }
-
-// tableData.value[index].published = final;
-
-// published === SupervisorPublished.Y ? ElMessage.success('鍙戝竷鎴愬姛') : ElMessage.info('宸插彇娑堝彂甯�');
-// };
-//#endregion
-
-//#region ====================== 鏇存柊鍙戝竷鐘舵�� ======================
-// useUpdateData({
-// event: 'supervisor.publish',
-// updateFun({ id, published }) {
-// updatePublishedById(id, published);
-// },
-// });
-//#endregion
-
const roleList = ref([]);
const roleMap = computed(() => getItemMap(roleList.value, 'id'));
const getRoleList = async () => {
@@ -268,8 +248,31 @@
roleList.value = res?.values ?? [];
};
+
+//#region ====================== 鏌ョ湅鐢ㄦ埛渚嬪瓙 ======================
+
+const sampleDrawerIsShow = ref(false);
+const sampleMapUser = ref(null);
+const openUserSampleDrawer = (row) => {
+ sampleDrawerIsShow.value = true;
+ sampleMapUser.value = row;
+};
+//#endregion
+
+//#region ====================== 鑾峰彇涓嶄箞鍒楄〃 ======================
+
+const departmentList = ref([]);
+const getDepartmentList = async () => {
+ const res = await get_department_list();
+ departmentList.value = res?.values ?? [];
+};
+const departmentMap = computed(() => getItemMap(departmentList.value, 'id'));
+
+
+//#endregion
onMounted(async () => {
await getRoleList();
+ await getDepartmentList();
getTableData();
});
--
Gitblit v1.9.3