From 5292a401bc26ad177ff5005787429ce036e6457f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 31 十月 2025 13:35:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/User/userlist.vue | 96 ++++++++++++++++++++++++++++++++---------------
1 files changed, 65 insertions(+), 31 deletions(-)
diff --git a/UI-Project/src/views/User/userlist.vue b/UI-Project/src/views/User/userlist.vue
index 4b25b70..8395779 100644
--- a/UI-Project/src/views/User/userlist.vue
+++ b/UI-Project/src/views/User/userlist.vue
@@ -16,16 +16,29 @@
const password = ref('');
const tableData = ref([])
const slot = ref('')
-request.post("/loadGlass/sys/user/listByUserName",{
- key: ''
-}).then((res) => {
- if (res.code == 200) {
- console.log(res.data);
- tableData.value = res.data
- } else {
- ElMessage.warning(res.msg)
- }
- });
+// request.post("/loadGlass/sys/user/listByUserName",{
+// key: ''
+// }).then((res) => {
+// if (res.code == 200) {
+// console.log(res.data);
+// tableData.value = res.data
+// } else {
+// ElMessage.warning(res.msg)
+// }
+// });
+ const listByUserName = async () => {
+ try {
+ const response = await request.post('/loadGlass/sys/user/listByUserName',{
+ key: ''
+ });
+ if (response.code === 200) {
+ tableData.value = response.data
+ } else {
+ ElMessage.warning(response.data);
+ }
+ } catch (error) {
+ }
+};
// 閲嶇疆瀵嗙爜
const open = async(row) => {
try {
@@ -40,7 +53,6 @@
);
if (confirmResult === 'confirm') {
var url="/loadGlass/sys/user/resetPassword?userId="+row.id;
- console.log(url);
const response = await request.post(url, {
esdId: row.esdId
})
@@ -51,14 +63,14 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
const titleSelectJsona = ref({
processType: [],
})
onMounted(() => {
- fetchOptionsa('');
+ fetchOptionsa('');
+ listByUserName('');
});
// 瑙掕壊涓嬫媺閫�
const fetchOptionsa = async () => {
@@ -71,8 +83,7 @@
} else {
ElMessage.warning(response.data);
}
- } catch (error) {
- console.error('Error fetching options:', error);
+ } catch (error) {
}
};
// 澶勭悊缂栬緫鎸夐挳鐐瑰嚮
@@ -100,6 +111,18 @@
}
// 娣诲姞
const getTableRow = async () => {
+ if (!userName.value) {
+ ElMessage.error(t('productStock.inusername'))
+ return
+ }
+ if (!selectedProjectNoa.value) {
+ ElMessage.error(t('productStock.inrole'))
+ return
+ }
+ if (!password.value) {
+ ElMessage.error(t('productStock.inpassword'))
+ return
+ }
try {
const response = await request.post('/loadGlass/sys/user/saveUser', {
userName: userName.value,
@@ -113,16 +136,28 @@
if (response.code === 200) {
ElMessage.success(response.message);
add.value = false;
- tableData.value = response.data;
+ listByUserName('');
+ // tableData.value = response.data;
} else {
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 缂栬緫
const getTableRowa = async () => {
+ if (!userName.value) {
+ ElMessage.error(t('productStock.inusername'))
+ return
+ }
+ if (!selectedProjectNoa.value) {
+ ElMessage.error(t('productStock.inrole'))
+ return
+ }
+ if (!password.value) {
+ ElMessage.error(t('productStock.inpassword'))
+ return
+ }
let id = window.localStorage.getItem('id')
try {
const response = await request.post('/loadGlass/sys/user/updateUser', {
@@ -137,12 +172,12 @@
if (response.code === 200) {
ElMessage.success(response.message);
adda.value = false;
- tableData.value = response.data;
+ listByUserName('');
+ tableData.value = response.data;
} else {
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鍒犻櫎
@@ -161,22 +196,21 @@
const response = await request.post("/loadGlass/sys/user/deleteUser", [row.id])
if (response.code === 200) {
ElMessage.success(response.message);
- } else {
+ listByUserName('');
+ } else {
ElMessage.error(response.msg);
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
</script>
<template>
<div>
- <el-button type="primary" style="margin-top: 10px;margin-left: 10px;" size="mini" id="searchButton" @click="add = true">{{ $t('productStock.addusers') }}</el-button>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-button type="primary" style="margin-top: 10px;margin-left: 10px;" id="searchButton" @click="add = true">{{ $t('productStock.addusers') }}</el-button>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="750" ref="table"
- @selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="userName" align="center" :label="$t('productStock.username')" min-width="180" />
<el-table-column align="center" :label="$t('productStock.role')" min-width="80">
@@ -188,9 +222,9 @@
</el-table-column>
<el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="270">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('productStock.resetpassword') }}</el-button>
- <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('productStock.exit') }}</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('productStock.delete') }}</el-button>
+ <el-button type="text" plain @click="open(scope.row)">{{ $t('productStock.resetpassword') }}</el-button>
+ <el-button type="text" plain @click="handleEdit(scope.row)">{{ $t('productStock.exit') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('productStock.delete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -199,8 +233,8 @@
</div>
<el-dialog v-model="add" top="23vh" width="37%" :title="$t('productStock.addusers')">
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
- <el-form label-width="100px" label-position="right">
+ <el-form label-width="150px">
+ <el-form label-width="105px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
@@ -260,8 +294,8 @@
</el-dialog>
<el-dialog v-model="adda" top="23vh" width="37%" :title="$t('productStock.reusername')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form ref="formRef" size="mini" label-width="150px">
- <el-form label-width="100px" label-position="right">
+ <el-form ref="formRef" label-width="150px">
+ <el-form label-width="105px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
--
Gitblit v1.8.0