|
@@ -3155,10 +3155,10 @@ Group by PriceType ", dto.diId);
|
|
|
|
|
|
|
|
|
//内容
|
|
|
- string typeStr = d.PriceTypeStr + d.PriceDetailTypeStr;
|
|
|
- cells["B" + rowIndex.ToString()].PutValue(typeStr);
|
|
|
+ string typeStr = d.PriceDetailTypeStr + d.PriceName;
|
|
|
+ cells["B" + rowIndex.ToString()].PutValue(d.PriceTypeStr);
|
|
|
cells["C" + rowIndex.ToString()].PutValue(d.PriceDtStr);
|
|
|
- cells["D" + rowIndex.ToString()].PutValue(d.PriceName);
|
|
|
+ cells["D" + rowIndex.ToString()].PutValue(typeStr);
|
|
|
cells["E" + rowIndex.ToString()].PutValue(d.Price.ToString("#0.00"));
|
|
|
cells["F" + rowIndex.ToString()].PutValue(d.PriceCount);
|
|
|
cells["G" + rowIndex.ToString()].PutValue(d.Currency);
|