Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
Project
Project
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
TFMOM
TF-MOM-WEB
Commits
58e3462e
Commit
58e3462e
authored
Nov 10, 2023
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
领用出库申领数量取消校验
parent
bfa3bc17
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
AddOutStorageUseDetailDialog.vue
...ageUseDetails/components/AddOutStorageUseDetailDialog.vue
+3
-3
index.vue
.../src/privateComponents/components/EditReqAmount/index.vue
+9
-9
No files found.
applications/dee-mes/src/privateComponents/components/AddOutStorageUseDetails/components/AddOutStorageUseDetailDialog.vue
View file @
58e3462e
...
...
@@ -98,9 +98,9 @@ export default {
this
.
$refs
[
'applyForm'
].
validate
((
valid
)
=>
{
if
(
valid
&&
this
.
selection
)
{
const
typeName
=
this
.
basicData
.
useRequestType
const
maxAmount
=
typeName
===
'scrapUse'
?
this
.
selection
.
reqAmountOri
:
typeName
===
'materialUse'
?
Math
.
min
(
this
.
selection
.
unableAmount
,
this
.
selection
.
applyAmount
)
:
this
.
selection
.
unableAmount
const
maxWarning
=
typeName
===
'scrapUse'
?
'出库数量'
:
typeName
===
'materialUse'
?
'可用数量及可申领数量'
:
'可用数量'
if
(
this
.
applyForm
.
reqAmount
>
maxAmount
)
return
this
.
$utils
.
showMessageWarning
(
`申领数量不能大于当前选中物料的
${
maxWarning
}
!`
)
//
const maxAmount = typeName === 'scrapUse' ? this.selection.reqAmountOri : typeName === 'materialUse' ? Math.min(this.selection.unableAmount, this.selection.applyAmount) : this.selection.unableAmount
//
const maxWarning = typeName === 'scrapUse' ? '出库数量' : typeName === 'materialUse' ? '可用数量及可申领数量' : '可用数量'
//
if (this.applyForm.reqAmount > maxAmount) return this.$utils.showMessageWarning(`申领数量不能大于当前选中物料的${maxWarning}!`)
const
data
=
[{
'subTypeName'
:
'OutStorageUseItem'
,
'extMaterial'
:
this
.
selection
.
extMaterial
,
...
...
applications/dee-mes/src/privateComponents/components/EditReqAmount/index.vue
View file @
58e3462e
...
...
@@ -49,21 +49,21 @@ export default {
handler
(
val
)
{
this
.
reqAmount
=
val
}
},
'form.unableAmount'
:
{
immediate
:
true
,
handler
(
val
)
{
val
&&
(
this
.
maxNum
=
val
)
}
}
// 'form.unableAmount': {
// immediate: true,
// handler(val) {
// val && (this.maxNum = val)
// }
// }
},
created
()
{
},
methods
:
{
handleChange
()
{
if
(
this
.
parentType_Inject
===
'scrapUse'
&&
this
.
form
.
extSupportingItemVO
&&
this
.
reqAmount
>
this
.
form
.
extSupportingItemVO
.
reqAmount
)
{
this
.
maxNum
=
this
.
form
.
extSupportingItemVO
.
reqAmount
}
//
if (this.parentType_Inject === 'scrapUse' && this.form.extSupportingItemVO && this.reqAmount > this.form.extSupportingItemVO.reqAmount) {
//
this.maxNum = this.form.extSupportingItemVO.reqAmount
//
}
const
maxAmount
=
this
.
$utils
.
subNum
(
this
.
form
.
outsideAmount
,
-
this
.
form
.
backedAmount
,
-
this
.
form
.
backAmount
,
-
this
.
form
.
scrapCount
)
if
(
this
.
parentType_Inject
===
'退库入库'
&&
this
.
form
.
reqAmount
>
maxAmount
)
{
this
.
maxNum
=
maxAmount
...
...
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