From 1966dde2c03bcd0a3f15fb973c8c39b42429fa84 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 24 Mar 2023 16:20:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=88=90=E5=91=98=E7=A6=BB=E5=8E=82?=
 =?UTF-8?q?=E6=9C=89=E9=99=90=E5=88=B62?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/rpm/serializers.py | 4 ++--
 apps/rpm/views.py       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/rpm/serializers.py b/apps/rpm/serializers.py
index 4cc4ddaa..31021732 100644
--- a/apps/rpm/serializers.py
+++ b/apps/rpm/serializers.py
@@ -222,7 +222,7 @@ class RpjmemberCreateSerializer(CustomModelSerializer):
     def create(self, validated_data):
         rpj = validated_data['rpj']
         if rpj.state in [Rpj.RPJ_DONE, Rpj.RPJ_CLOSE]:
-            raise ParseError('成员该项目状态不可新增')
+            raise ParseError('该项目状态成员不可新增')
         rcertificates = validated_data.pop('rcertificates')
         remployee = validated_data['remployee']
         if remployee.phone and remployee.photo and remployee.id_number:
@@ -268,7 +268,7 @@ class RpjmemberUpdateSerializer(CustomModelSerializer):
     def update(self, instance, validated_data):
         rpj = validated_data['rpj']
         if rpj.state in [Rpj.RPJ_DONE, Rpj.RPJ_CLOSE]:
-            raise ParseError('成员该项目状态不可修改')
+            raise ParseError('该项目状态成员不可修改')
         rcertificates = validated_data.pop('rcertificates')
         with transaction.atomic():
             ins = super().update(instance, validated_data)
diff --git a/apps/rpm/views.py b/apps/rpm/views.py
index f41c7920..7335b0f7 100644
--- a/apps/rpm/views.py
+++ b/apps/rpm/views.py
@@ -205,7 +205,7 @@ class RpjViewSet(CustomModelViewSet):
         if obj.state in [Rpj.RPJ_ENTER, Rpj.RPJ_DONE]:
             raise ParseError('该项目不可删除')
         elif obj.state == Rpj.RPJ_WORKING and Remployee.objects.filter(rpj=obj).exists():
-            raise ParseError('该项目人员在厂不可删除')
+            raise ParseError('该项目下有成员在厂不可删除')
         if obj.ticket:
             obj.ticket.delete()
         obj.delete()
@@ -237,8 +237,8 @@ class RpjmemberViewSet(CustomModelViewSet):
         """
         obj = self.get_object()
         rpj = obj.rpj
-        if rpj.state != Rpj.RPJ_WORKING:
-            raise ParseError('成员非进行状态不可离厂')
+        if rpj.state != [Rpj.RPJ_WORKING, Rpj.RPJ_ENTER]:
+            raise ParseError('该项目状态成员不可离厂')
         obj.note = '提前离厂'
         obj.save()
         rpj_member_leave(obj)