diff --git a/User/views.py b/User/views.py index c6cb104..4cde07e 100644 --- a/User/views.py +++ b/User/views.py @@ -1405,7 +1405,9 @@ class roxyExhibition(APIView): itme["approvers_order"] = approvers_order_list_proj content_val_proj = itme.get("content") or "" if submitter_proj and "申请人:" not in content_val_proj and "提交人:" not in content_val_proj: - itme["content"] = content_val_proj.rstrip() + ",申请人:" + submitter_proj + content_val_proj = content_val_proj.rstrip() + ",申请人:" + submitter_proj + # 待办展示:负责人统一显示为承办人 + itme["content"] = content_val_proj.replace("负责人:", "承办人:").replace("负责人:", "承办人:") except (ValueError, TypeError, AttributeError): itme["approvers_order"] = [] try: diff --git a/business/views.py b/business/views.py index 9b74dd4..c374b0a 100644 --- a/business/views.py +++ b/business/views.py @@ -1017,7 +1017,7 @@ class EditProject(APIView): from User.utils import create_approval_with_team_logic team_name = get_team_name_from_responsiblefor(responsiblefor_dict if responsiblefor else original_responsiblefor) content = current_responsiblefor + "在" + ( - times or original_times) + "办理立项登记,项目类型:" + original_type + ",合同编号:" + original_ContractNo + "描述:" + ",负责人:" + responsible_desc + ",收费情况:" + (charge or original_charge) + ",申请人:" + applicant_name + times or original_times) + "办理立项登记,项目类型:" + original_type + ",合同编号:" + original_ContractNo + "描述:" + ",承办人:" + responsible_desc + ",收费情况:" + (charge or original_charge) + ",申请人:" + applicant_name approval, approvers_order_json, needs_approval = create_approval_with_team_logic( team_name=team_name, approvers=approvers,