Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory

apps/ofm/services.py

@@ -31,6 +31,7 @@ def mroombooking_reject(ticket: Ticket, transition, new_ticket_data: dict):
             
 def bind_lendingseal(ticket: Ticket, transition, new_ticket_data: dict):
     ins = LendingSeal.objects.get(id=new_ticket_data['t_id'])
+    ins.actual_return_date = None
     ticket_data = ticket.ticket_data
     ticket_data.update({
         't_model': 'LendingSeal',
@@ -42,6 +43,7 @@ def bind_lendingseal(ticket: Ticket, transition, new_ticket_data: dict):
     if ins.ticket is None:
         ins.ticket = ticket
         ins.save()
+    # 如果驳回到开始状态
 
 def lending_save_ticket_data(ticket: Ticket, new_ticket_data: dict, **kwargs):
     try:
@@ -62,6 +64,8 @@ def bind_vehicle(ticket: Ticket, transition, new_ticket_data: dict):
         't_model': 'Vehicle',
         't_id': ins.id,
     })
+    ins.actual_km = None
+    ins.end_time = None
     ticket.ticket_data = ticket_data
     ticket.create_by = ins.create_by
     ticket.save()
@@ -87,6 +91,7 @@ def bind_file(ticket: Ticket, transition, new_ticket_data: dict):
         't_model': 'BorrowRecord',
         't_id': ins.id,
     })
+    ins.return_date = None
     ticket.ticket_data = ticket_data
     ticket.create_by = ins.create_by
     ticket.save()
@@ -112,6 +117,10 @@ def bind_publicity(ticket: Ticket, transition, new_ticket_data: dict):
         't_model': 'publicity',
         't_id': ins.id,
     })
+    ins.dept_opinion = None
+    ins.secret_period = None
+    ins.dept_opinion_review = None
+    ins.publicity_opinion = None
     ticket.ticket_data = ticket_data
     ticket.create_by = ins.create_by
     ticket.save()