From c5ff289b6a8595d8432c73a53fbe362182338896 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 11:32:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BF=E5=AE=A2=E5=85=A5?=
 =?UTF-8?q?=E5=8E=82=E5=B7=A5=E4=BD=9C=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/vm/services.py |  9 +++++++--
 apps/vm/views.py    | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/apps/vm/services.py b/apps/vm/services.py
index 8ff1f463..17d7b4b2 100644
--- a/apps/vm/services.py
+++ b/apps/vm/services.py
@@ -18,7 +18,12 @@ def bind_visit(ticket, transition, new_ticket_data: dict):
     visit.ticket = ticket
     visit.state = Visit.V_AUDIT
     visit.save()
-    ticket.belong_dept = visit.receptionist.belong_dept
+    ticket_data = ticket.ticket_data
+    ticket_data.update({
+        'purpose': visit.purpose,
+    })
+    ticket.ticket_data = ticket_data
+    ticket.belong_dept = visit.receptionist.belong_dept if visit.receptionist else None
     ticket.create_by = visit.create_by
     ticket.save()
 
@@ -49,7 +54,7 @@ def visit_audit_end(ticket):
         ep.phone = visitor.phone
         ep.photo = visitor.photo
         ep.type = 'visitor'
-        ep.belong_dept = visit.receptionist.belong_dept
+        ep.belong_dept = visit.receptionist.belong_dept if visit.receptionist else None
         ep.is_deleted = False
         ep.save()
         visitor.employee = ep
diff --git a/apps/vm/views.py b/apps/vm/views.py
index 23d68062..a5db8bd4 100644
--- a/apps/vm/views.py
+++ b/apps/vm/views.py
@@ -55,17 +55,17 @@ class VisitViewSet(CustomModelViewSet):
             raise ParseError('项目非创建状态不可删除')
         return super().destroy(request, *args, **kwargs)
 
-    @action(methods=['post'], detail=True, permission_classes=[],
-            serializer_class=Serializer)
-    @transaction.atomic
-    def submit(self, request, *args, **kwargs):
-        """司机直接提交不走工单
+    # @action(methods=['post'], detail=True, permission_classes=[],
+    #         serializer_class=Serializer)
+    # @transaction.atomic
+    # def submit(self, request, *args, **kwargs):
+    #     """司机直接提交不走工单
 
-        司机直接提交不走工单
-        """
-        obj = self.get_object()
-        visit_driver_end(obj)
-        return Response()
+    #     司机直接提交不走工单
+    #     """
+    #     obj = self.get_object()
+    #     visit_driver_end(obj)
+    #     return Response()
 
 
 class VisitorViewSet(CustomModelViewSet):