From 7f9ffb1b2e89c86f8e1fa078a889fb35bd0ef013 Mon Sep 17 00:00:00 2001 From: suyanyan <1321717064@qq.com> Date: Thu, 26 Sep 2024 10:01:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=80=A7=E5=88=AB?= =?UTF-8?q?=E6=9C=AA=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SafeCampus.WEB/src/views/screen/stureturn.vue | 4 ---- .../userManage/keyPersonnel/components/form/form_basic.vue | 4 ---- SafeCampus.WEB/src/views/userManage/keyPersonnel/index.vue | 5 +---- .../userManage/personnel/components/form/form_basic.vue | 4 ---- SafeCampus.WEB/src/views/userManage/personnel/index.vue | 6 +----- SafeCampus.WEB/src/views/violation/portrait/detail.vue | 1 - 6 files changed, 2 insertions(+), 22 deletions(-) diff --git a/SafeCampus.WEB/src/views/screen/stureturn.vue b/SafeCampus.WEB/src/views/screen/stureturn.vue index 4bac293..338cf70 100644 --- a/SafeCampus.WEB/src/views/screen/stureturn.vue +++ b/SafeCampus.WEB/src/views/screen/stureturn.vue @@ -107,10 +107,6 @@ const refresh = (fn = () => {}, time = 5000) => { }; // 性别 const genderOptions = ref([ - { - label: "未知", - value: "GENDER_UNKNOWN" - }, { label: "男", value: "GENDER_MALE" diff --git a/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/form_basic.vue b/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/form_basic.vue index 19d2dd6..a0320f6 100644 --- a/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/form_basic.vue +++ b/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/form_basic.vue @@ -121,10 +121,6 @@ const handleAvatarError: UploadProps["onError"] = (error, uploadFile, uploadFile }; // 通用状态选项 const genderOptions = ref([ - { - label: "未知", - value: "GENDER_UNKNOWN" - }, { label: "男", value: "GENDER_MALE" diff --git a/SafeCampus.WEB/src/views/userManage/keyPersonnel/index.vue b/SafeCampus.WEB/src/views/userManage/keyPersonnel/index.vue index f6375a8..7a0fb76 100644 --- a/SafeCampus.WEB/src/views/userManage/keyPersonnel/index.vue +++ b/SafeCampus.WEB/src/views/userManage/keyPersonnel/index.vue @@ -68,10 +68,7 @@ const columns: ColumnProps[] = [ { prop: "gender", label: "性别", - enum: [{ - label: "未知", - value: "GENDER_UNKNOWN" - }, + enum: [ { label: "男", value: "GENDER_MALE" diff --git a/SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue b/SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue index d486327..119a694 100644 --- a/SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue +++ b/SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue @@ -147,10 +147,6 @@ const handleAvatarError: UploadProps["onError"] = (error, uploadFile, uploadFile }; // 通用状态选项 const genderOptions = ref([ - { - label: "未知", - value: "GENDER_UNKNOWN" - }, { label: "男", value: "GENDER_MALE" diff --git a/SafeCampus.WEB/src/views/userManage/personnel/index.vue b/SafeCampus.WEB/src/views/userManage/personnel/index.vue index a5a1ebf..4a6b09d 100644 --- a/SafeCampus.WEB/src/views/userManage/personnel/index.vue +++ b/SafeCampus.WEB/src/views/userManage/personnel/index.vue @@ -95,11 +95,7 @@ const columns: ColumnProps[] = [ { prop: "gender", label: "性别", - enum: [{ - label: "未知", - value: "GENDER_UNKNOWN" - }, - + enum: [ { label: "男", value: "GENDER_MALE" diff --git a/SafeCampus.WEB/src/views/violation/portrait/detail.vue b/SafeCampus.WEB/src/views/violation/portrait/detail.vue index 4c64def..957fb53 100644 --- a/SafeCampus.WEB/src/views/violation/portrait/detail.vue +++ b/SafeCampus.WEB/src/views/violation/portrait/detail.vue @@ -270,7 +270,6 @@ const state: any = reactive({ oneCard: {} //一卡通消费情况 }); const genderOptions = ref({ - GENDER_UNKNOWN: "未知", GENDER_MALE: "男", GENDER_FEMALE: "女" }); From 65fa6fc91b46ca9484dcf8473d894239139059b2 Mon Sep 17 00:00:00 2001 From: suyanyan <1321717064@qq.com> Date: Fri, 27 Sep 2024 11:36:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../userManage/keyPersonnel/components/form/index.vue | 7 +++++-- .../userManage/personnel/components/form/index.vue | 11 ++++++----- .../src/views/userManage/personnel/index.vue | 4 +++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue b/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue index cd0a535..407bd69 100644 --- a/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue +++ b/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue @@ -33,7 +33,7 @@ import { FormOptEnum } from "@/enums"; import { required } from "@/utils/formRules"; import { FormInstance } from "element-plus"; import Basic from "./form_basic.vue"; - +import { checkPhoneNumber } from "@/utils/eleValidate"; const visible = ref(false); //是否显示表单 const activeName = ref("basic"); // 表单参数 @@ -48,7 +48,10 @@ const rules = reactive({ name: [required("请输入姓名")], gender: [required("请选择性别")], faces: [required("请上传人脸图片")], - phone: [required("请输入手机号")] + phone: [ + { required: true, message: "请输入手机号", trigger: "blur" }, + { validator: checkPhoneNumber, trigger: "blur" } + ] }); /** diff --git a/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue b/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue index 046ed2c..cb438b1 100644 --- a/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue +++ b/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue @@ -33,9 +33,10 @@ import { FormOptEnum } from "@/enums"; import { required } from "@/utils/formRules"; import { FormInstance } from "element-plus"; import Basic from "./form_basic.vue"; - +import { checkPhoneNumber } from "@/utils/eleValidate"; const visible = ref(false); //是否显示表单 const activeName = ref("basic"); +const sysUserFormRef = ref(); // 表单参数 const sysUserProps = reactive>({ opt: FormOptEnum.ADD, @@ -48,7 +49,10 @@ const rules = reactive({ name: [required("请输入姓名")], gender: [required("请选择性别")], faces: [required("请上传人脸图片")], - phone: [required("请输入手机号")], + phone: [ + { required: true, message: "请输入手机号", trigger: "blur" }, + { validator: checkPhoneNumber, trigger: "blur" } + ], // depId: [required("请选择系部")], // majorId: [required("请选择专业")], personSetId: [required("请选择班级")] @@ -75,9 +79,6 @@ function onOpen(props: FormProps.Base) { }); } } - -// 提交数据（新增/编辑） -const sysUserFormRef = ref(); /** 提交表单 */ async function handleSubmit() { sysUserFormRef.value?.validate(async valid => { diff --git a/SafeCampus.WEB/src/views/userManage/personnel/index.vue b/SafeCampus.WEB/src/views/userManage/personnel/index.vue index 4a6b09d..5553623 100644 --- a/SafeCampus.WEB/src/views/userManage/personnel/index.vue +++ b/SafeCampus.WEB/src/views/userManage/personnel/index.vue @@ -86,7 +86,8 @@ const columns: ColumnProps[] = [ el: "select", span:1, props: { - clearable: false, + filterable: true, + clearable: true, placeholder: "请选择所属班级", }, }, @@ -160,6 +161,7 @@ function onOpen(opt: FormOptEnum, record: {} | SysUserPersonnel.SysUserPerInfo = // 刷新表格 const RefreshTable = () => { + proTable.value!.pageable.pageNum = 1; proTable.value?.refresh(); // treeFilter.value?.refresh(); //刷新树形筛选器 }