From 8e5022825289113a58329a3ca4ef965ccebe3426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E6=99=8F=E5=BD=AD?= <995457985@qq.com> Date: Thu, 25 May 2023 11:24:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprise/notice/myReceive/index.vue | 8 ++- .../userManagement/departmentManage/index.vue | 35 ++++++++++++- .../userManagement/userManage/index.vue | 35 ++++++++++++- src/views/goverment/approve/company/index.vue | 6 +-- .../userManagement/departmentManage/index.vue | 49 +++++++++++++------ .../userManagement/userManage/index.vue | 35 ++++++++++++- src/views/project/notice/myReceive/index.vue | 8 ++- .../userManagement/departmentManage/index.vue | 35 ++++++++++++- .../userManagement/userManage/index.vue | 35 ++++++++++++- 9 files changed, 215 insertions(+), 31 deletions(-) diff --git a/src/views/enterprise/notice/myReceive/index.vue b/src/views/enterprise/notice/myReceive/index.vue index abb675e..b77f637 100644 --- a/src/views/enterprise/notice/myReceive/index.vue +++ b/src/views/enterprise/notice/myReceive/index.vue @@ -129,7 +129,13 @@ const columns: ColumnProps[] = [ { prop: "content", label: "通知内容", search: { el: "input" } }, { prop: "createByName", label: "发布人名称" }, { prop: "createTime", label: "发布时间" }, - { prop: "isRead", label: "阅读状态" }, + { + prop: "isRead", + label: "阅读状态", + render: scoped => { + return scoped.row.isRead === 1 ? "已读" : "未读"; + } + }, { prop: "operation", label: "操作", fixed: "right" } ]; diff --git a/src/views/enterprise/userManagement/departmentManage/index.vue b/src/views/enterprise/userManagement/departmentManage/index.vue index 7708a26..4393ac4 100644 --- a/src/views/enterprise/userManagement/departmentManage/index.vue +++ b/src/views/enterprise/userManagement/departmentManage/index.vue @@ -133,7 +133,19 @@ const title = ref(""); const visible = ref(false); const Deptvisible = ref(false); const showPage = ref(false); -const formData = ref({}); +const formData = ref({ + realName: "", + userTel: "", + account: "", + password: "", + email: "", + state: 1, + sex: "", + department: "", + jobName: "", + roleId: "", + remark: "" +}); const formDataDept = ref({}); const treeDeptList = ref([]); // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数） @@ -300,6 +312,13 @@ const formConfig = reactive({ message: "请输入名称", trigger: "blur" } + ], + roleId: [ + { + required: true, + message: "请选择角色", + trigger: "blur" + } ] } }); @@ -415,7 +434,19 @@ const handleEditItem = async (index: number, row: any) => { }); if (index === 1) { title.value = "新增用户"; - formData.value = reactive({}); + formData.value = reactive({ + realName: "", + userTel: "", + account: "", + password: "", + email: "", + state: 1, + sex: "", + department: "", + jobName: "", + roleId: "", + remark: "" + }); } else { title.value = "编辑用户"; formData.value = reactive({ ...row }); diff --git a/src/views/enterprise/userManagement/userManage/index.vue b/src/views/enterprise/userManagement/userManage/index.vue index 55bc0d9..2fc5721 100644 --- a/src/views/enterprise/userManagement/userManage/index.vue +++ b/src/views/enterprise/userManagement/userManage/index.vue @@ -85,7 +85,19 @@ const store = GlobalStore(); const visible = ref(false); const authorityVisible = ref(false); const title = ref(""); -const formData = ref({}); +const formData = ref({ + realName: "", + userTel: "", + account: "", + password: "", + email: "", + state: 1, + sex: "", + department: "", + jobName: "", + roleId: "", + remark: "" +}); // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数） const proTable = ref(); const authorityTable = ref(); @@ -240,6 +252,13 @@ const formConfig = reactive({ message: "请输入名称", trigger: "blur" } + ], + roleId: [ + { + required: true, + message: "请选择角色", + trigger: "blur" + } ] } }); @@ -312,7 +331,19 @@ const onSubmit = async () => { const handleEditItem = async (index: number, row: any) => { if (index === 1) { title.value = "新增用户"; - formData.value = reactive({}); + formData.value = reactive({ + realName: "", + userTel: "", + account: "", + password: "", + email: "", + state: 1, + sex: "", + department: "", + jobName: "", + roleId: "", + remark: "" + }); } else { title.value = "编辑用户"; formData.value = reactive({ ...row }); diff --git a/src/views/goverment/approve/company/index.vue b/src/views/goverment/approve/company/index.vue index f4899b7..bceecd9 100644 --- a/src/views/goverment/approve/company/index.vue +++ b/src/views/goverment/approve/company/index.vue @@ -31,7 +31,7 @@ - +
企业基本信息
@@ -313,8 +313,8 @@ const deleteAccount = async (row: any) => { text-align: left; } } -:deep(.el-dialog__body) { - height: 800px; +:deep(#lookDialog .el-dialog__body) { + height: 700px; overflow: auto; } diff --git a/src/views/goverment/userManagement/departmentManage/index.vue b/src/views/goverment/userManagement/departmentManage/index.vue index 64c65cd..fca5df4 100644 --- a/src/views/goverment/userManagement/departmentManage/index.vue +++ b/src/views/goverment/userManagement/departmentManage/index.vue @@ -132,7 +132,19 @@ const title = ref(""); const visible = ref(false); const Deptvisible = ref(false); const showPage = ref(false); -const formData = ref({}); +const formData = ref({ + realName: "", + userTel: "", + account: "", + password: "", + email: "", + state: 1, + sex: "", + department: "", + jobName: "", + roleId: "", + remark: "" +}); const formDataDept = ref({}); const treeDeptList = ref([]); // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数） @@ -297,6 +309,13 @@ const formConfig = reactive({ message: "请输入名称", trigger: "blur" } + ], + roleId: [ + { + required: true, + message: "请选择角色", + trigger: "blur" + } ] } }); @@ -381,20 +400,6 @@ const dataCallback = (data: any) => { }; }; -const onReset = () => { - baseFrom.value = reactive({ - parentId: undefined, - deptName: "", - priority: 1, - leader: "", - phone: "", - email: "", - status: 1 - }); - - ElMessage.success("重置成功"); -}; - const onSubmit = async () => { await editTreeDeptMent(baseFrom.value); ElMessage.success("编辑成功"); @@ -413,7 +418,19 @@ const handleEditItem = async (index: number, row: any) => { }); if (index === 1) { title.value = "新增用户"; - formData.value = reactive({}); + formData.value = reactive({ + realName: "", + userTel: "", + account: "", + password: "", + email: "", + state: 1, + sex: "", + department: "", + jobName: "", + roleId: "", + remark: "" + }); } else { title.value = "编辑用户"; formData.value = reactive({ ...row }); diff --git a/src/views/goverment/userManagement/userManage/index.vue b/src/views/goverment/userManagement/userManage/index.vue index e6dc057..667598f 100644 --- a/src/views/goverment/userManagement/userManage/index.vue +++ b/src/views/goverment/userManagement/userManage/index.vue @@ -85,7 +85,19 @@ const store = GlobalStore(); const visible = ref(false); const authorityVisible = ref(false); const title = ref(""); -const formData = ref({}); +const formData = ref({ + realName: "", + userTel: "", + account: "", + password: "", + email: "", + state: 1, + sex: "", + department: "", + jobName: "", + roleId: "", + remark: "" +}); // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数） const proTable = ref(); const authorityTable = ref(); @@ -240,6 +252,13 @@ const formConfig = reactive({ message: "请输入名称", trigger: "blur" } + ], + roleId: [ + { + required: true, + message: "请选择角色", + trigger: "blur" + } ] } }); @@ -294,7 +313,19 @@ const onSubmit = async () => { const handleEditItem = async (index: number, row: any) => { if (index === 1) { title.value = "新增用户"; - formData.value = reactive({}); + formData.value = reactive({ + realName: "", + userTel: "", + account: "", + password: "", + email: "", + state: 1, + sex: "", + department: "", + jobName: "", + roleId: "", + remark: "" + }); } else { title.value = "编辑用户"; formData.value = reactive({ ...row }); diff --git a/src/views/project/notice/myReceive/index.vue b/src/views/project/notice/myReceive/index.vue index bf1c576..d7f66e5 100644 --- a/src/views/project/notice/myReceive/index.vue +++ b/src/views/project/notice/myReceive/index.vue @@ -129,7 +129,13 @@ const columns: ColumnProps[] = [ { prop: "content", label: "通知内容", search: { el: "input" } }, { prop: "createByName", label: "发布人名称" }, { prop: "createTime", label: "发布时间" }, - { prop: "isRead", label: "阅读状态" }, + { + prop: "isRead", + label: "阅读状态", + render: scoped => { + return scoped.row.isRead === 1 ? "已读" : "未读"; + } + }, { prop: "operation", label: "操作", fixed: "right" } ]; diff --git a/src/views/project/userManagement/departmentManage/index.vue b/src/views/project/userManagement/departmentManage/index.vue index 67bd858..68f26d8 100644 --- a/src/views/project/userManagement/departmentManage/index.vue +++ b/src/views/project/userManagement/departmentManage/index.vue @@ -133,7 +133,19 @@ const title = ref(""); const visible = ref(false); const Deptvisible = ref(false); const showPage = ref(false); -const formData = ref({}); +const formData = ref({ + realName: "", + userTel: "", + account: "", + password: "", + email: "", + state: 1, + sex: "", + department: "", + jobName: "", + roleId: "", + remark: "" +}); const formDataDept = ref({}); const treeDeptList = ref([]); // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数） @@ -300,6 +312,13 @@ const formConfig = reactive({ message: "请输入名称", trigger: "blur" } + ], + roleId: [ + { + required: true, + message: "请选择角色", + trigger: "blur" + } ] } }); @@ -415,7 +434,19 @@ const handleEditItem = async (index: number, row: any) => { }); if (index === 1) { title.value = "新增用户"; - formData.value = reactive({}); + formData.value = reactive({ + realName: "", + userTel: "", + account: "", + password: "", + email: "", + state: 1, + sex: "", + department: "", + jobName: "", + roleId: "", + remark: "" + }); } else { title.value = "编辑用户"; formData.value = reactive({ ...row }); diff --git a/src/views/project/userManagement/userManage/index.vue b/src/views/project/userManagement/userManage/index.vue index 90d7109..777df27 100644 --- a/src/views/project/userManagement/userManage/index.vue +++ b/src/views/project/userManagement/userManage/index.vue @@ -85,7 +85,19 @@ const store = GlobalStore(); const visible = ref(false); const authorityVisible = ref(false); const title = ref(""); -const formData = ref({}); +const formData = ref({ + realName: "", + userTel: "", + account: "", + password: "", + email: "", + state: 1, + sex: "", + department: "", + jobName: "", + roleId: "", + remark: "" +}); // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数） const proTable = ref(); const authorityTable = ref(); @@ -240,6 +252,13 @@ const formConfig = reactive({ message: "请输入名称", trigger: "blur" } + ], + roleId: [ + { + required: true, + message: "请选择角色", + trigger: "blur" + } ] } }); @@ -312,7 +331,19 @@ const onSubmit = async () => { const handleEditItem = async (index: number, row: any) => { if (index === 1) { title.value = "新增用户"; - formData.value = reactive({}); + formData.value = reactive({ + realName: "", + userTel: "", + account: "", + password: "", + email: "", + state: 1, + sex: "", + department: "", + jobName: "", + roleId: "", + remark: "" + }); } else { title.value = "编辑用户"; formData.value = reactive({ ...row });