From 754f2fa9c8076a5d13ad7476eb9bc5984f78c99c Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 21 四月 2023 13:25:32 +0800
Subject: [PATCH] 修改用户管理
---
src/api/systemManage/user/index.ts | 9 ++
src/views/analyse/plan/index.vue | 11 ++-
src/views/system/user/index.vue | 20 ++++--
src/views/analyse/applyReview/components/reportDialog.vue | 13 ++-
src/views/analyse/assessApply/components/reportDialog.vue | 11 ++-
src/views/analyse/identify/index.vue | 11 ++-
src/views/experiment/developing/components/developDialog.vue | 68 +++++++++++++++++++++-
src/views/experiment/project/components/projectDialog.vue | 13 ++-
src/views/system/user/component/userDialog.vue | 3
src/views/analyse/evaluate/index.vue | 11 ++-
10 files changed, 130 insertions(+), 40 deletions(-)
diff --git a/src/api/systemManage/user/index.ts b/src/api/systemManage/user/index.ts
index e36c708..a9012a2 100644
--- a/src/api/systemManage/user/index.ts
+++ b/src/api/systemManage/user/index.ts
@@ -3,9 +3,16 @@
export function userApi() {
return {
// v1
+ // getUserList: (data: any) => {
+ // return request({
+ // url: import.meta.env.VITE_API_URL + `/account/user/find/list/roleId`,
+ // method: 'post',
+ // data: data
+ // });
+ // },
getUserList: (data: any) => {
return request({
- url: import.meta.env.VITE_API_URL + `/account/user/find/list/roleId`,
+ url: import.meta.env.VITE_API_URL + `/account/user/find/user/list`,
method: 'post',
data: data
});
diff --git a/src/views/analyse/applyReview/components/reportDialog.vue b/src/views/analyse/applyReview/components/reportDialog.vue
index 5724dfa..cd650e8 100644
--- a/src/views/analyse/applyReview/components/reportDialog.vue
+++ b/src/views/analyse/applyReview/components/reportDialog.vue
@@ -374,12 +374,15 @@
const getPersonList = async () => {
let res = await userApi().getUserList({
- roleId: 1,
- usePage: false,
- pageIndex: 1,
- pageSize: 10
+ pageIndex: 1,
+ pageSize: 99999,
+ searchParams:{
+ roleId: null,
+ name: '',
+ realName: ''
+ }
});
- if(res.data.code === 100){
+ if(res.data.code === 200){
reportDialogState.systemPersonList = JSON.parse(JSON.stringify(res.data.data));
}else{
ElMessage({
diff --git a/src/views/analyse/assessApply/components/reportDialog.vue b/src/views/analyse/assessApply/components/reportDialog.vue
index edb56e2..d009c62 100644
--- a/src/views/analyse/assessApply/components/reportDialog.vue
+++ b/src/views/analyse/assessApply/components/reportDialog.vue
@@ -402,12 +402,15 @@
const getPersonList = async () => {
let res = await userApi().getUserList({
- roleId: 1,
- usePage: false,
pageIndex: 1,
- pageSize: 10
+ pageSize: 99999,
+ searchParams:{
+ roleId: null,
+ name: '',
+ realName: ''
+ }
});
- if(res.data.code === 100){
+ if(res.data.code === 200){
reportDialogState.systemPersonList = JSON.parse(JSON.stringify(res.data.data));
}else{
ElMessage({
diff --git a/src/views/analyse/evaluate/index.vue b/src/views/analyse/evaluate/index.vue
index 5266682..1733d96 100644
--- a/src/views/analyse/evaluate/index.vue
+++ b/src/views/analyse/evaluate/index.vue
@@ -196,12 +196,15 @@
const getPersonList = async () => {
let res = await userApi().getUserList({
- roleId: 1,
- usePage: false,
pageIndex: 1,
- pageSize: 10
+ pageSize: 99999,
+ searchParams:{
+ roleId: null,
+ name: '',
+ realName: ''
+ }
});
- if(res.data.code === 100){
+ if(res.data.code === 200){
evaluateState.personList = JSON.parse(JSON.stringify(res.data.data));
}else{
ElMessage({
diff --git a/src/views/analyse/identify/index.vue b/src/views/analyse/identify/index.vue
index ab50465..c0c2960 100644
--- a/src/views/analyse/identify/index.vue
+++ b/src/views/analyse/identify/index.vue
@@ -156,12 +156,15 @@
const getPersonList = async () => {
let res = await userApi().getUserList({
- roleId: 1,
- usePage: false,
pageIndex: 1,
- pageSize: 10
+ pageSize: 99999,
+ searchParams:{
+ roleId: null,
+ name: '',
+ realName: ''
+ }
});
- if(res.data.code === 100){
+ if(res.data.code === 200){
identifyState.personList = JSON.parse(JSON.stringify(res.data.data));
}else{
ElMessage({
diff --git a/src/views/analyse/plan/index.vue b/src/views/analyse/plan/index.vue
index 41a1f9e..90fb145 100644
--- a/src/views/analyse/plan/index.vue
+++ b/src/views/analyse/plan/index.vue
@@ -199,12 +199,15 @@
const getPersonList = async () => {
let res = await userApi().getUserList({
- roleId: 1,
- usePage: false,
pageIndex: 1,
- pageSize: 10
+ pageSize: 99999,
+ searchParams:{
+ roleId: null,
+ name: '',
+ realName: ''
+ }
});
- if(res.data.code === 100){
+ if(res.data.code === 200){
planState.personList = JSON.parse(JSON.stringify(res.data.data));
}else{
ElMessage({
diff --git a/src/views/experiment/developing/components/developDialog.vue b/src/views/experiment/developing/components/developDialog.vue
index 823cd90..f6704e9 100644
--- a/src/views/experiment/developing/components/developDialog.vue
+++ b/src/views/experiment/developing/components/developDialog.vue
@@ -230,6 +230,7 @@
import SelectRoom from "/@/views/experiment/project/components/selectRoom.vue";
import {useUserInfo} from "/@/stores/userInfo";
import {storeToRefs} from "pinia";
+import {checkChineseName, verifyPhone} from "/@/utils/toolsValidate";
const SelectEquipment = defineAsyncComponent(() => import('../../project/components/selectEquipment.vue'))
const SelectMaterial = defineAsyncComponent(() => import('../../project/components/selectMaterial.vue'))
const SelectDanger = defineAsyncComponent(() => import('../../project/components/selectDanger.vue'))
@@ -397,6 +398,62 @@
ProjectFormRef.value.validate(async(valid: boolean) => {
if(valid){
if(projectDialogState.title === '新增'){
+ if(checkChineseName(projectDialogState.projectForm.safeLiabilityUser) == false){
+ ElMessage({
+ type: 'warning',
+ message: '安全负责人姓名格式有误',
+ duration: 1000
+ });
+ return
+ }
+ if(verifyPhone(projectDialogState.projectForm.safeLiabilityUserPhone) == false || verifyPhone(projectDialogState.projectForm.liabilityUserPhone) == false){
+ ElMessage({
+ type: 'warning',
+ message: '请输入正确的手机号',
+ duration: 1000
+ });
+ return
+ }
+ if(projectDialogState.projectForm.siteList.length === 0){
+ ElMessage({
+ type: 'warning',
+ message: '请至少添加一处实验场所',
+ duration: 1000
+ });
+ return
+ }
+ if(projectDialogState.projectForm.stuffList.length === 0){
+ ElMessage({
+ type: 'warning',
+ message: '请至少选择一种试剂/材料',
+ duration: 1000
+ });
+ return
+ }
+ if(projectDialogState.projectForm.deviceList.length === 0){
+ ElMessage({
+ type: 'warning',
+ message: '请至少选择一种仪器/设备',
+ duration: 1000
+ });
+ return
+ }
+ if(projectDialogState.projectForm.hazardousWasteList.length === 0){
+ ElMessage({
+ type: 'warning',
+ message: '请选择添加危废数据',
+ duration: 1000
+ });
+ return
+ }
+ if(projectDialogState.projectForm.persons.length === 0){
+ ElMessage({
+ type: 'warning',
+ message: '请至少添加一名实验人员',
+ duration: 1000
+ });
+ return
+ }
projectDialogState.projectForm.persons = selectPersonRef.value.dataList
projectDialogState.projectForm.hazardousWasteList = selectDangerRef.value.dataList
projectDialogState.projectForm.siteList = selectRoomRef.value.dataList.map(({siteId}) => ({siteId}))
@@ -445,12 +502,15 @@
const getPersonList = async () => {
let res = await userApi().getUserList({
- roleId: 1,
- usePage: false,
pageIndex: 1,
- pageSize: 10
+ pageSize: 99999,
+ searchParams:{
+ roleId: null,
+ name: '',
+ realName: ''
+ }
});
- if(res.data.code === 100){
+ if(res.data.code === 200){
projectDialogState.systemPersonList = JSON.parse(JSON.stringify(res.data.data));
}else{
ElMessage({
diff --git a/src/views/experiment/project/components/projectDialog.vue b/src/views/experiment/project/components/projectDialog.vue
index 104df10..9e234fc 100644
--- a/src/views/experiment/project/components/projectDialog.vue
+++ b/src/views/experiment/project/components/projectDialog.vue
@@ -559,12 +559,15 @@
const getPersonList = async () => {
let res = await userApi().getUserList({
- roleId: 1,
- usePage: false,
- pageIndex: 1,
- pageSize: 10
+ pageIndex: 1,
+ pageSize: 99999,
+ searchParams:{
+ roleId: null,
+ name: '',
+ realName: ''
+ }
});
- if(res.data.code === 100){
+ if(res.data.code === 200){
projectDialogState.systemPersonList = JSON.parse(JSON.stringify(res.data.data));
}else{
ElMessage({
diff --git a/src/views/system/user/component/userDialog.vue b/src/views/system/user/component/userDialog.vue
index f3a0d93..b5ce486 100644
--- a/src/views/system/user/component/userDialog.vue
+++ b/src/views/system/user/component/userDialog.vue
@@ -114,7 +114,6 @@
depId: [{ required: true, message: '请选择部门', trigger: 'change' }],
phone: [{ required: true, message: '请填写手机号', trigger: 'blur' }],
idType: [{ required: true, message: '请选择证件类型', trigger: 'blur' }],
- idSerial: [{ required: true, message: '请填写证件号码', trigger: 'blur' }],
pwd: [{ required: true, message: '请输入账户密码', trigger: 'blur' }],
},
departmentData: [], // 部门数据
@@ -167,7 +166,7 @@
});
return
}
- if(verifyIdCard(state.userForm.idSerial) == false){
+ if(state.userForm.idSerial!=='' && verifyIdCard(state.userForm.idSerial) == false){
ElMessage({
type: 'warning',
message: '请输入正确的证件号码',
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 3030f1b..fe0ea7e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -89,10 +89,13 @@
total: number;
loading: boolean;
listQuery: {
- roleId: number | null;
- usePage: boolean;
pageIndex: number;
pageSize: number;
+ searchParams:{
+ roleId: number | null;
+ name: string
+ realName: string
+ }
};
};
idTypeList: Array<idType>
@@ -112,10 +115,13 @@
total: 0,
loading: false,
listQuery: {
- roleId: 1,
- usePage: false,
- pageIndex: 1,
- pageSize: 10
+ pageIndex: 1,
+ pageSize: 10,
+ searchParams:{
+ roleId: null,
+ name: '',
+ realName: ''
+ }
}
},
idTypeList:[
@@ -131,7 +137,7 @@
// 初始化表格数据
const initUserTableData = async () => {
let res = await userApi().getUserList(state.userTableData.listQuery);
- if (res.data.code === 100) {
+ if (res.data.code === 200) {
state.userTableData.data = res.data.data;
state.userTableData.total = res.data.total;
} else {
--
Gitblit v1.9.2