From d24a265b1d9a07f409d78900d36f22fd215da612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Thu, 22 Sep 2022 10:31:32 +0800
Subject: [PATCH] =?UTF-8?q?phone,id=5Fnumber=E5=8A=A0=E5=85=A5=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/hrm/serializers.py | 4 +++-
 apps/rpm/serializers.py | 3 +++
 apps/utils/tools.py     | 2 +-
 apps/vm/serializers.py  | 4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/hrm/serializers.py b/apps/hrm/serializers.py
index 405c23e6..ca8070eb 100755
--- a/apps/hrm/serializers.py
+++ b/apps/hrm/serializers.py
@@ -15,7 +15,7 @@ from apps.third.clients import dhClient
 from apps.third.tapis import dhapis
 from django.conf import settings
 from django.core.cache import cache
-from apps.utils.tools import check_phone_e
+from apps.utils.tools import check_id_number_e, check_phone_e
 
 
 class EmployeeSimpleSerializer(CustomModelSerializer):
@@ -37,6 +37,8 @@ class EmployeeSimpleSerializer(CustomModelSerializer):
 
 
 class EmployeeCreateUpdateSerializer(CustomModelSerializer):
+    phone = serializers.CharField(label="手机号", validators=[check_phone_e])
+    id_number = serializers.CharField(label="身份证号", validators=[check_id_number_e])
 
     class Meta:
         model = Employee
diff --git a/apps/rpm/serializers.py b/apps/rpm/serializers.py
index 9d336f5a..12e0eb20 100644
--- a/apps/rpm/serializers.py
+++ b/apps/rpm/serializers.py
@@ -12,6 +12,7 @@ from rest_framework.exceptions import ParseError
 from django.db import transaction
 from apps.third.clients import dhClient
 from apps.third.tapis import dhapis
+from apps.utils.tools import check_id_number_e, check_phone_e
 from apps.wf.serializers import TicketSimpleSerializer
 
 
@@ -125,6 +126,8 @@ class RpjListSerializer(CustomModelSerializer):
 
 class RemployeeCreateSerializer(CustomModelSerializer):
     rparty = serializers.PrimaryKeyRelatedField(queryset=Rparty.objects.all(), label='相关方ID', required=False)
+    phone = serializers.CharField(label="手机号", validators=[check_phone_e])
+    id_number = serializers.CharField(label="身份证号", validators=[check_id_number_e])
 
     class Meta:
         model = Remployee
diff --git a/apps/utils/tools.py b/apps/utils/tools.py
index 631e780c..8bcb373c 100755
--- a/apps/utils/tools.py
+++ b/apps/utils/tools.py
@@ -171,7 +171,7 @@ def check_id_number(idcard):
 
 
 def check_phone_e(phone):
-    re_phone = r'^((13[0-9])|(14(0|[5-7]|9))|(15([0-3]|[5-9]))|(16(2|[5-7]))|(17[0-8])|(18[0-9])|(19([0-3]|[5-9])))\\d{8}$'
+    re_phone = r'/^1\d{10}$/'
     if not re.match(re_phone, phone):
         raise ValidationError('手机号格式错误')
     return phone
diff --git a/apps/vm/serializers.py b/apps/vm/serializers.py
index 062d1d92..f5a009e2 100644
--- a/apps/vm/serializers.py
+++ b/apps/vm/serializers.py
@@ -1,8 +1,9 @@
 
+from wsgiref.validate import validator
 from apps.hrm.serializers import EmployeeSimpleSerializer
 from apps.utils.fields import MyFilePathField
 from apps.utils.serializers import CustomModelSerializer
-from apps.utils.tools import check_phone_e
+from apps.utils.tools import check_id_number_e, check_phone_e
 from apps.vm.models import Visit, Visitor, Vpeople
 from rest_framework import serializers
 from rest_framework.exceptions import ParseError
@@ -31,6 +32,7 @@ class VisitSerializer(CustomModelSerializer):
 
 class VisitorCreateSerializer(CustomModelSerializer):
     phone = serializers.CharField(label="手机号", validators=[check_phone_e])
+    id_number = serializers.CharField(label="身份证号", validators=[check_id_number_e])
 
     class Meta:
         model = Visitor