Commit 0b837ae7 by 宋祥

1.合并解决冲突,保留2为小数

parent 77089dc4
...@@ -77,8 +77,8 @@ ...@@ -77,8 +77,8 @@
format="{0:N3}" align="right"/> format="{0:N3}" align="right"/>
<EF:EFColumn ename="unit" cname="单位" align="center"/> <EF:EFColumn ename="unit" cname="单位" align="center"/>
<EF:EFColumn ename="unitPrice" cname="含税单价" format="{0:N3}" align="right"/> <EF:EFColumn ename="unitPrice" cname="含税单价" format="{0:N3}" align="right"/>
<EF:EFColumn ename="totalPrice" cname="不含税总价" enable="false" format="{0:N3}" align="right"/> <EF:EFColumn ename="totalPrice" cname="不含税总价" enable="false" format="{0:N2}" align="right"/>
<EF:EFColumn ename="totalTaxPrice" cname="含税总价" format="{0:N3}" align="right"/> <EF:EFColumn ename="totalTaxPrice" cname="含税总价" format="{0:N2}" align="right"/>
<EF:EFColumn ename="remarks" cname="备注" align="left"/> <EF:EFColumn ename="remarks" cname="备注" align="left"/>
<EF:EFColumn ename="inventoryId" cname="清单id" hidden="true"/> <EF:EFColumn ename="inventoryId" cname="清单id" hidden="true"/>
</EF:EFGrid> </EF:EFGrid>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment