caipin 4 tahun lalu
induk
melakukan
d817e4b11f
2 mengubah file dengan 17 tambahan dan 14 penghapusan
  1. 2 0
      services/contract_service.go
  2. 15 14
      web/viewmodels/contract.go

+ 2 - 0
services/contract_service.go

@@ -706,6 +706,8 @@ func (s *contractService) makeContractVM(contract *models.CmContracts) viewmodel
 	// returned, _ := strconv.ParseFloat(contract.Returned, 64)
 	// paid, _ := strconv.ParseFloat(contract.Paid, 64)
 
+	price, _ := strconv.ParseFloat(contract.Price, 64)
+	contractsVM.PriceFloat = price
 	contractsVM.Price = contract.Price
 	contractsVM.Returned = contract.Returned
 	contractsVM.Paid = contract.Paid

+ 15 - 14
web/viewmodels/contract.go

@@ -11,20 +11,21 @@ import (
 )
 
 type Contracts struct {
-	Id            string `form:"id" json:"id" `
-	TreeId        string `form:"treeId" json:"treeId" `
-	ContractsType int    `form:"contractsType" json:"contractsType" `
-	ProjectId     string `form:"projectId" json:"projectId" `
-	BidsectionId  string `form:"bidsectionId" json:"bidsectionId" `
-	Name          string `form:"name" json:"name" `
-	Code          string `form:"code" json:"code" `
-	Price         string `form:"price" json:"price" `
-	Returned      string `form:"returned" json:"returned" `
-	Paid          string `form:"paid" json:"paid" `
-	Status        int    `form:"status" json:"status" `
-	Locking       int    `form:"locking" json:"locking" `
-	CreateTime    string `form:"createTime" json:"createTime" `
-	UpdateTime    string `form:"updateTime" json:"updateTime" `
+	Id            string  `form:"id" json:"id" `
+	TreeId        string  `form:"treeId" json:"treeId" `
+	ContractsType int     `form:"contractsType" json:"contractsType" `
+	ProjectId     string  `form:"projectId" json:"projectId" `
+	BidsectionId  string  `form:"bidsectionId" json:"bidsectionId" `
+	Name          string  `form:"name" json:"name" `
+	Code          string  `form:"code" json:"code" `
+	PriceFloat    float64 `form:"priceFloat" json:"priceFloat" `
+	Price         string  `form:"price" json:"price" `
+	Returned      string  `form:"returned" json:"returned" `
+	Paid          string  `form:"paid" json:"paid" `
+	Status        int     `form:"status" json:"status" `
+	Locking       int     `form:"locking" json:"locking" `
+	CreateTime    string  `form:"createTime" json:"createTime" `
+	UpdateTime    string  `form:"updateTime" json:"updateTime" `
 
 	Content      string `form:"content" json:"content" `
 	PartyA       string `form:"partyA" json:"partyA" `