Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
f0ecf2b7
Commit
f0ecf2b7
authored
May 28, 2022
by
季圣华
Browse files
解决单据明细中重复商品进行批次发货遇到的问题
parent
d453c659
Changes
3
Hide whitespace changes
Inline
Side-by-side
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View file @
f0ecf2b7
...
...
@@ -280,7 +280,8 @@
{
title
:
'
税率
'
,
key
:
'
taxRate
'
,
width
:
'
3%
'
,
type
:
FormTypes
.
inputNumber
,
placeholder
:
'
%
'
},
{
title
:
'
税额
'
,
key
:
'
taxMoney
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
inputNumber
,
readonly
:
true
,
statistics
:
true
},
{
title
:
'
价税合计
'
,
key
:
'
taxLastMoney
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
inputNumber
,
statistics
:
true
},
{
title
:
'
备注
'
,
key
:
'
remark
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
input
}
{
title
:
'
备注
'
,
key
:
'
remark
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
input
},
{
title
:
'
关联id
'
,
key
:
'
linkId
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
hidden
},
]
},
confirmLoading
:
false
,
...
...
@@ -425,6 +426,7 @@
info
.
taxMoney
=
(
info
.
allPrice
*
taxRate
/
100
).
toFixed
(
2
)
-
0
info
.
taxLastMoney
=
(
info
.
allPrice
+
info
.
taxMoney
).
toFixed
(
2
)
-
0
}
info
.
linkId
=
info
.
id
allTaxLastMoney
+=
info
.
taxLastMoney
listEx
.
push
(
info
)
this
.
changeColumnShow
(
info
)
...
...
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View file @
f0ecf2b7
...
...
@@ -212,7 +212,8 @@
{
title
:
'
税率
'
,
key
:
'
taxRate
'
,
width
:
'
3%
'
,
type
:
FormTypes
.
inputNumber
,
placeholder
:
'
%
'
},
{
title
:
'
税额
'
,
key
:
'
taxMoney
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
inputNumber
,
readonly
:
true
,
statistics
:
true
},
{
title
:
'
价税合计
'
,
key
:
'
taxLastMoney
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
inputNumber
,
statistics
:
true
},
{
title
:
'
备注
'
,
key
:
'
remark
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
input
}
{
title
:
'
备注
'
,
key
:
'
remark
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
input
},
{
title
:
'
关联id
'
,
key
:
'
linkId
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
hidden
},
]
},
confirmLoading
:
false
,
...
...
@@ -334,6 +335,7 @@
info
.
taxLastMoney
=
info
.
allPrice
discountLastMoney
+=
info
.
allPrice
}
info
.
linkId
=
info
.
id
}
this
.
$nextTick
(()
=>
{
this
.
form
.
setFieldsValue
({
...
...
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View file @
f0ecf2b7
...
...
@@ -284,7 +284,8 @@
{
title
:
'
税率
'
,
key
:
'
taxRate
'
,
width
:
'
3%
'
,
type
:
FormTypes
.
inputNumber
,
placeholder
:
'
%
'
},
{
title
:
'
税额
'
,
key
:
'
taxMoney
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
inputNumber
,
readonly
:
true
,
statistics
:
true
},
{
title
:
'
价税合计
'
,
key
:
'
taxLastMoney
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
inputNumber
,
statistics
:
true
},
{
title
:
'
备注
'
,
key
:
'
remark
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
input
}
{
title
:
'
备注
'
,
key
:
'
remark
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
input
},
{
title
:
'
关联id
'
,
key
:
'
linkId
'
,
width
:
'
5%
'
,
type
:
FormTypes
.
hidden
},
]
},
confirmLoading
:
false
,
...
...
@@ -431,6 +432,7 @@
info
.
taxMoney
=
(
info
.
allPrice
*
taxRate
/
100
).
toFixed
(
2
)
-
0
info
.
taxLastMoney
=
(
info
.
allPrice
+
info
.
taxMoney
).
toFixed
(
2
)
-
0
}
info
.
linkId
=
info
.
id
allTaxLastMoney
+=
info
.
taxLastMoney
listEx
.
push
(
info
)
this
.
changeColumnShow
(
info
)
...
...
Write
Preview
Supports
Markdown
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