Browse Source

审批详情页增加合同来源标签

xiexiaoyuan 2 years ago
parent
commit
5e6ea5a8b3

+ 1 - 0
models/tables/company_approval/company_approval.go

@@ -123,6 +123,7 @@ type CompanyApprovalList struct {
 	CurrNodeId          int    `description:"当前审批操作节点"`
 	ApplyContractType   int    `description:"申请合同类型  0 非标  1 标准"`
 	ApplyUserId         int    `description:"申请人编号id" json:"-"`
+	ContractSourceTag   string `description:"合同来源标签:非标合同,标准合同"`
 }
 
 // GetApprovalList 获取客户单列表

+ 1 - 0
models/tables/company_contract/company_contract.go

@@ -42,6 +42,7 @@ type CompanyContractDetail struct {
 	ModifyTime        time.Time `description:"合同修改时间"`
 	Status            int       `description:"状态"`
 	PackageType       int       `description:"套餐类型,0:无,1:大套餐,2:小套餐"`
+	Source            string    `description:"合同来源:上传附件, 系统合同"`
 	PermissionList    []*company_report_permission.PermissionLookList
 }
 

+ 11 - 0
services/company_approval/company_approval.go

@@ -1042,6 +1042,17 @@ func GetApprovalDetailByCompanyApprovalId(companyApprovalId int, opUser *custom.
 		err = errors.New("获取客户单详情失败,ERR:" + err.Error())
 		return
 	}
+	//查询相关的合同详情
+	if approvalItem.CompanyContractId > 0 {
+		companyContractDetail, e := company_contract.GetCompanyContractDetail(approvalItem.CompanyId, approvalItem.ProductId, approvalItem.CompanyContractId)
+		if e == nil {
+			if companyContractDetail.Source == "系统合同" {
+				approvalItem.ContractSourceTag = "标准合同"
+			}else{
+				approvalItem.ContractSourceTag = "非标合同"
+			}
+		}
+	}
 	if approvalItem.FreezeStartDate != "" && approvalItem.FreezeEndDate != "" && approvalItem.Status == utils.COMPANY_STATUS_FREEZE {
 		freezeEndDate, _ := time.Parse(utils.FormatDate, approvalItem.FreezeEndDate)
 		if time.Now().Before(freezeEndDate) {