animeic 2 vuotta sitten
vanhempi
commit
b7960f2179

+ 6 - 2
boxcost/api/plan-cost-excel.go

@@ -258,8 +258,10 @@ func (b *PlanCostExcel) drawAllContent() error {
 									stageStatus = "未审核"
 								}
 
-							} else {
+							} else if splan.State[stage.BillId] == "complete" {
 								stageStatus = "已完成"
+							} else {
+								stageStatus = "订单已销毁"
 							}
 						}
 
@@ -448,8 +450,10 @@ func (b *PlanCostExcel) drawSupplierContent() error {
 											stageStatus = "未审核"
 										}
 
-									} else {
+									} else if splan.State[stage.BillId] == "complete" {
 										stageStatus = "已完成"
+									} else {
+										stageStatus = "订单已销毁"
 									}
 								}
 

+ 6 - 2
boxcost/api/plan-summary-excel.go

@@ -260,8 +260,10 @@ func (b *PlanSummaryExcel) drawAllContent() error {
 									stageStatus = "未审核"
 								}
 
-							} else {
+							} else if splan.State[stage.BillId] == "complete" {
 								stageStatus = "已完成"
+							} else {
+								stageStatus = "订单已销毁"
 							}
 						}
 
@@ -462,8 +464,10 @@ func (b *PlanSummaryExcel) drawSupplierContent() error {
 											stageStatus = "未审核"
 										}
 
-									} else {
+									} else if splan.State[stage.BillId] == "complete" {
 										stageStatus = "已完成"
+									} else {
+										stageStatus = "订单已销毁"
 									}
 								}
 

+ 6 - 2
boxcost/api/summary-sample-excel.go

@@ -160,9 +160,11 @@ func (b *SummarySampleExcel) drawAllContent() error {
 									stageStatus = "未审核"
 								}
 
-							} else {
+							} else if splan.State[stage.BillId] == "complete" {
 								stageStatus = "已完成"
 								statusMark = "【v】"
+							} else {
+								stageStatus = "订单已销毁"
 							}
 						}
 
@@ -314,9 +316,11 @@ func (b *SummarySampleExcel) drawSupplierContent() error {
 											stageStatus = "未审核"
 										}
 
-									} else {
+									} else if splan.State[stage.BillId] == "complete" {
 										stageStatus = "已完成"
 										statusMark = "【v】"
+									} else {
+										stageStatus = "订单已销毁"
 									}
 								}
 								fmt.Println(stageStatus)