From 7e018f8c1f6e591440cc85b029c09e0533d4791f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 28 五月 2024 15:47:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/User/userlist.vue | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/User/userlist.vue b/UI-Project/src/views/User/userlist.vue
index bca1fae..ecd91ed 100644
--- a/UI-Project/src/views/User/userlist.vue
+++ b/UI-Project/src/views/User/userlist.vue
@@ -5,7 +5,7 @@
const router = useRouter()
const add = ref(false)
const adda = ref(false)
-
+const editingUser = ref({}); // 鐢ㄤ簬瀛樺偍褰撳墠缂栬緫鐨勭敤鎴锋暟鎹�
import request from "@/utils/request"
import { ref, onMounted } from "vue";
// import { ref } from 'vue'
@@ -94,6 +94,11 @@
console.error('Error fetching options:', error);
}
};
+// 澶勭悊缂栬緫鎸夐挳鐐瑰嚮
+function handleEdit(row) {
+ editingUser.value = { ...row }; // 浣跨敤灞曞紑杩愮畻绗﹀鍒跺綋鍓嶈鏁版嵁
+ adda.value = true; // 鏄剧ず瀵硅瘽妗�
+}
// 娣诲姞
const getTableRow = async () => {
try {
@@ -129,7 +134,8 @@
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- add.value = false;
+ editingUser.value = {};
+ adda.value = false;
tableData.value = response.data;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
@@ -230,7 +236,7 @@
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
<template #default="scope">
<el-button size="mini" type="text" plain @click="open(scope.row)">閲嶇疆瀵嗙爜</el-button>
- <el-button size="mini" type="text" plain @click="adda = true">缂栬緫</el-button>
+ <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">缂栬緫</el-button>
<el-button size="mini" type="text" plain @click="opena(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -300,14 +306,14 @@
</el-dialog>
<el-dialog v-model="adda" top="23vh" width="37%" title="淇敼鐢ㄦ埛" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form :model="editingUser" ref="formRef" size="mini" label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
<el-form-item label="鐢ㄦ埛鍚嶏細" :required="true" style="width: 25vw">
- <el-input v-model="userName" autocomplete="off" />
+ <el-input v-model="editingUser.userName" autocomplete="off" />
</el-form-item></div></div>
</el-col>
</el-row>
@@ -315,6 +321,13 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
+ <!-- <el-table-column align="center" label="瑙掕壊" min-width="80">
+ <template #default="scope">
+ <el-tag v-for="role in scope.row.roleList">
+ {{role.name}}
+ </el-tag>
+ </template>
+ </el-table-column> -->
<el-form-item label="瑙掕壊锛�" :required="true" style="width: 25vw;">
<el-select
v-model="selectedProjectNoa"
@@ -339,7 +352,7 @@
<div>
<el-form-item label="瀵嗙爜锛�" :required="true" style="width: 25vw;">
<el-input style="width: 340px;"
- v-model="password"
+ v-model="editingUser.password"
autocomplete="off"
:prefix-icon="Lock"
show-password/>
--
Gitblit v1.8.0