Skip to content

H
hg-smart
Commit 8468398f by liuyang
Options

2024-09-19 销售合同的含税总价和不含税总价改为两位小数

parent b9d8c3fd
Showing with 40 additions and 40 deletions
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW002.java
...@@ -278,7 +278,7 @@ public class HGCW002 extends DaoEPBase { ...@@ -278,7 +278,7 @@ public class HGCW002 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_TOTAL_CONTRACT_PRICE_EXCLUDING); eiColumn = new EiColumn(FIELD_TOTAL_CONTRACT_PRICE_EXCLUDING);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(2);
eiColumn.setFieldLength(15); eiColumn.setFieldLength(15);
eiColumn.setDescName("合同总价（不含税）"); eiColumn.setDescName("合同总价（不含税）");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
...@@ -292,7 +292,7 @@ public class HGCW002 extends DaoEPBase { ...@@ -292,7 +292,7 @@ public class HGCW002 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING); eiColumn = new EiColumn(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(2);
eiColumn.setFieldLength(15); eiColumn.setFieldLength(15);
eiColumn.setDescName("合同总价（含税）"); eiColumn.setDescName("合同总价（含税）");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
......
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW003.java
...@@ -161,21 +161,21 @@ public class HGCW003 extends DaoEPBase { ...@@ -161,21 +161,21 @@ public class HGCW003 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_TOTAL_PRICE_EXCLUDING); eiColumn = new EiColumn(FIELD_TOTAL_PRICE_EXCLUDING);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(2);
eiColumn.setFieldLength(15); eiColumn.setFieldLength(15);
eiColumn.setDescName("不含税总价"); eiColumn.setDescName("不含税总价");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_TOTAL_PRICE_INCLUDING); eiColumn = new EiColumn(FIELD_TOTAL_PRICE_INCLUDING);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(2);
eiColumn.setFieldLength(15); eiColumn.setFieldLength(15);
eiColumn.setDescName("含税总价"); eiColumn.setDescName("含税总价");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_LABOR_COSTS); eiColumn = new EiColumn(FIELD_LABOR_COSTS);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(2);
eiColumn.setFieldLength(15); eiColumn.setFieldLength(15);
eiColumn.setDescName("其中人工费/元"); eiColumn.setDescName("其中人工费/元");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
......
src/main/webapp/HG/CW/HGCW002A.js
...@@ -677,10 +677,10 @@ function calculateAmount(item) { ...@@ -677,10 +677,10 @@ function calculateAmount(item) {
totalPriceIncluding += parseFloat(row.totalPriceIncluding); totalPriceIncluding += parseFloat(row.totalPriceIncluding);
}); });
valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding); valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding);
$("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(3)) $("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(2))
$("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(3)) $("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(2))
$("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(3)) $("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(2))
$("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3)) $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(2))
} }
/** /**
...@@ -712,10 +712,10 @@ function calculateUnitAmount(item) { ...@@ -712,10 +712,10 @@ function calculateUnitAmount(item) {
totalPriceIncluding += parseFloat(row.totalPriceIncluding); totalPriceIncluding += parseFloat(row.totalPriceIncluding);
}); });
valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding); valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding);
$("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(3)) $("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(2))
$("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(3)) $("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(2))
$("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(3)) $("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(2))
$("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3)) $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(2))
} }
$(window).load(function () { $(window).load(function () {
refreshRowNo(); refreshRowNo();
......
src/main/webapp/HG/CW/HGCW002A.jsp
...@@ -126,10 +126,10 @@ ...@@ -126,10 +126,10 @@
<EF:EFColumn ename="provisionalQuantity" cname="暂定工程量" format="{0:N3}" align="center"/> <EF:EFColumn ename="provisionalQuantity" cname="暂定工程量" format="{0:N3}" align="center"/>
<EF:EFColumn ename="measurementMethod" cname="计量方式" align="center" /> <EF:EFColumn ename="measurementMethod" cname="计量方式" align="center" />
<EF:EFColumn ename="supplyMethod" cname="材料供应方式" align="center"/> <EF:EFColumn ename="supplyMethod" cname="材料供应方式" align="center"/>
<EF:EFColumn ename="unitPriceExcludingTax" cname="除税单价/元" format="{0:N3}" align="center"/> <EF:EFColumn ename="unitPriceExcludingTax" cname="除税单价/元" format="{0:N2}" align="center"/>
<EF:EFColumn ename="totalPriceExcluding" cname="不含税总价" enable="false" format="{0:N3}" align="center"/> <EF:EFColumn ename="totalPriceExcluding" cname="不含税总价" enable="false" format="{0:N2}" align="center"/>
<EF:EFColumn ename="totalPriceIncluding" cname="含税总价" format="{0:N3}" align="center"/> <EF:EFColumn ename="totalPriceIncluding" cname="含税总价" format="{0:N2}" align="center"/>
<EF:EFColumn ename="laborCosts" cname="其中人工费、元" format="{0:N3}" align="center"/> <EF:EFColumn ename="laborCosts" cname="其中人工费、元" format="{0:N2}" align="center"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<EF:EFRegion id="detail2" title="附件信息"> <EF:EFRegion id="detail2" title="附件信息">
......
src/main/webapp/HG/CW/HGCW002B.js
...@@ -374,10 +374,10 @@ $(function() { ...@@ -374,10 +374,10 @@ $(function() {
totalPriceIncluding += parseFloat(row.totalPriceIncluding); totalPriceIncluding += parseFloat(row.totalPriceIncluding);
}); });
valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding); valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding);
$("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(3)) $("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(2))
$("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(3)) $("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(2))
$("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(3)) $("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(2))
$("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3)) $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(2))
// 关闭弹窗 // 关闭弹窗
JSColorbox.close(); JSColorbox.close();
} }
...@@ -419,10 +419,10 @@ $(function() { ...@@ -419,10 +419,10 @@ $(function() {
totalPriceIncluding += parseFloat(row.totalPriceIncluding); totalPriceIncluding += parseFloat(row.totalPriceIncluding);
}); });
valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding); valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding);
$("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(3)) $("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(2))
$("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(3)) $("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(2))
$("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(3)) $("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(2))
$("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3)) $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(2))
//detail1Grid.setEiInfo(ei); //detail1Grid.setEiInfo(ei);
} }
}, },
...@@ -678,10 +678,10 @@ function calculateAmount(item) { ...@@ -678,10 +678,10 @@ function calculateAmount(item) {
totalPriceIncluding += parseFloat(row.totalPriceIncluding); totalPriceIncluding += parseFloat(row.totalPriceIncluding);
}); });
valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding); valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding);
$("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(3)) $("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(2))
$("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(3)) $("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(2))
$("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(3)) $("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(2))
$("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3)) $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(2))
} }
/** /**
...@@ -713,10 +713,10 @@ function calculateUnitAmount(item) { ...@@ -713,10 +713,10 @@ function calculateUnitAmount(item) {
totalPriceIncluding += parseFloat(row.totalPriceIncluding); totalPriceIncluding += parseFloat(row.totalPriceIncluding);
}); });
valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding); valueAddedTax = parseFloat(totalPriceIncluding) - parseFloat(totalPriceExcluding);
$("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(3)) $("#result-0-totalContractPriceExcluding").val(totalPriceExcluding.toFixed(2))
$("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(3)) $("#result-0-totalContractPriceIncluding").val(totalPriceIncluding.toFixed(2))
$("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(3)) $("#result-0-remainingAmount").val(totalPriceIncluding.toFixed(2))
$("#result-0-valueAddedTax").val(valueAddedTax.toFixed(3)) $("#result-0-valueAddedTax").val(valueAddedTax.toFixed(2))
} }
function fieldValidation() { function fieldValidation() {
......
src/main/webapp/HG/CW/HGCW002B.jsp
...@@ -132,10 +132,10 @@ ...@@ -132,10 +132,10 @@
<EF:EFColumn ename="provisionalQuantity" cname="暂定工程量" format="{0:N3}" align="center"/> <EF:EFColumn ename="provisionalQuantity" cname="暂定工程量" format="{0:N3}" align="center"/>
<EF:EFColumn ename="measurementMethod" cname="计量方式" align="center" /> <EF:EFColumn ename="measurementMethod" cname="计量方式" align="center" />
<EF:EFColumn ename="supplyMethod" cname="材料供应方式" align="center"/> <EF:EFColumn ename="supplyMethod" cname="材料供应方式" align="center"/>
<EF:EFColumn ename="unitPriceExcludingTax" cname="除税单价/元" format="{0:N3}" align="center"/> <EF:EFColumn ename="unitPriceExcludingTax" cname="除税单价/元" format="{0:N2}" align="center"/>
<EF:EFColumn ename="totalPriceExcluding" cname="不含税总价" enable="false" format="{0:N3}" align="center"/> <EF:EFColumn ename="totalPriceExcluding" cname="不含税总价" enable="false" format="{0:N2}" align="center"/>
<EF:EFColumn ename="totalPriceIncluding" cname="含税总价" format="{0:N3}" align="center"/> <EF:EFColumn ename="totalPriceIncluding" cname="含税总价" format="{0:N2}" align="center"/>
<EF:EFColumn ename="laborCosts" cname="其中人工费、元" format="{0:N3}" align="center"/> <EF:EFColumn ename="laborCosts" cname="其中人工费、元" format="{0:N2}" align="center"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<EF:EFRegion id="detail2" title="附件信息"> <EF:EFRegion id="detail2" title="附件信息">
......
src/main/webapp/HG/CW/HGCW002C.jsp
...@@ -89,9 +89,9 @@ ...@@ -89,9 +89,9 @@
<EF:EFColumn ename="provisionalQuantity" cname="暂定工程量" format="{0:N3}" align="center" enable="false"/> <EF:EFColumn ename="provisionalQuantity" cname="暂定工程量" format="{0:N3}" align="center" enable="false"/>
<EF:EFColumn ename="measurementMethod" cname="计量方式" align="center" enable="false"/> <EF:EFColumn ename="measurementMethod" cname="计量方式" align="center" enable="false"/>
<EF:EFColumn ename="supplyMethod" cname="材料供应方式" align="center" enable="false"/> <EF:EFColumn ename="supplyMethod" cname="材料供应方式" align="center" enable="false"/>
<EF:EFColumn ename="unitPriceExcludingTax" cname="除税单价/元" format="{0:N3}" align="center" enable="false"/> <EF:EFColumn ename="unitPriceExcludingTax" cname="除税单价/元" format="{0:N2}" align="center" enable="false"/>
<EF:EFColumn ename="totalPriceExcluding" cname="不含税总价" enable="false" format="{0:N3}" align="center" /> <EF:EFColumn ename="totalPriceExcluding" cname="不含税总价" enable="false" format="{0:N2}" align="center" />
<EF:EFColumn ename="totalPriceIncluding" cname="含税总价" enable="false" format="{0:N3}" align="center" /> <EF:EFColumn ename="totalPriceIncluding" cname="含税总价" enable="false" format="{0:N2}" align="center" />
<EF:EFColumn ename="laborCosts" cname="其中人工费、元" format="{0:N3}" align="center" enable="false"/> <EF:EFColumn ename="laborCosts" cname="其中人工费、元" format="{0:N3}" align="center" enable="false"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
......
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