|
@@ -237,6 +237,7 @@ func (rg *RegisterController) Add(c *gin.Context) {
|
|
ob.Remark = req.Remark
|
|
ob.Remark = req.Remark
|
|
ob.ServiceRemark = req.ServiceRemark
|
|
ob.ServiceRemark = req.ServiceRemark
|
|
ob.HasPayment = req.HasPayment
|
|
ob.HasPayment = req.HasPayment
|
|
|
|
+ ob.NewCompany = req.NewCompany
|
|
ob.Set()
|
|
ob.Set()
|
|
// 存在代付的直接完成登记, 且不允许进行开票/到款登记
|
|
// 存在代付的直接完成登记, 且不允许进行开票/到款登记
|
|
if req.HasPayment == 1 {
|
|
if req.HasPayment == 1 {
|
|
@@ -350,7 +351,7 @@ func (rg *RegisterController) Edit(c *gin.Context) {
|
|
updateCols := []string{
|
|
updateCols := []string{
|
|
"ContractCode", "RelateContractCode", "CrmContractId", "ContractSource", "CompanyName", "ActualCompanyName",
|
|
"ContractCode", "RelateContractCode", "CrmContractId", "ContractSource", "CompanyName", "ActualCompanyName",
|
|
"SellerId", "SellerName", "ContractType", "ContractAmount", "StartDate", "EndDate", "SignDate", "AgreedPayTime",
|
|
"SellerId", "SellerName", "ContractType", "ContractAmount", "StartDate", "EndDate", "SignDate", "AgreedPayTime",
|
|
- "ContractStatus", "RegisterStatus", "Remark", "ServiceRemark", "HasPayment", "ModifyTime",
|
|
|
|
|
|
+ "ContractStatus", "RegisterStatus", "Remark", "ServiceRemark", "HasPayment", "NewCompany", "ModifyTime",
|
|
}
|
|
}
|
|
nowTime := time.Now().Local()
|
|
nowTime := time.Now().Local()
|
|
item.ContractCode = req.ContractCode
|
|
item.ContractCode = req.ContractCode
|
|
@@ -372,6 +373,7 @@ func (rg *RegisterController) Edit(c *gin.Context) {
|
|
item.Remark = req.Remark
|
|
item.Remark = req.Remark
|
|
item.ServiceRemark = req.ServiceRemark
|
|
item.ServiceRemark = req.ServiceRemark
|
|
item.HasPayment = req.HasPayment
|
|
item.HasPayment = req.HasPayment
|
|
|
|
+ item.NewCompany = req.NewCompany
|
|
item.ModifyTime = nowTime
|
|
item.ModifyTime = nowTime
|
|
// 存在代付的直接完成登记, 且不允许进行开票/到款登记
|
|
// 存在代付的直接完成登记, 且不允许进行开票/到款登记
|
|
if req.HasPayment == 1 {
|
|
if req.HasPayment == 1 {
|