diff --git a/apps/opm/views.py b/apps/opm/views.py index 4430db71..b236a2f1 100644 --- a/apps/opm/views.py +++ b/apps/opm/views.py @@ -39,6 +39,7 @@ class OperationViewSet(CustomModelViewSet): prefetch_related_fields = ['cates'] search_fields = ['name'] filterset_fields = ['state', 'cates', 'area', 'create_by'] + # data_filter = True def update(self, request, *args, **kwargs): obj = self.get_object() diff --git a/apps/rpm/serializers.py b/apps/rpm/serializers.py index 9c3f9add..e9fc7d34 100644 --- a/apps/rpm/serializers.py +++ b/apps/rpm/serializers.py @@ -127,7 +127,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]) + photo = serializers.CharField(label='照片地址', required=True) + id_number = serializers.CharField(label="身份证号", validators=[check_id_number_e], required=True) class Meta: model = Remployee @@ -140,6 +141,7 @@ class RemployeeCreateSerializer(CustomModelSerializer): class RemployeeUpdateSerializer(CustomModelSerializer): + class Meta: model = Remployee fields = ['phone', 'photo'] diff --git a/apps/utils/tools.py b/apps/utils/tools.py index 7c5d10ae..71a8a5c6 100755 --- a/apps/utils/tools.py +++ b/apps/utils/tools.py @@ -117,8 +117,8 @@ def check_id_number(idcard): idcard = idcard.strip() idcard_list = list(idcard) # 地区校验 - if not area[(idcard)[0:2]]: - return False, Errors[4] + # if not area[(idcard)[0:2]]: + # return False, Errors[4] # 15位身份号码检测 if len(idcard) == 15: diff --git a/apps/vm/serializers.py b/apps/vm/serializers.py index f5a009e2..4dda34ee 100644 --- a/apps/vm/serializers.py +++ b/apps/vm/serializers.py @@ -32,6 +32,7 @@ class VisitSerializer(CustomModelSerializer): class VisitorCreateSerializer(CustomModelSerializer): phone = serializers.CharField(label="手机号", validators=[check_phone_e]) + photo = serializers.CharField(label='照片地址', required=True) id_number = serializers.CharField(label="身份证号", validators=[check_id_number_e]) class Meta: