Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hg-smart
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
platform
hg-smart
Commits
d802110d
Commit
d802110d
authored
Sep 13, 2024
by
liuyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2024-09-13
1.结算单金额显示优化 2.销售开票金额显示优化
parent
88d5cc85
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
23 deletions
+23
-23
HGCW008.jsp
src/main/webapp/HG/CW/HGCW008.jsp
+4
-4
HGCW008A.jsp
src/main/webapp/HG/CW/HGCW008A.jsp
+4
-4
HGCW008B.jsp
src/main/webapp/HG/CW/HGCW008B.jsp
+4
-4
HGCW008C.jsp
src/main/webapp/HG/CW/HGCW008C.jsp
+4
-4
HGCW010.jsp
src/main/webapp/HG/CW/HGCW010.jsp
+5
-5
HGCW010B.jsp
src/main/webapp/HG/CW/HGCW010B.jsp
+1
-1
HGCW010C.jsp
src/main/webapp/HG/CW/HGCW010C.jsp
+1
-1
No files found.
src/main/webapp/HG/CW/HGCW008.jsp
View file @
d802110d
...
...
@@ -36,7 +36,7 @@
<EF:EFRegion
id=
"result"
title=
"记录集"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"no"
isFloat=
"true"
autoBind=
"false"
checkMode=
"single row"
>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"operator"
cname=
"操作"
locked=
"true"
enable=
"false"
width=
"
20
0"
align=
"center"
/>
<EF:EFColumn
ename=
"operator"
cname=
"操作"
locked=
"true"
enable=
"false"
width=
"
17
0"
align=
"center"
/>
<EF:EFColumn
ename=
"companyName"
cname=
"所属公司"
align=
"center"
enable=
"false"
/>
<EF:EFColumn
ename=
"projCode"
cname=
"项目编号"
align=
"center"
enable=
"false"
/>
<EF:EFColumn
ename=
"projName"
cname=
"项目名称"
align=
"center"
enable=
"false"
/>
...
...
@@ -47,9 +47,9 @@
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
enable=
"false"
>
<EF:EFCodeOption
codeName=
"hggp.cw.settlementType"
/>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"thisSettlementAmount"
cname=
"本次结算金额"
align=
"
center"
enable=
"false
"
/>
<EF:EFColumn
ename=
"thisSettlementTax"
cname=
"本次结算税金"
align=
"
center"
enable=
"false
"
/>
<EF:EFColumn
ename=
"thisPriceTax"
cname=
"本次结算含税金额"
align=
"
center"
enable=
"false
"
/>
<EF:EFColumn
ename=
"thisSettlementAmount"
cname=
"本次结算金额"
align=
"
right"
enable=
"false"
format=
"{0:C3}
"
/>
<EF:EFColumn
ename=
"thisSettlementTax"
cname=
"本次结算税金"
align=
"
right"
enable=
"false"
format=
"{0:C3}
"
/>
<EF:EFColumn
ename=
"thisPriceTax"
cname=
"本次结算含税金额"
align=
"
right"
enable=
"false"
format=
"{0:C3}
"
/>
<EF:EFColumn
ename=
"contractDate"
cname=
"结算日期"
align=
"center"
enable=
"false"
editType=
"date"
parseFormats=
"['yyyyMMdd']"
parseFormat=
"yyyy-MM-dd"
/>
<EF:EFComboColumn
ename=
"reviewStatus"
cname=
"审批状态"
width=
"100"
align=
"center"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
enable=
"false"
>
...
...
src/main/webapp/HG/CW/HGCW008A.jsp
View file @
d802110d
...
...
@@ -69,11 +69,11 @@
<EF:EFColumn
ename=
"settlementBasis"
cname=
"结算依据"
align=
"center"
/>
<EF:EFColumn
ename=
"taskName"
cname=
"任务名称"
align=
"center"
/>
<EF:EFColumn
ename=
"engineeringContent"
cname=
"工程内容"
align=
"center"
/>
<EF:EFColumn
ename=
"thisEngineeringQuantity"
cname=
"本次结算工程量"
format=
"{0:N3}"
align=
"
center
"
/>
<EF:EFColumn
ename=
"cumulativeEngineeringQuantity"
cname=
"至本次累计结算工程量"
format=
"{0:N3}"
align=
"
center
"
enable=
"false"
/>
<EF:EFColumn
ename=
"thisEngineeringQuantity"
cname=
"本次结算工程量"
format=
"{0:N3}"
align=
"
right
"
/>
<EF:EFColumn
ename=
"cumulativeEngineeringQuantity"
cname=
"至本次累计结算工程量"
format=
"{0:N3}"
align=
"
right
"
enable=
"false"
/>
<EF:EFColumn
ename=
"unit"
cname=
"单位"
align=
"center"
/>
<EF:EFColumn
ename=
"unitPrice"
cname=
"单价"
format=
"{0:N3}"
align=
"
center
"
/>
<EF:EFColumn
ename=
"totalPrice"
cname=
"合价"
enable=
"false"
format=
"{0:N3}"
align=
"
center
"
/>
<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=
"remarks"
cname=
"备注"
align=
"center"
/>
<EF:EFColumn
ename=
"inventoryId"
cname=
"清单id"
hidden=
"true"
/>
</EF:EFGrid>
...
...
src/main/webapp/HG/CW/HGCW008B.jsp
View file @
d802110d
...
...
@@ -69,11 +69,11 @@
<EF:EFColumn
ename=
"settlementBasis"
cname=
"结算依据"
align=
"center"
/>
<EF:EFColumn
ename=
"taskName"
cname=
"任务名称"
align=
"center"
/>
<EF:EFColumn
ename=
"engineeringContent"
cname=
"工程内容"
align=
"center"
/>
<EF:EFColumn
ename=
"thisEngineeringQuantity"
cname=
"本次结算工程量"
format=
"{0:N3}"
align=
"
center
"
/>
<EF:EFColumn
ename=
"cumulativeEngineeringQuantity"
cname=
"至本次累计结算工程量"
format=
"{0:N3}"
align=
"
center
"
enable=
"false"
/>
<EF:EFColumn
ename=
"thisEngineeringQuantity"
cname=
"本次结算工程量"
format=
"{0:N3}"
align=
"
right
"
/>
<EF:EFColumn
ename=
"cumulativeEngineeringQuantity"
cname=
"至本次累计结算工程量"
format=
"{0:N3}"
align=
"
right
"
enable=
"false"
/>
<EF:EFColumn
ename=
"unit"
cname=
"单位"
align=
"center"
/>
<EF:EFColumn
ename=
"unitPrice"
cname=
"单价"
format=
"{0:N3}"
align=
"
center
"
/>
<EF:EFColumn
ename=
"totalPrice"
cname=
"合价"
enable=
"false"
format=
"{0:N3}"
align=
"
center
"
/>
<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=
"remarks"
cname=
"备注"
align=
"center"
/>
<EF:EFColumn
ename=
"inventoryId"
cname=
"清单id"
hidden=
"true"
/>
</EF:EFGrid>
...
...
src/main/webapp/HG/CW/HGCW008C.jsp
View file @
d802110d
...
...
@@ -59,11 +59,11 @@
<EF:EFColumn
ename=
"settlementBasis"
cname=
"结算依据"
align=
"center"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"taskName"
cname=
"任务名称"
align=
"center"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"engineeringContent"
cname=
"工程内容"
align=
"center"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"thisEngineeringQuantity"
cname=
"本次结算工程量"
format=
"{0:N3}"
align=
"
center
"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"cumulativeEngineeringQuantity"
cname=
"至本次累计结算工程量"
format=
"{0:N3}"
align=
"
center
"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"thisEngineeringQuantity"
cname=
"本次结算工程量"
format=
"{0:N3}"
align=
"
right
"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"cumulativeEngineeringQuantity"
cname=
"至本次累计结算工程量"
format=
"{0:N3}"
align=
"
right
"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"unit"
cname=
"单位"
align=
"center"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"unitPrice"
cname=
"单价"
format=
"{0:N3}"
align=
"
center
"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"totalPrice"
cname=
"合价"
format=
"{0:N3}"
align=
"
center
"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"unitPrice"
cname=
"单价"
format=
"{0:N3}"
align=
"
right
"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"totalPrice"
cname=
"合价"
format=
"{0:N3}"
align=
"
right
"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"remarks"
cname=
"备注"
align=
"center"
readonly=
"true"
enable=
"false"
/>
<EF:EFColumn
ename=
"inventoryId"
cname=
"清单id"
hidden=
"true"
/>
</EF:EFGrid>
...
...
src/main/webapp/HG/CW/HGCW010.jsp
View file @
d802110d
...
...
@@ -60,20 +60,20 @@
</EF:EFComboColumn>
<EF:EFColumn
ename=
"signingDate"
cname=
"开票日期"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
editType=
"date"
parseFormats=
"['yyyyMMdd']"
parseFormat=
"yyyy-MM-dd"
/>
<EF:EFColumn
ename=
"billNumber"
cname=
"发票号"
width=
"120"
format=
"{0:N3}"
align=
"center"
/>
<EF:EFComboColumn
ename=
"taxPoints"
cname=
"税率"
width=
"
12
0"
align=
"center"
required=
"true"
<EF:EFColumn
ename=
"billNumber"
cname=
"发票号"
width=
"120"
align=
"center"
/>
<EF:EFComboColumn
ename=
"taxPoints"
cname=
"税率"
width=
"
8
0"
align=
"center"
required=
"true"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
enable=
"true"
>
<EF:EFCodeOption
codeName=
"hggp.cw.taxPoints"
/>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"thisSettlementAmount"
cname=
"不含税金额"
width=
"120"
enable=
"false"
readonly=
"true"
format=
"{0:
N
3}"
editType=
"text"
<EF:EFColumn
ename=
"thisSettlementAmount"
cname=
"不含税金额"
width=
"120"
enable=
"false"
readonly=
"true"
format=
"{0:
C
3}"
editType=
"text"
displayType=
"0.000"
sort=
"true"
align=
"right"
maxLength=
"15"
required=
"false"
data-regex=
"/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
data-errorprompt=
"请输入数字,该值最大可设置15位整数和3位小数!"
/>
<EF:EFColumn
ename=
"thisSettlementTax"
cname=
"税额"
width=
"120"
enable=
"false"
readonly=
"true"
format=
"{0:
N
3}"
editType=
"text"
<EF:EFColumn
ename=
"thisSettlementTax"
cname=
"税额"
width=
"120"
enable=
"false"
readonly=
"true"
format=
"{0:
C
3}"
editType=
"text"
displayType=
"0.000"
sort=
"true"
align=
"right"
maxLength=
"15"
required=
"false"
data-regex=
"/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
data-errorprompt=
"请输入数字,该值最大可设置15位整数和3位小数!"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"开票总额"
width=
"120"
enable=
"false"
readonly=
"true"
format=
"{0:
N
3}"
editType=
"text"
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"开票总额"
width=
"120"
enable=
"false"
readonly=
"true"
format=
"{0:
C
3}"
editType=
"text"
displayType=
"0.000"
sort=
"true"
align=
"right"
maxLength=
"15"
required=
"false"
data-regex=
"/^-?[0-9]{1,15}([.][0-9]{1,3})?$/"
data-errorprompt=
"请输入数字,该值最大可设置15位整数和3位小数!"
/>
...
...
src/main/webapp/HG/CW/HGCW010B.jsp
View file @
d802110d
...
...
@@ -14,7 +14,7 @@
<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=
"settlementNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"开票金额"
width=
"120"
format=
"{0:N3}"
align=
"
center
"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"开票金额"
width=
"120"
format=
"{0:N3}"
align=
"
right
"
/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
...
...
src/main/webapp/HG/CW/HGCW010C.jsp
View file @
d802110d
...
...
@@ -14,7 +14,7 @@
<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=
"settlementNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"开票总额"
width=
"120"
format=
"{0:N3}"
align=
"
center
"
enable=
"false"
readonly=
"true"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"开票总额"
width=
"120"
format=
"{0:N3}"
align=
"
right
"
enable=
"false"
readonly=
"true"
/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment