Skip to content

H
hg-smart
Commit a22f748f by 宋祥
Options

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	src/main/webapp/HG/CW/HGCW008.jsp
parents 0b837ae7 af47b985
Showing with 200 additions and 171 deletions
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW002.java
...@@ -285,7 +285,7 @@ public class HGCW002 extends DaoEPBase { ...@@ -285,7 +285,7 @@ public class HGCW002 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_VALUE_ADDED_TAX); eiColumn = new EiColumn(FIELD_VALUE_ADDED_TAX);
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);
...@@ -335,7 +335,7 @@ public class HGCW002 extends DaoEPBase { ...@@ -335,7 +335,7 @@ public class HGCW002 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_REMAINING_AMOUNT); eiColumn = new EiColumn(FIELD_REMAINING_AMOUNT);
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/HGCW004.java
...@@ -168,7 +168,7 @@ public class HGCW004 extends DaoEPBase { ...@@ -168,7 +168,7 @@ public class HGCW004 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/HGCW005.java
...@@ -163,7 +163,7 @@ public class HGCW005 extends DaoEPBase { ...@@ -163,7 +163,7 @@ public class HGCW005 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/HGCW005A.java
...@@ -214,7 +214,7 @@ public class HGCW005A extends DaoEPBase { ...@@ -214,7 +214,7 @@ public class HGCW005A 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(17); eiColumn.setFieldLength(17);
eiColumn.setDescName("扣款金额"); eiColumn.setDescName("扣款金额");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
......
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW010.java
...@@ -173,28 +173,28 @@ public class HGCW010 extends DaoEPBase { ...@@ -173,28 +173,28 @@ public class HGCW010 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_THIS_SETTLEMENT_TAX); eiColumn = new EiColumn(FIELD_THIS_SETTLEMENT_TAX);
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_THIS_SETTLEMENT_AMOUNT); eiColumn = new EiColumn(FIELD_THIS_SETTLEMENT_AMOUNT);
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_TAX_POINTS); eiColumn = new EiColumn(FIELD_TAX_POINTS);
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_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);
...@@ -229,7 +229,7 @@ public class HGCW010 extends DaoEPBase { ...@@ -229,7 +229,7 @@ public class HGCW010 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_REMAINING_AMOUNT); eiColumn = new EiColumn(FIELD_REMAINING_AMOUNT);
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/HGCW010A.java
...@@ -189,56 +189,56 @@ public class HGCW010A extends DaoEPBase { ...@@ -189,56 +189,56 @@ public class HGCW010A extends DaoEPBase {
eiColumn = new EiColumn(FIELD_THIS_SETTLEMENT_AMOUNT); eiColumn = new EiColumn(FIELD_THIS_SETTLEMENT_AMOUNT);
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_THIS_SETTLEMENT_TAX); eiColumn = new EiColumn(FIELD_THIS_SETTLEMENT_TAX);
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_THIS_PRICE_TAX); eiColumn = new EiColumn(FIELD_THIS_PRICE_TAX);
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_CONTRACT_PRICE); eiColumn = new EiColumn(FIELD_TOTAL_CONTRACT_PRICE);
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_CUMULATIVE_SETTLEMENT_AMOUNT); eiColumn = new EiColumn(FIELD_CUMULATIVE_SETTLEMENT_AMOUNT);
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_CUMULATIVE_SETTLEMENT_TAX); eiColumn = new EiColumn(FIELD_CUMULATIVE_SETTLEMENT_TAX);
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_CUMULATIVE_PRICE_TAX); eiColumn = new EiColumn(FIELD_CUMULATIVE_PRICE_TAX);
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_REMAINING_AMOUNT); eiColumn = new EiColumn(FIELD_REMAINING_AMOUNT);
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/HGCW011.java
...@@ -158,7 +158,7 @@ public class HGCW011 extends DaoEPBase { ...@@ -158,7 +158,7 @@ public class HGCW011 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/HGCW012.java
...@@ -204,7 +204,7 @@ public class HGCW012 extends DaoEPBase { ...@@ -204,7 +204,7 @@ public class HGCW012 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);
...@@ -239,7 +239,7 @@ public class HGCW012 extends DaoEPBase { ...@@ -239,7 +239,7 @@ public class HGCW012 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_REMAINING_AMOUNT); eiColumn = new EiColumn(FIELD_REMAINING_AMOUNT);
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/HGCW012A.java
...@@ -183,56 +183,56 @@ public class HGCW012A extends DaoEPBase { ...@@ -183,56 +183,56 @@ public class HGCW012A extends DaoEPBase {
eiColumn = new EiColumn(FIELD_THIS_SETTLEMENT_AMOUNT); eiColumn = new EiColumn(FIELD_THIS_SETTLEMENT_AMOUNT);
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_THIS_SETTLEMENT_TAX); eiColumn = new EiColumn(FIELD_THIS_SETTLEMENT_TAX);
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_THIS_PRICE_TAX); eiColumn = new EiColumn(FIELD_THIS_PRICE_TAX);
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_CONTRACT_PRICE); eiColumn = new EiColumn(FIELD_TOTAL_CONTRACT_PRICE);
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_CUMULATIVE_SETTLEMENT_AMOUNT); eiColumn = new EiColumn(FIELD_CUMULATIVE_SETTLEMENT_AMOUNT);
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_CUMULATIVE_SETTLEMENT_TAX); eiColumn = new EiColumn(FIELD_CUMULATIVE_SETTLEMENT_TAX);
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_CUMULATIVE_PRICE_TAX); eiColumn = new EiColumn(FIELD_CUMULATIVE_PRICE_TAX);
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_REMAINING_AMOUNT); eiColumn = new EiColumn(FIELD_REMAINING_AMOUNT);
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/HGCW013.java
...@@ -163,7 +163,7 @@ public class HGCW013 extends DaoEPBase { ...@@ -163,7 +163,7 @@ public class HGCW013 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/HGCW014.java
...@@ -150,7 +150,7 @@ public class HGCW014 extends DaoEPBase { ...@@ -150,7 +150,7 @@ public class HGCW014 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/HGCW015.java
...@@ -129,7 +129,7 @@ public class HGCW015 extends DaoEPBase { ...@@ -129,7 +129,7 @@ public class HGCW015 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/HGCW016.java
...@@ -139,7 +139,7 @@ public class HGCW016 extends DaoEPBase { ...@@ -139,7 +139,7 @@ public class HGCW016 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/HGCW017.java
...@@ -121,7 +121,7 @@ public class HGCW017 extends DaoEPBase { ...@@ -121,7 +121,7 @@ public class HGCW017 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/webapp/HG/CW/HGCW004.js
...@@ -275,7 +275,11 @@ function submitFunc() { ...@@ -275,7 +275,11 @@ function submitFunc() {
return; return;
} }
var flag = true; var flag = true;
rows.forEach(function (row) { rows.forEach(function (index,row) {
if (isBlank(row.id)){
message("选中的第"+(index+1)+"行未保存的数据，请先保存！");
flag = false;
}
if (row.reviewStatus == "3") { if (row.reviewStatus == "3") {
message("勾选的数据中有已经提交的合同！"); message("勾选的数据中有已经提交的合同！");
flag = false; flag = false;
......
src/main/webapp/HG/CW/HGCW004.jsp
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<EF:EFColumn ename="projactDetail" cname="项目部位" width="120" enable="true" align="center" required="true"/> <EF:EFColumn ename="projactDetail" cname="项目部位" width="120" enable="true" align="center" required="true"/>
<EF:EFColumn ename="contractContent" cname="签证事由及内容" width="120" enable="true" align="center" required="true"/> <EF:EFColumn ename="contractContent" cname="签证事由及内容" width="120" enable="true" align="center" required="true"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" width="120" enable="true" align="center" required="true"/> <EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" width="120" enable="true" format="{0:N2}" align="right" required="true"/>
<EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="true" align="center" editType="date" <EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="true" align="center" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" required="true"/> dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" required="true"/>
<EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center" required="true" <EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center" required="true"
......
src/main/webapp/HG/CW/HGCW005.js
...@@ -110,7 +110,7 @@ function saveFunc() { ...@@ -110,7 +110,7 @@ function saveFunc() {
return; return;
} }
let flag = true; let flag = true;
$.each(rows, function(index, item) { $.each(rows, function(item,index) {
let projCode= item.get("projCode"); let projCode= item.get("projCode");
let contractContent= item.get("contractContent"); let contractContent= item.get("contractContent");
let totalContractPriceIncluding= item.get("totalContractPriceIncluding"); let totalContractPriceIncluding= item.get("totalContractPriceIncluding");
...@@ -234,7 +234,11 @@ function submitFunc() { ...@@ -234,7 +234,11 @@ function submitFunc() {
return; return;
} }
var flag = true; var flag = true;
rows.forEach(function (row) { rows.forEach(function (row,index) {
if (isBlank(row.id)){
message("选中的第"+(index+1)+"行未保存的数据，请先保存！");
flag = false;
}
if (row.reviewStatus == "3") { if (row.reviewStatus == "3") {
message("勾选的数据中有已经提交的合同！"); message("勾选的数据中有已经提交的合同！");
flag = false; flag = false;
......
src/main/webapp/HG/CW/HGCW005.jsp
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<EF:EFColumn ename="partyA" cname="甲方名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="partyA" cname="甲方名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="partyB" cname="乙方名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="partyB" cname="乙方名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="contractContent" cname="扣款事由" width="120" enable="true" align="center" required="true"/> <EF:EFColumn ename="contractContent" cname="扣款事由" width="120" enable="true" align="center" required="true"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="扣款金额" width="120" enable="true" align="center" required="true"/> <EF:EFColumn ename="totalContractPriceIncluding" cname="扣款金额" width="120" enable="true" format="{0:N2}" align="right" required="true"/>
<EF:EFColumn ename="signingDate" cname="扣款日期" width="120" enable="true" align="center" editType="date" <EF:EFColumn ename="signingDate" cname="扣款日期" width="120" enable="true" align="center" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" required="true"/> dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" required="true"/>
<EF:EFColumn ename="deliveryCode" cname="发货单号" enable="false" width="130" align="center"/> <EF:EFColumn ename="deliveryCode" cname="发货单号" enable="false" width="130" align="center"/>
......
src/main/webapp/HG/CW/HGCW005A.jsp
...@@ -51,10 +51,10 @@ ...@@ -51,10 +51,10 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false" required="true" columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false" required="true"
filter="contains"/> filter="contains"/>
<EF:EFColumn ename="spec" cname="规格" width="140" align="center" maxLength="50"/> <EF:EFColumn ename="spec" cname="规格" width="140" align="center" maxLength="50"/>
<EF:EFColumn ename="quantity" cname="数量" width="120" enable="true" format="{0:N3}" editType="text" <EF:EFColumn ename="quantity" cname="数量" width="120" enable="true" format="{0:N0}" editType="text"
displayType="0.000" sort="true" align="right" displayType="0.000" sort="true" align="right"
data-regex="/^-?[0-9]{1,15}$/" maxLength="20" required="true" data-regex="/^-?[0-9]{1,15}$/" maxLength="20" required="true"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFColumn ename="weight" cname="重量" width="120" enable="false" format="{0:N3}" editType="text" <EF:EFColumn ename="weight" cname="重量" width="120" enable="false" format="{0:N3}" editType="text"
displayType="0.000" sort="true" align="right" displayType="0.000" sort="true" align="right"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="true" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="true"
......
src/main/webapp/HG/CW/HGCW005B.jsp
...@@ -50,10 +50,10 @@ ...@@ -50,10 +50,10 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false" required="false" columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false" required="false"
filter="contains"/> filter="contains"/>
<EF:EFColumn ename="spec" cname="规格" enable="false" width="140" align="center" maxLength="50"/> <EF:EFColumn ename="spec" cname="规格" enable="false" width="140" align="center" maxLength="50"/>
<EF:EFColumn ename="quantity" cname="数量" width="120" enable="false" format="{0:N3}" editType="text" <EF:EFColumn ename="quantity" cname="数量" width="120" enable="false" format="{0:N0}" editType="text"
displayType="0.000" sort="true" align="right" displayType="0.000" sort="true" align="right"
data-regex="/^-?[0-9]{1,15}$/" maxLength="20" required="false" data-regex="/^-?[0-9]{1,15}$/" maxLength="20" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFColumn ename="weight" cname="重量" width="120" enable="false" format="{0:N3}" editType="text" <EF:EFColumn ename="weight" cname="重量" width="120" enable="false" format="{0:N3}" editType="text"
displayType="0.000" sort="true" align="right" displayType="0.000" sort="true" align="right"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false"
......
src/main/webapp/HG/CW/HGCW006A.jsp
...@@ -92,9 +92,9 @@ ...@@ -92,9 +92,9 @@
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="rowNo" cname="行号" hidden="true"/> <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
<EF:EFColumn ename="deviceName" cname="设备名称" align="center" /> <EF:EFColumn ename="deviceName" cname="设备名称" align="center" />
<EF:EFColumn ename="deviceNumber" cname="数量" format="{0:N3}" align="center"/> <EF:EFColumn ename="deviceNumber" cname="数量" format="{0:N0}" align="center"/>
<EF:EFColumn ename="unitPrice" cname="单价" format="{0:N3}" align="center"/> <EF:EFColumn ename="unitPrice" cname="单价" format="{0:N3}" align="center"/>
<EF:EFColumn ename="dayNumber" cname="天数" format="{0:N3}" align="center"/> <EF:EFColumn ename="dayNumber" cname="天数" format="{0:N0}" align="center"/>
<EF:EFColumn ename="totalPrice" cname="总价" format="{0:N2}" align="center"/> <EF:EFColumn ename="totalPrice" cname="总价" format="{0:N2}" align="center"/>
<EF:EFColumn ename="taxAmount" cname="税额" enable="false" format="{0:N2}" align="center"/> <EF:EFColumn ename="taxAmount" cname="税额" enable="false" format="{0:N2}" align="center"/>
<EF:EFColumn ename="totalPriceIncluding" cname="含税总价" enable="false" format="{0:N2}" align="center"/> <EF:EFColumn ename="totalPriceIncluding" cname="含税总价" enable="false" format="{0:N2}" align="center"/>
......
src/main/webapp/HG/CW/HGCW008.jsp
...@@ -52,11 +52,11 @@ ...@@ -52,11 +52,11 @@
<EF:EFCodeOption codeName="hggp.cw.settlementType"/> <EF:EFCodeOption codeName="hggp.cw.settlementType"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="thisSettlementAmount" cname="本次结算金额" enable="false" width="140" align="right" <EF:EFColumn ename="thisSettlementAmount" cname="本次结算金额" enable="false" width="140" align="right"
format="{0:C3}"/> format="{0:C2}"/>
<EF:EFColumn ename="thisSettlementTax" cname="本次结算税金" enable="false" width="150" align="right" <EF:EFColumn ename="thisSettlementTax" cname="本次结算税金" enable="false" width="150" align="right"
format="{0:C3}"/> format="{0:C2}"/>
<EF:EFColumn ename="thisPriceTax" cname="本次结算含税金额" enable="false" width="150" align="right" <EF:EFColumn ename="thisPriceTax" cname="本次结算含税金额" enable="false" width="150" align="right"
format="{0:C3}"/> format="{0:C2}"/>
<EF:EFColumn ename="contractDate" cname="结算日期" align="center" enable="false" editType="date" <EF:EFColumn ename="contractDate" cname="结算日期" align="center" enable="false" editType="date"
parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd"/> parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd"/>
</EF:EFGrid> </EF:EFGrid>
......
src/main/webapp/HG/CW/HGCW008E.jsp
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<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:N3}" 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>
......
src/main/webapp/HG/CW/HGCW010.jsp
...@@ -65,18 +65,18 @@ ...@@ -65,18 +65,18 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" > columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" >
<EF:EFCodeOption codeName="hggp.cw.taxPoints"/> <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" readonly="true" format="{0:C3}" editType="text" <EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" readonly="true" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" readonly="true" format="{0:C3}" editType="text" <EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" readonly="true" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="开票总额" width="120" enable="false" readonly="true" format="{0:C3}" editType="text" <EF:EFColumn ename="totalContractPriceIncluding" cname="开票总额" width="120" enable="false" readonly="true" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFComboColumn ename="billState" cname="开票状态" width="100" align="center" required="true" <EF:EFComboColumn ename="billState" cname="开票状态" width="100" align="center" required="true"
columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" > columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
<EF:EFCodeOption codeName="hggp.cw.billState"/> <EF:EFCodeOption codeName="hggp.cw.billState"/>
......
src/main/webapp/HG/CW/HGCW010A.jsp
...@@ -46,23 +46,23 @@ ...@@ -46,23 +46,23 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" > columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" >
<EF:EFCodeOption codeName="hggp.cw.taxPoints"/> <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="thisSettlementTax" cname="结算税金" width="120" enable="false" readonly="true" format="{0:N3}" editType="text" <EF:EFColumn ename="thisSettlementTax" cname="结算税金" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="thisSettlementAmount" cname="结算金额" width="120" enable="false" readonly="true" format="{0:N3}" editType="text" <EF:EFColumn ename="thisSettlementAmount" cname="结算金额" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="thisPriceTax" cname="结算含税金额" enable="false" hidden="false" format="{0:N3}" align="right"/> <EF:EFColumn ename="thisPriceTax" cname="结算含税金额" enable="false" hidden="false" format="{0:N2}" align="right"/>
<EF:EFColumn ename="thisAmount" cname="本次开票金额" width="120" enable="true" readonly="false" format="{0:N3}" editType="text" <EF:EFColumn ename="thisAmount" cname="本次开票金额" width="120" enable="true" readonly="false" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" format="{0:N3}" editType="text" <EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<div class="row" style="display:flex;justify-content:center;"> <div class="row" style="display:flex;justify-content:center;">
......
src/main/webapp/HG/CW/HGCW010B.jsp
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="开票金额" width="120" format="{0:N3}" align="right"/> <EF:EFColumn ename="totalContractPriceIncluding" cname="开票金额" width="120" format="{0:N2}" align="right"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
......
src/main/webapp/HG/CW/HGCW010C.jsp
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="开票总额" width="120" format="{0:N3}" align="right" enable="false" readonly="true"/> <EF:EFColumn ename="totalContractPriceIncluding" cname="开票总额" width="120" format="{0:N2}" align="right" enable="false" readonly="true"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
......
src/main/webapp/HG/CW/HGCW010D.jsp
...@@ -50,26 +50,26 @@ ...@@ -50,26 +50,26 @@
<EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="false" readonly="true" align="center" <EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="false" readonly="true" align="center"
editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd"/> editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd"/>
<EF:EFColumn ename="taxPoints" cname="税率(%)" width="80" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="taxPoints" cname="税率(%)" width="80" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="valueAddedTax" cname="税额" width="120" enable="false" readonly="true" format="{0:N3}" editType="text" <EF:EFColumn ename="valueAddedTax" cname="税额" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="totalContractPriceExcluding" cname="合同总价(不含税)" width="120" enable="false" readonly="true" format="{0:N3}" editType="text" <EF:EFColumn ename="totalContractPriceExcluding" cname="合同总价(不含税)" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="合同总价(含税)" width="120" enable="false" readonly="true" format="{0:N3}" editType="text" <EF:EFColumn ename="totalContractPriceIncluding" cname="合同总价(含税)" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="thisAmount" cname="本次开票金额" width="120" enable="true" readonly="false" format="{0:N3}" editType="text" <EF:EFColumn ename="thisAmount" cname="本次开票金额" width="120" enable="true" readonly="false" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" format="{0:N3}" editType="text" <EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<div class="row" style="display:flex;justify-content:center;"> <div class="row" style="display:flex;justify-content:center;">
......
src/main/webapp/HG/CW/HGCW010E.jsp
...@@ -50,26 +50,26 @@ ...@@ -50,26 +50,26 @@
<EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="false" readonly="true" align="center" <EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="false" readonly="true" align="center"
editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd"/> editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd"/>
<EF:EFColumn ename="taxPoints" cname="税率(%)" width="80" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="taxPoints" cname="税率(%)" width="80" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="valueAddedTax" cname="税额" width="120" enable="false" readonly="true" format="{0:N3}" editType="text" <EF:EFColumn ename="valueAddedTax" cname="税额" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="totalContractPriceExcluding" cname="合同总价(不含税)" width="120" enable="false" readonly="true" format="{0:N3}" editType="text" <EF:EFColumn ename="totalContractPriceExcluding" cname="合同总价(不含税)" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="合同总价(含税)" width="120" enable="false" readonly="true" format="{0:N3}" editType="text" <EF:EFColumn ename="totalContractPriceIncluding" cname="合同总价(含税)" width="120" enable="false" readonly="true" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="thisAmount" cname="本次开票金额" width="120" enable="true" readonly="false" format="{0:N3}" editType="text" <EF:EFColumn ename="thisAmount" cname="本次开票金额" width="120" enable="true" readonly="false" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" format="{0:N3}" editType="text" <EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" maxLength="15" required="false" displayType="0.000" sort="true" align="right" maxLength="15" required="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<div class="row" style="display:flex;justify-content:center;"> <div class="row" style="display:flex;justify-content:center;">
......
src/main/webapp/HG/CW/HGCW012.js
...@@ -286,13 +286,17 @@ function submitFunc() { ...@@ -286,13 +286,17 @@ function submitFunc() {
return; return;
} }
var flag = true; var flag = true;
rows.forEach(function (row) { rows.forEach(function (row,index) {
if (isBlank(row.id)){
message("选中的第"+(index+1)+"行未保存的数据，请先保存！");
flag = false;
}
if (isBlank(row.billTybe)) { if (isBlank(row.billTybe)) {
message("勾选的数据中未选择票据类型！"); message("选中的第"+(index+1)+"行未选择票据类型！");
flag = false; flag = false;
} }
if (row.reviewStatus == "3") { if (row.reviewStatus == "3") {
message("勾选的数据中有已经提交的合同！"); message("选中的第"+(index+1)+"行已经提交的合同！");
flag = false; flag = false;
} }
}) })
......
src/main/webapp/HG/CW/HGCW012.jsp
...@@ -72,18 +72,18 @@ ...@@ -72,18 +72,18 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" > columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" >
<EF:EFCodeOption codeName="hggp.cw.taxPoints"/> <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="totalContractPriceIncluding" cname="发票总额" width="120" enable="true" format="{0:C3}" editType="text" <EF:EFColumn ename="totalContractPriceIncluding" cname="发票总额" width="120" enable="true" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="true" defaultValue="0" displayType="0.000" sort="true" align="right" readonly="true" defaultValue="0"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="true" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="true"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" format="{0:C3}" editType="text" <EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" defaultValue="0" displayType="0.000" sort="true" align="right" defaultValue="0"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" format="{0:C3}" editType="text" <EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" defaultValue="0" displayType="0.000" sort="true" align="right" defaultValue="0"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center" required="true" defaultValue="0" <EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center" required="true" defaultValue="0"
columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" > columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
<EF:EFCodeOption codeName="hggp.cw.reviewStatus"/> <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>
......
src/main/webapp/HG/CW/HGCW012A.js
...@@ -238,7 +238,7 @@ $(function () { ...@@ -238,7 +238,7 @@ $(function () {
field: "amount", field: "amount",
title: "收货金额", title: "收货金额",
headerTemplate: "<span style='color: '>收货金额 </span>", headerTemplate: "<span style='color: '>收货金额 </span>",
format:"{0:C3}", format:"{0:C2}",
align:"right", align:"right",
enable: false, enable: false,
locked: false locked: false
...@@ -247,7 +247,7 @@ $(function () { ...@@ -247,7 +247,7 @@ $(function () {
field: "thisSettlementAmount", field: "thisSettlementAmount",
title: "收票总额", title: "收票总额",
headerTemplate: "<span style='color: '>收票总额 </span>", headerTemplate: "<span style='color: '>收票总额 </span>",
format:"{0:C3}", format:"{0:C2}",
align:"right", align:"right",
locked: false, locked: false,
template: function (item) { template: function (item) {
......
src/main/webapp/HG/CW/HGCW012B.jsp
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" format="{0:C3}" align="center"/> <EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" format="{0:C2}" align="center"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
......
src/main/webapp/HG/CW/HGCW012C.jsp
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</EF:EFComboColumn> </EF:EFComboColumn>
<%--<EF:EFColumn ename="partyA" cname="供应商名称" width="120" enable="false" readonly="true" align="center"/>--%> <%--<EF:EFColumn ename="partyA" cname="供应商名称" width="120" enable="false" readonly="true" align="center"/>--%>
<EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" format="{0:C3}" align="right" enable="false" readonly="true"/> <EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" format="{0:C2}" align="right" enable="false" readonly="true"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
......
src/main/webapp/HG/CW/HGCW014.js
...@@ -170,7 +170,11 @@ function submitFunc() { ...@@ -170,7 +170,11 @@ function submitFunc() {
return; return;
} }
var flag = true; var flag = true;
rows.forEach(function (row) { rows.forEach(function (row,index) {
if (isBlank(row.id)){
message("选中的第"+(index+1)+"行未保存的数据，请先保存！");
flag = false;
}
if (row.cancelStatus == "1") { if (row.cancelStatus == "1") {
message("勾选的数据中有未核销的单据！"); message("勾选的数据中有未核销的单据！");
flag = false; flag = false;
...@@ -223,7 +227,11 @@ function writeoffFunc() { ...@@ -223,7 +227,11 @@ function writeoffFunc() {
return; return;
} }
var flag = true; var flag = true;
rows.forEach(function (row) { rows.forEach(function (row,index) {
if (isBlank(row.id)){
message("选中的第"+(index+1)+"行未保存的数据，请先保存！");
flag = false;
}
if (row.cancelStatus == "2") { if (row.cancelStatus == "2") {
message("勾选的数据中有已经核销的单据！"); message("勾选的数据中有已经核销的单据！");
flag = false; flag = false;
......
src/main/webapp/HG/CW/HGCW014.jsp
...@@ -52,10 +52,10 @@ ...@@ -52,10 +52,10 @@
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/> editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="incomeNumber" cname="收款单号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="incomeNumber" cname="收款单号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" enable="true" format="{0:N3}" editType="text" <EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" enable="true" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="true" displayType="0.000" sort="true" align="right" readonly="true"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFComboColumn ename="cancelStatus" cname="核销状态" width="100" align="center" readonly="true" <EF:EFComboColumn ename="cancelStatus" cname="核销状态" width="100" align="center" readonly="true"
columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" > columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
<EF:EFCodeOption codeName="hggp.cw.cancelStatus"/> <EF:EFCodeOption codeName="hggp.cw.cancelStatus"/>
......
src/main/webapp/HG/CW/HGCW014A.jsp
...@@ -43,14 +43,14 @@ ...@@ -43,14 +43,14 @@
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="projCode" cname="项目编码" hidden="true"/> <EF:EFColumn ename="projCode" cname="项目编码" hidden="true"/>
<EF:EFColumn ename="projName" cname="项目名称" width="200" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="projName" cname="项目名称" width="200" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="thisAmount" cname="本次收款金额" width="120" enable="true" format="{0:N3}" editType="text" <EF:EFColumn ename="thisAmount" cname="本次收款金额" width="120" enable="true" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="false" displayType="0.000" sort="true" align="right" readonly="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" format="{0:N3}" editType="text" <EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="true" displayType="0.000" sort="true" align="right" readonly="true"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="partyA" cname="客户名称" width="200" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="partyA" cname="客户名称" width="200" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="settlementNumber" cname="来源单号" width="200" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="settlementNumber" cname="来源单号" width="200" enable="false" readonly="true" align="center"/>
<EF:EFComboColumn ename="billTybe" cname="票据类型" width="120" align="center" <EF:EFComboColumn ename="billTybe" cname="票据类型" width="120" align="center"
...@@ -60,18 +60,18 @@ ...@@ -60,18 +60,18 @@
<EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="false" editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd" readonly="true" align="center"/> <EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="false" editType="date" parseFormats="['yyyyMMdd']" parseFormat="yyyy-MM-dd" readonly="true" align="center"/>
<EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="taxPoints" cname="税率(%)" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="taxPoints" cname="税率(%)" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" format="{0:N3}" editType="text" <EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="true" displayType="0.000" sort="true" align="right" readonly="true"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" format="{0:N3}" editType="text" <EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="true" displayType="0.000" sort="true" align="right" readonly="true"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="开票总额" width="120" enable="false" format="{0:N3}" editType="text" <EF:EFColumn ename="totalContractPriceIncluding" cname="开票总额" width="120" enable="false" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="true" displayType="0.000" sort="true" align="right" readonly="true"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<div class="row" style="display:flex;justify-content:center;"> <div class="row" style="display:flex;justify-content:center;">
......
src/main/webapp/HG/CW/HGCW014B.jsp
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
<EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" enable="true" format="{0:N3}" editType="text" <EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" enable="true" format="{0:N2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="false" displayType="0.000" sort="true" align="right" readonly="false"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
......
src/main/webapp/HG/CW/HGCW014C.jsp
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" format="{0:N3}" align="right" enable="false" readonly="true"/> <EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" format="{0:N2}" align="right" enable="false" readonly="true"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
......
src/main/webapp/HG/CW/HGCW016.js
...@@ -40,7 +40,8 @@ $(function() { ...@@ -40,7 +40,8 @@ $(function() {
} }
return dataItem["companyCode"]; return dataItem["companyCode"];
} }
}, { },
{
field: "projCode", field: "projCode",
filter:function (option) { filter:function (option) {
let companyCode = option.model["companyCode"]; let companyCode = option.model["companyCode"];
...@@ -226,12 +227,16 @@ function submitFunc() { ...@@ -226,12 +227,16 @@ function submitFunc() {
return; return;
} }
var flag = true; var flag = true;
rows.forEach(function (row) { rows.forEach(function (row,index) {
/* if (row.cancelStatus == "1") { /* if (row.cancelStatus == "1") {
message("勾选的数据中有未核销的单据！"); message("勾选的数据中有未核销的单据！");
flag = false; flag = false;
return; return;
}*/ }*/
if (isBlank(row.id)){
message("选中的第"+(index+1)+"行未保存的数据，请先保存！");
flag = false;
}
if (row.reviewStatus == "3") { if (row.reviewStatus == "3") {
message("勾选的数据中有已经提交的单据！"); message("勾选的数据中有已经提交的单据！");
flag = false; flag = false;
...@@ -279,7 +284,11 @@ function writeoffFunc() { ...@@ -279,7 +284,11 @@ function writeoffFunc() {
return; return;
} }
var flag = true; var flag = true;
rows.forEach(function (row) { rows.forEach(function (row,index) {
if (isBlank(row.id)){
message("选中的第"+(index+1)+"行未保存的数据，请先保存！");
flag = false;
}
if (row.cancelStatus == "2") { if (row.cancelStatus == "2") {
message("勾选的数据中有已经核销的单据！"); message("勾选的数据中有已经核销的单据！");
flag = false; flag = false;
......
src/main/webapp/HG/CW/HGCW016.jsp
...@@ -56,10 +56,10 @@ ...@@ -56,10 +56,10 @@
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/> editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="incomeNumber" cname="付款单号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="incomeNumber" cname="付款单号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" enable="true" format="{0:C3}" editType="text" <EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" enable="true" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="true" displayType="0.000" sort="true" align="right" readonly="true"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFComboColumn ename="cancelStatus" cname="核销状态" width="100" align="center" readonly="true" <EF:EFComboColumn ename="cancelStatus" cname="核销状态" width="100" align="center" readonly="true"
columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" defaultValue="1"> columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" defaultValue="1">
<EF:EFCodeOption codeName="hggp.cw.cancelStatus"/> <EF:EFCodeOption codeName="hggp.cw.cancelStatus"/>
......
src/main/webapp/HG/CW/HGCW016A.jsp
...@@ -47,14 +47,14 @@ ...@@ -47,14 +47,14 @@
maxLength="16" readonly="true" width="210" required="true" maxLength="16" readonly="true" width="210" required="true"
align="center" filter="contains" sort="true"> align="center" filter="contains" sort="true">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="thisAmount" cname="本次付款金额" width="120" enable="true" format="{0:C3}" editType="text" <EF:EFColumn ename="thisAmount" cname="本次付款金额" width="120" enable="true" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" displayType="0.000" sort="true" align="right"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="true" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="true"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="remainingAmount" cname="剩余付款金额" width="120" enable="false" format="{0:C3}" editType="text" <EF:EFColumn ename="remainingAmount" cname="剩余付款金额" width="120" enable="false" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" displayType="0.000" sort="true" align="right"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="true" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="true"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFComboColumn ename="partyA" cname="供应商名称" blockName="sup_record_block_id" <EF:EFComboColumn ename="partyA" cname="供应商名称" blockName="sup_record_block_id"
columnTemplate="#=textField#" itemTemplate="#=textField#" columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField" textField="textField" valueField="valueField"
...@@ -71,18 +71,18 @@ ...@@ -71,18 +71,18 @@
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="false" /> dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="false" />
<EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="taxPoints" cname="税率(%)" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="taxPoints" cname="税率(%)" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" format="{0:C3}" editType="text" <EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="true" displayType="0.000" sort="true" align="right" readonly="true"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" format="{0:C3}" editType="text" <EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="true" displayType="0.000" sort="true" align="right" readonly="true"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="发票总额" width="120" enable="false" format="{0:C3}" editType="text" <EF:EFColumn ename="totalContractPriceIncluding" cname="发票总额" width="120" enable="false" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="true" displayType="0.000" sort="true" align="right" readonly="true"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<div class="row" style="display:flex;justify-content:center;"> <div class="row" style="display:flex;justify-content:center;">
......
src/main/webapp/HG/CW/HGCW016B.jsp
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
align="center" filter="contains" sort="true"> align="center" filter="contains" sort="true">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" enable="true" format="{0:C3}" editType="text" <EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" enable="true" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" displayType="0.000" sort="true" align="right"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
......
src/main/webapp/HG/CW/HGCW016C.jsp
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
align="center" filter="contains" sort="true"> align="center" filter="contains" sort="true">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/> <EF:EFColumn ename="contractNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" enable="false" format="{0:C3}" editType="text" <EF:EFColumn ename="totalContractPriceIncluding" cname="付款总额" width="120" enable="false" format="{0:C2}" editType="text"
displayType="0.000" sort="true" align="right" readonly="true" displayType="0.000" sort="true" align="right" readonly="true"
data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="false" data-regex="/^-?[0-9]{1,15}([.][0-9]{1,2})?$/" maxLength="15" required="false"
data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数和2位小数！"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
......
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