1

comm/functions.go

@@ -97,6 +97,8 @@ func MakeFolderContract(Data []*viewmodels.FolderContract, node *viewmodels.Fold
 		qualityTotalRectificationFinish := 0
 		qualityTotalApproval := 0
 		qualityTotalClose := 0
+		// 总扣款金额
+		contractDeductionPriceTotal := 0.00
 
 		for _, v := range childs { //查询子节点的子节点，并添加到子节点
 			_, has := HaveChildContract(Data, v)
@@ -147,6 +149,10 @@ func MakeFolderContract(Data []*viewmodels.FolderContract, node *viewmodels.Fold
 			qualityTotalRectificationFinish = qualityTotalRectificationFinish + v.QualityRectificationFinish
 			qualityTotalApproval = qualityTotalApproval + v.QualityApproval
 			qualityTotalClose = qualityTotalClose + v.QualityClose
+
+			// 1-7 总扣款金额
+			contractDeductionTotal, _ := strconv.ParseFloat(v.ContractDeductionTotal, 64)
+			contractDeductionPriceTotal = contractDeductionPriceTotal + contractDeductionTotal
 		}
 
 		// 汇款进度
@@ -187,6 +193,9 @@ func MakeFolderContract(Data []*viewmodels.FolderContract, node *viewmodels.Fold
 		node.QualityRectificationFinish = qualityTotalRectificationFinish
 		node.QualityApproval = qualityTotalApproval
 		node.QualityClose = qualityTotalClose
+
+		// 总扣款金额
+		node.ContractDeductionTotal = fmt.Sprintf("%.2f", contractDeductionPriceTotal)
 	}
 }