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
0a54a9d6
Commit
0a54a9d6
authored
Mar 19, 2024
by
wangdanlei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into rubberPaint-dev
parents
a85cee58
b59a723f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
57 additions
and
19 deletions
+57
-19
index.vue
...ivateComponents/components/MatchRequestItemsCon/index.vue
+51
-17
storageDetailsCreateCom.vue
...arehousingNewOrEdit/component/storageDetailsCreateCom.vue
+3
-0
index.vue
...nents/components/PurchasingWarehousingNewOrEdit/index.vue
+3
-2
No files found.
applications/dee-mes/src/privateComponents/components/MatchRequestItemsCon/index.vue
View file @
0a54a9d6
...
...
@@ -9,7 +9,7 @@
<div
class=
"dee-table dee-table-dis-border"
>
<el-table
ref=
"outerTable"
:data=
"
t
ableData"
:data=
"
filterT
ableData"
align=
"center"
height=
"calc(100vh - 100px)"
:row-class-name=
"outerRowClassName"
...
...
@@ -161,16 +161,40 @@ export default {
{
'title'
:
'版次'
,
'key'
:
'inventory.softConfPieceNo'
}
],
tableData
:
[],
tools
:
[{
dialogTitle
:
''
,
dialogVisible
:
false
,
cmpOptions
:
{
typeName
:
'Inventory'
,
layKey
:
'matchApplyOccupy'
},
selectionRows
:
[],
currentRow
:
{},
reqStatusOptions
:
[],
hideMaterial
:
true
}
},
computed
:
{
filterTableData
()
{
let
resData
=
[]
if
(
this
.
hideMaterial
)
{
this
.
tableData
.
forEach
(
row
=>
{
debugger
if
(
!
row
.
extMaterial
.
resType2
.
typeCode
.
includes
(
'金属材料'
)
&&
!
row
.
extMaterial
.
resType2
.
typeCode
.
includes
(
'工装'
)
&&
!
row
.
extMaterial
.
resType2
.
typeCode
.
includes
(
'工具'
)
&&
!
row
.
extMaterial
.
resType2
.
typeCode
.
includes
(
'设备'
))
{
resData
.
push
(
row
)
}
})
}
else
{
resData
=
this
.
tableData
}
return
resData
},
tools
()
{
const
data
=
[{
name
:
'占用'
,
icon
:
'/icons/c-creatBook.png'
,
handler
:
{
click
:
()
=>
{
if
(
this
.
selectionRows
.
length
!==
1
)
return
this
.
$utils
.
showMessageWarning
(
'必须且只能选择一条数据进行操作!'
)
if
(
this
.
selectionRows
[
0
].
reqStatus
===
'Close'
||
this
.
selectionRows
[
0
].
reqStatus
===
'已关闭'
||
this
.
selectionRows
[
0
].
reqStatus
===
'All'
||
this
.
selectionRows
[
0
].
reqStatus
===
'已出库'
)
return
this
.
$utils
.
showMessageWarning
(
'当前物料不允许手动占用!'
)
this
.
dialogTitle
=
'占用'
this
.
dialogVisible
=
true
this
.
cmpOptions
=
{
typeName
:
'Inventory'
,
layKey
:
'matchApplyOccupy'
}
this
.
HandleBeforeOccupy
()
}
}
},
...
...
@@ -182,19 +206,19 @@ export default {
this
.
handleSubmit
()
}
}
}],
dialogTitle
:
''
,
dialogVisible
:
false
,
cmpOptions
:
{
typeName
:
'Inventory'
,
layKey
:
'matchApplyOccupy'
},
selectionRows
:
[],
currentRow
:
{},
reqStatusOptions
:
[]
{
name
:
this
.
hideMaterial
?
'显示材料'
:
'隐藏材料'
,
icon
:
'/icons/c-scan.png'
,
handler
:
{
click
:
()
=>
{
this
.
hideMaterialFun
()
}
}
}]
return
data
}
},
computed
:
{},
watch
:
{},
created
()
{
this
.
getDicListByCode
()
...
...
@@ -226,6 +250,13 @@ export default {
// this.loading = false
})
},
HandleBeforeOccupy
()
{
if
(
this
.
selectionRows
.
length
!==
1
)
return
this
.
$utils
.
showMessageWarning
(
'必须且只能选择一条数据进行操作!'
)
if
(
this
.
selectionRows
[
0
].
reqStatus
===
'Close'
||
this
.
selectionRows
[
0
].
reqStatus
===
'已关闭'
||
this
.
selectionRows
[
0
].
reqStatus
===
'All'
||
this
.
selectionRows
[
0
].
reqStatus
===
'已出库'
)
return
this
.
$utils
.
showMessageWarning
(
'当前物料不允许手动占用!'
)
this
.
dialogTitle
=
'占用'
this
.
dialogVisible
=
true
this
.
cmpOptions
=
{
typeName
:
'Inventory'
,
layKey
:
'matchApplyOccupy'
}
},
handleExpandChange
(
row
,
rows
)
{
const
isExpend
=
rows
.
some
(
r
=>
r
.
id
===
row
.
id
)
// 判断当前行展开状态
if
(
isExpend
)
{
...
...
@@ -312,6 +343,9 @@ export default {
},
handleClose
()
{
this
.
dialogVisible
=
false
},
hideMaterialFun
()
{
this
.
hideMaterial
=
!
this
.
hideMaterial
}
}
}
...
...
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/component/storageDetailsCreateCom.vue
View file @
0a54a9d6
...
...
@@ -283,6 +283,9 @@ export default {
}
else
{
isVirtualFlag
=
false
}
if
(
this
.
header
.
hasTaxExemption
===
'是'
)
{
isVirtualFlag
=
true
}
const
targetArr
=
this
.
formFileds
[
0
].
data
.
filter
(
item
=>
item
.
title
===
'税率'
||
item
.
title
===
'含税单价'
)
targetArr
.
forEach
(
item
=>
(
item
.
component
.
disabled
=
isVirtualFlag
))
}
...
...
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/index.vue
View file @
0a54a9d6
...
...
@@ -857,8 +857,9 @@ export default {
})
}
})
// 默认取第一个明细的是否免税状态
this
.
form
.
hasTaxExemption
=
data
[
0
].
hasTaxExemption
// 默认取第一个明细的是否免税状态,用this.$set才能触发computed方法
this
.
$set
(
this
.
form
,
'hasTaxExemption'
,
data
[
0
].
hasTaxExemption
)
// this.form.hasTaxExemption = data[0].hasTaxExemption
if
(
data
.
length
>
0
)
{
this
.
formData
[
0
].
data
.
forEach
(
item
=>
{
item
.
component
.
disabled
=
true
...
...
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