优化修改密码
This commit is contained in:
@@ -462,8 +462,8 @@ class EditProject(APIView):
|
||||
Approval.objects.create(
|
||||
title=(responsiblefor or original_responsiblefor) + "立项登记重新编辑",
|
||||
content=(responsiblefor or original_responsiblefor) + "在" + (
|
||||
times or original_times) + "办理立项登记,项目类型:" + original_type + ",合同编号:" + original_ContractNo + "描述:" + ",负责人:" + (
|
||||
responsiblefor or original_responsiblefor) + ",收费情况:" + (charge or original_charge),
|
||||
times or original_times) + "办理立项登记,项目类型:" + original_type + ",合同编号:" + original_ContractNo + "描述:" + ",负责人:" + (
|
||||
responsiblefor or original_responsiblefor) + ",收费情况:" + (charge or original_charge),
|
||||
times=formatted_date,
|
||||
personincharge="", # personincharge不再从请求中获取
|
||||
state='审核中',
|
||||
@@ -890,25 +890,26 @@ class caseManagementDetail(APIView):
|
||||
# ProjectRegistration 可能不存在(如果还没有立项登记),使用 filter().first() 而不是 get()
|
||||
pro = ProjectRegistration.objects.filter(user_id=info.user_id, is_deleted=False).first()
|
||||
|
||||
data.append({
|
||||
"id": info.id,
|
||||
"ContractNo": pro.ContractNo if pro else None, # 合同编号
|
||||
"type": pro.type if pro else None, # 项目类型
|
||||
"type_pro": pro.type if pro else None, # 项目类型(保留兼容)
|
||||
"client_username": pre.client_username, # 委托人信息
|
||||
"party_username": pre.party_username, # 相对方信息
|
||||
"description": pre.description, # 项目简述
|
||||
"responsiblefor": pro.responsiblefor if pro else None, # 负责人
|
||||
"charge": pro.charge if pro else None,
|
||||
'times': info.times,
|
||||
"AgencyContract": info.AgencyContract,
|
||||
"Contractreturn": info.Contractreturn,
|
||||
"Closingapplication": info.Closingapplication,
|
||||
"ChangeRequest": info.ChangeRequest,
|
||||
"paymentcollection": info.paymentcollection,
|
||||
"state": info.state,
|
||||
"user_id": info.user_id,
|
||||
})
|
||||
if pro:
|
||||
data.append({
|
||||
"id": info.id,
|
||||
"ContractNo": pro.ContractNo if pro else None, # 合同编号
|
||||
"type": pro.type if pro else None, # 项目类型
|
||||
"type_pro": pro.type if pro else None, # 项目类型(保留兼容)
|
||||
"client_username": pre.client_username, # 委托人信息
|
||||
"party_username": pre.party_username, # 相对方信息
|
||||
"description": pre.description, # 项目简述
|
||||
"responsiblefor": pro.responsiblefor if pro else None, # 负责人
|
||||
"charge": pro.charge if pro else None,
|
||||
'times': info.times,
|
||||
"AgencyContract": info.AgencyContract,
|
||||
"Contractreturn": info.Contractreturn,
|
||||
"Closingapplication": info.Closingapplication,
|
||||
"ChangeRequest": info.ChangeRequest,
|
||||
"paymentcollection": info.paymentcollection,
|
||||
"state": info.state,
|
||||
"user_id": info.user_id,
|
||||
})
|
||||
|
||||
return Response({'message': '展示成功', "total": total, 'data': data, 'code': 0}, status=status.HTTP_200_OK)
|
||||
|
||||
@@ -1364,8 +1365,8 @@ class EditApplication(APIView):
|
||||
Approval.objects.create(
|
||||
title=app.username + "申请用印重新编辑",
|
||||
content=app.username + "在" + date_str + "申请用印,用印事由:" + (
|
||||
Reason or app.Reason) + ",盖章份数:" + (seal_number or app.seal_number) + "盖着类型:" + (
|
||||
seal_type or app.seal_type),
|
||||
Reason or app.Reason) + ",盖章份数:" + (seal_number or app.seal_number) + "盖着类型:" + (
|
||||
seal_type or app.seal_type),
|
||||
times=date_str,
|
||||
personincharge=format_personincharge(personincharge, is_department=False) if personincharge else "",
|
||||
# 审批员用户名
|
||||
|
||||
Reference in New Issue
Block a user