Merge branch 'crm1.0' into debug

controllers/contract_approval.go

@@ -161,6 +161,10 @@ func (this *ContractApprovalCommon) List() {
 			list[i].EndDateStr = item.EndDate.Format(utils.FormatDate)
 			list[i].CreateTimeStr = item.CreateTime.Format(utils.FormatDateTime)
 			list[i].ModifyTimeStr = item.ModifyTime.Format(utils.FormatDateTime)
+			if item.Status == "已审批" || item.Status == "已驳回" {
+				list[i].ApproveTime = item.ModifyTime
+				list[i].ApproveTimeStr = item.ModifyTime.Format(utils.FormatDateTime)
+			}
 
 			//list[i].ContractInfo = contractDetail
 			//校验最新审批流数据
@@ -242,6 +246,7 @@ func (this *ContractApprovalCommon) Detail() {
 	contractDetail.Status = contractInfo.Status
 	contractDetail.FileUrl = contractInfo.FileUrl
 	contractDetail.CheckBackFileUrl = contractInfo.CheckBackFileUrl
+	//contractDetail.A = contractInfo.CheckBackFileUrl
 
 	//审批操作权限，上传签回文件权限
 	contractOpButton, flowNodeListResp, err := contractService.GetOpButton(contractInfo, contractApprovalInfo, this.AdminWx)

controllers/seal_approval.go

@@ -170,35 +170,40 @@ func (this *SealApprovalCommon) List() {
 			list[i].CreateTimeStr = item.CreateTime.Format(utils.FormatDateTime)
 			list[i].ModifyTimeStr = item.ModifyTime.Format(utils.FormatDateTime)
 
+			if item.Status == "已审批" || item.Status == "已驳回" {
+				list[i].ApproveTime = item.ModifyTime
+				list[i].ApproveTimeStr = item.ModifyTime.Format(utils.FormatDateTime)
+			}
+
 			//list[i].ContractInfo = contractDetail
 			//校验最新审批流数据
-			if contractApprovalRecord, has := contractApprovalRecordMap[item.ContractApprovalId]; has {
-				//审批流id
-				list[i].ContractApprovalRecordId = contractApprovalRecord.ContractApprovalRecordId
-				//审批时间
-				list[i].ApproveTime = contractApprovalRecord.ApproveTime
-				list[i].ApproveTimeStr = contractApprovalRecord.ApproveTime.Format(utils.FormatDateTime)
-				//判断是否有操作权限
-				list[i].Status = contractApprovalRecord.Status
-
-				//判断是否处于待审批状态
-				//if contractApprovalRecord.Status == "待审批" {
-				//	//如果不是审批者，那么不能审批操作
-				//	if contractApprovalRecord.NodeType != "check" {
-				//		continue
-				//	}
-				//	//如果没有指定审批人的话
-				//	if contractApprovalRecord.ApproveUserId <= 0 {
-				//		//判断是否与审批角色一致，如果一致，那么允许操作审批
-				//		if contractApprovalRecord.ApproveRoleTypeCode == sysUser.RoleTypeCode {
-				//			list[i].CanApprovalButton = true
-				//		}
-				//	} else if contractApprovalRecord.ApproveUserId == sysUser.AdminId {
-				//		//如果指定审批人就是自己的话，那么操作审批
-				//		list[i].CanApprovalButton = true
-				//	}
-				//}
-			}
+			//if contractApprovalRecord, has := contractApprovalRecordMap[item.ContractApprovalId]; has {
+			//	//审批流id
+			//	list[i].ContractApprovalRecordId = contractApprovalRecord.ContractApprovalRecordId
+			//	//审批时间
+			//	list[i].ApproveTime = contractApprovalRecord.ApproveTime
+			//	list[i].ApproveTimeStr = contractApprovalRecord.ApproveTime.Format(utils.FormatDateTime)
+			//	//判断是否有操作权限
+			//	list[i].Status = contractApprovalRecord.Status
+			//
+			//	//判断是否处于待审批状态
+			//	//if contractApprovalRecord.Status == "待审批" {
+			//	//	//如果不是审批者，那么不能审批操作
+			//	//	if contractApprovalRecord.NodeType != "check" {
+			//	//		continue
+			//	//	}
+			//	//	//如果没有指定审批人的话
+			//	//	if contractApprovalRecord.ApproveUserId <= 0 {
+			//	//		//判断是否与审批角色一致，如果一致，那么允许操作审批
+			//	//		if contractApprovalRecord.ApproveRoleTypeCode == sysUser.RoleTypeCode {
+			//	//			list[i].CanApprovalButton = true
+			//	//		}
+			//	//	} else if contractApprovalRecord.ApproveUserId == sysUser.AdminId {
+			//	//		//如果指定审批人就是自己的话，那么操作审批
+			//	//		list[i].CanApprovalButton = true
+			//	//	}
+			//	//}
+			//}
 
 			//合同状态（突然说要改成展示合同状态，那就根据业务需求，改成返回：合同状态咯）
 			list[i].Status = item.SealStatus