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
b2603aec
Commit
b2603aec
authored
Jul 11, 2021
by
季圣华
Browse files
优化单据多账户
parent
c937dbc6
Changes
5
Hide whitespace changes
Inline
Side-by-side
jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
View file @
b2603aec
...
...
@@ -150,6 +150,7 @@
that
.
accountMoneyList
.
push
(
formData
.
threeAccountPrice
)
allPrice
=
allPrice
+
formData
.
threeAccountPrice
}
debugger
that
.
$emit
(
'
ok
'
,
that
.
accountIdList
,
that
.
accountMoneyList
,
allPrice
);
that
.
confirmLoading
=
false
;
that
.
close
();
...
...
jshERP-web/src/views/bill/mixins/BillModalMixin.js
View file @
b2603aec
import
{
VALIDATE_NO_PASSED
,
validateFormAndTables
}
from
'
@/utils/JEditableTableUtil
'
import
{
findBySelectSup
,
findBySelectCus
,
findBySelectRetail
,
getMaterialByBarCode
,
findStockByDepotAndBarCode
,
getAccount
,
getPersonByNumType
}
from
'
@/api/api
'
import
{
getAction
,
putAction
}
from
'
@/api/manage
'
import
{
getMpListShort
,
getNowFormatDateTime
,
changeListFmtMinus
}
from
"
@/utils/util
"
import
{
getMpListShort
,
getNowFormatDateTime
}
from
"
@/utils/util
"
import
Vue
from
'
vue
'
export
const
BillModalMixin
=
{
...
...
@@ -152,7 +152,7 @@ export const BillModalMixin = {
},
manyAccountModalFormOk
(
idList
,
moneyList
,
allPrice
)
{
this
.
accountIdList
=
idList
this
.
accountMoneyList
=
changeListFmtMinus
(
moneyList
)
this
.
accountMoneyList
=
moneyList
let
discountLastMoney
=
this
.
form
.
getFieldValue
(
'
discountLastMoney
'
)
-
0
let
otherMoney
=
this
.
form
.
getFieldValue
(
'
otherMoney
'
)
-
0
let
debt
=
(
discountLastMoney
+
otherMoney
-
allPrice
).
toFixed
(
2
)
...
...
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View file @
b2603aec
...
...
@@ -264,6 +264,11 @@
totalPrice
+=
item
.
allPrice
-
0
}
billMain
.
totalPrice
=
totalPrice
if
(
billMain
.
accountId
===
0
)
{
billMain
.
accountId
=
''
}
billMain
.
accountIdList
=
this
.
accountIdList
.
length
>
0
?
JSON
.
stringify
(
this
.
accountIdList
)
:
""
billMain
.
accountMoneyList
=
this
.
accountMoneyList
.
length
>
0
?
JSON
.
stringify
(
this
.
accountMoneyList
)
:
""
if
(
this
.
fileList
&&
this
.
fileList
.
length
>
0
)
{
billMain
.
fileName
=
this
.
fileList
}
...
...
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View file @
b2603aec
...
...
@@ -131,7 +131,7 @@
import
{
FormTypes
}
from
'
@/utils/JEditableTableUtil
'
import
{
JEditableTableMixin
}
from
'
@/mixins/JEditableTableMixin
'
import
{
BillModalMixin
}
from
'
../mixins/BillModalMixin
'
import
{
getMpListShort
}
from
"
@/utils/util
"
import
{
getMpListShort
,
changeListFmtMinus
}
from
"
@/utils/util
"
import
{
getAction
}
from
'
@/api/manage
'
import
JUpload
from
'
@/components/jeecg/JUpload
'
import
JDate
from
'
@/components/jeecg/JDate
'
...
...
@@ -269,6 +269,7 @@
if
(
billMain
.
accountId
===
0
)
{
billMain
.
accountId
=
''
}
this
.
accountMoneyList
=
changeListFmtMinus
(
this
.
accountMoneyList
)
billMain
.
accountIdList
=
this
.
accountIdList
.
length
>
0
?
JSON
.
stringify
(
this
.
accountIdList
)
:
""
billMain
.
accountMoneyList
=
this
.
accountMoneyList
.
length
>
0
?
JSON
.
stringify
(
this
.
accountMoneyList
)
:
""
if
(
this
.
fileList
&&
this
.
fileList
.
length
>
0
)
{
...
...
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View file @
b2603aec
...
...
@@ -133,7 +133,7 @@
import
{
FormTypes
}
from
'
@/utils/JEditableTableUtil
'
import
{
JEditableTableMixin
}
from
'
@/mixins/JEditableTableMixin
'
import
{
BillModalMixin
}
from
'
../mixins/BillModalMixin
'
import
{
getMpListShort
}
from
"
@/utils/util
"
import
{
getMpListShort
,
changeListFmtMinus
}
from
"
@/utils/util
"
import
{
getAction
}
from
'
@/api/manage
'
import
JSelectMultiple
from
'
@/components/jeecg/JSelectMultiple
'
import
JUpload
from
'
@/components/jeecg/JUpload
'
...
...
@@ -275,6 +275,7 @@
if
(
billMain
.
accountId
===
0
)
{
billMain
.
accountId
=
''
}
this
.
accountMoneyList
=
changeListFmtMinus
(
this
.
accountMoneyList
)
billMain
.
accountIdList
=
this
.
accountIdList
.
length
>
0
?
JSON
.
stringify
(
this
.
accountIdList
)
:
""
billMain
.
accountMoneyList
=
this
.
accountMoneyList
.
length
>
0
?
JSON
.
stringify
(
this
.
accountMoneyList
)
:
""
if
(
this
.
fileList
&&
this
.
fileList
.
length
>
0
)
{
...
...
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