Merge branch 'master' of http://8.141.155.183:3000/bjquanjiang/pinganxiaoyuan

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"

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"

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" }
+  ]
 });
 
 /**

SafeCampus.WEB/src/views/userManage/keyPersonnel/index.vue

@@ -68,10 +68,7 @@ const columns: ColumnProps<SysUserPersonnel.SysUserPerInfo>[] = [
   {
     prop: "gender",
     label: "性别",
-    enum: [{
-      label: "未知",
-      value: "GENDER_UNKNOWN"
-    },
+    enum: [
     {
       label: "男",
       value: "GENDER_MALE"

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"

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<FormInstance>();
 // 表单参数
 const sysUserProps = reactive<FormProps.Base<SysUserPersonnel.SysUserPerInfo>>({
   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<SysUserPersonnel.SysUserPerInfo>) {
     });
   }
 }
-
-// 提交数据（新增/编辑）
-const sysUserFormRef = ref<FormInstance>();
 /** 提交表单 */
 async function handleSubmit() {
   sysUserFormRef.value?.validate(async valid => {

SafeCampus.WEB/src/views/userManage/personnel/index.vue

@@ -86,7 +86,8 @@ const columns: ColumnProps<SysUserPersonnel.SysUserPerInfo>[] = [
       el: "select",
       span:1,
       props: {
-        clearable: false,
+        filterable: true,
+        clearable: true,
         placeholder: "请选择所属班级",
       },
     },
@@ -95,11 +96,7 @@ const columns: ColumnProps<SysUserPersonnel.SysUserPerInfo>[] = [
   {
     prop: "gender",
     label: "性别",
-    enum: [{
-      label: "未知",
-      value: "GENDER_UNKNOWN"
-    },
-    
+    enum: [
     {
       label: "男",
       value: "GENDER_MALE"
@@ -164,6 +161,7 @@ function onOpen(opt: FormOptEnum, record: {} | SysUserPersonnel.SysUserPerInfo =
 
 // 刷新表格
 const RefreshTable = () => {
+  proTable.value!.pageable.pageNum = 1;
   proTable.value?.refresh();
   // treeFilter.value?.refresh(); //刷新树形筛选器
 }

SafeCampus.WEB/src/views/violation/portrait/detail.vue

@@ -270,7 +270,6 @@ const state: any = reactive({
   oneCard: {} //一卡通消费情况
 });
 const genderOptions = ref<any>({
-  GENDER_UNKNOWN: "未知",
   GENDER_MALE: "男",
   GENDER_FEMALE: "女"
 });