|
@@ -1126,9 +1126,9 @@ namespace OASystem.API.Controllers
|
|
|
string currencyCode = currData.Find(it => it.Id == item.Currency)?.Remark ?? "Unknown";
|
|
|
SetCells(ChildTable, doc, rowIndex, 2, item.Cost.ToString("#0.00") + currencyCode + "/晚");
|
|
|
SetCells(ChildTable, doc, rowIndex, 3, " 汇率" + (item.SubTotal / item.Cost).ToString("#0.00"));
|
|
|
- SetCells(ChildTable, doc, rowIndex, 4, "CNY" + item.SubTotal + "\r\n");
|
|
|
+ SetCells(ChildTable, doc, rowIndex, 4, "CNY " + item.SubTotal + "\r\n");
|
|
|
rowIndex++;
|
|
|
- zsinfo += item.Place + " " + days + "晚 " + item.Cost.ToString("#0.00") + currencyCode + "/晚" + " 汇率" + (item.SubTotal / item.Cost).ToString("#0.0000") + " CNY" + item.SubTotal * days + "\r\n";
|
|
|
+ zsinfo += item.Place + " " + days + "晚 " + item.Cost.ToString("#0.00") + currencyCode + "/晚" + " 汇率" + (item.SubTotal / item.Cost).ToString("#0.0000") + " CNY " + item.SubTotal * days + "\r\n";
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -1163,9 +1163,9 @@ namespace OASystem.API.Controllers
|
|
|
string currencyCode = currData.Find(it => it.Id == item.Currency)?.Remark ?? "Unknown";
|
|
|
SetCells(ChildTable1, doc, rowIndex, 2, item.Cost.ToString("#0.00") + currencyCode + "/天");
|
|
|
SetCells(ChildTable1, doc, rowIndex, 3, " 汇率" + (item.SubTotal / item.Cost).ToString("#0.00"));
|
|
|
- SetCells(ChildTable1, doc, rowIndex, 4, "CNY" + item.SubTotal);
|
|
|
+ SetCells(ChildTable1, doc, rowIndex, 4, "CNY " + item.SubTotal);
|
|
|
rowIndex++;
|
|
|
- hsinfo += item.Place + " " + days + "天 " + item.Cost.ToString("#0.00") + currencyCode + "/天" + " 汇率" + (item.SubTotal / item.Cost).ToString("#0.0000") + " CNY" + item.SubTotal * days + "\r\n";
|
|
|
+ hsinfo += item.Place + " " + days + "天 " + item.Cost.ToString("#0.00") + currencyCode + "/天" + " 汇率" + (item.SubTotal / item.Cost).ToString("#0.0000") + " CNY " + item.SubTotal * days + "\r\n";
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -1200,9 +1200,9 @@ namespace OASystem.API.Controllers
|
|
|
string currencyCode = currData.Find(it => it.Id == item.Currency)?.Remark ?? "Unknown";
|
|
|
SetCells(ChildTable2, doc, rowIndex, 2, item.Cost.ToString("#0.00") + currencyCode + "/天");
|
|
|
SetCells(ChildTable2, doc, rowIndex, 3, " 汇率" + (item.SubTotal / item.Cost).ToString("#0.00"));
|
|
|
- SetCells(ChildTable2, doc, rowIndex, 4, "CNY" + item.SubTotal + "\r\n");
|
|
|
+ SetCells(ChildTable2, doc, rowIndex, 4, "CNY " + item.SubTotal + "\r\n");
|
|
|
rowIndex++;
|
|
|
- gzinfo += item.Place + " " + days + "天 " + item.Cost.ToString("#0.00") + currencyCode + "/天" + " 汇率" + (item.SubTotal / item.Cost).ToString("#0.00") + " CNY" + item.SubTotal * days + "\r\n";
|
|
|
+ gzinfo += item.Place + " " + days + "天 " + item.Cost.ToString("#0.00") + currencyCode + "/天" + " 汇率" + (item.SubTotal / item.Cost).ToString("#0.00") + " CNY " + item.SubTotal * days + "\r\n";
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -1339,7 +1339,6 @@ namespace OASystem.API.Controllers
|
|
|
r.Font.Size = 8;
|
|
|
//把设置的值赋给之前新建的段落
|
|
|
p.AppendChild(r);
|
|
|
-
|
|
|
//将此段落加到单元格内
|
|
|
lshCell.AppendChild(p);
|
|
|
}
|