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
755e3742
Commit
755e3742
authored
Jan 09, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
退库入库流程修改
parent
b52beb2b
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
163 additions
and
9 deletions
+163
-9
index.vue
...vateComponents/components/BackItemEditWorehouse/index.vue
+87
-0
equipmenCheckNo.vue
...ts/JobResponseInTestProcess/component/equipmenCheckNo.vue
+1
-1
materialCheckNo.vue
...ts/JobResponseInTestProcess/component/materialCheckNo.vue
+1
-1
outSourceCheckNo.vue
...s/JobResponseInTestProcess/component/outSourceCheckNo.vue
+1
-1
index.vue
...eComponents/components/JobResponseInTestProcess/index.vue
+7
-2
index.vue
...nts/components/OutStorageUseApprovedObjectApply/index.vue
+1
-0
index.vue
...s/components/OutStorageUseApprovedObjectConfirm/index.vue
+1
-0
index.vue
...sk-center/myPlanTask/inStorageUseOutBackConfirm/index.vue
+5
-1
index.vue
...ask-center/myPlanTask/inStorageUseOutBackInTest/index.vue
+55
-0
taskList.vue
...er/src/views/workflow/task-center/myPlanTask/taskList.vue
+4
-3
No files found.
applications/dee-mes/src/privateComponents/components/BackItemEditWorehouse/index.vue
0 → 100644
View file @
755e3742
<
template
>
<div
class=
"backItemEditWorehouse"
>
<el-select
:value=
"value"
:loading=
"loading"
filterable
clearable
:disabled=
"disabled"
:placeholder=
"options.length?'请选择':'暂无数据'"
@
change=
"change"
@
clear=
"clear"
>
<el-option
v-for=
"item in options"
:key=
"item.key"
:label=
"item.label"
:value=
"item.value"
/>
</el-select>
</div>
</
template
>
<
script
>
import
{
post
}
from
'@/utils/http'
export
default
{
name
:
'BackItemEditWorehouse'
,
componentName
:
'退库入库编辑库房'
,
props
:
{
value
:
{
type
:
[
String
,
Number
],
default
:
''
},
form
:
{
type
:
Object
,
default
:
()
=>
({})
},
disabled
:
{
type
:
Boolean
,
default
:
false
}
},
data
()
{
return
{
loading
:
false
,
options
:
[]
}
},
computed
:
{},
watch
:
{},
mounted
()
{
this
.
form
.
extMaterial
&&
this
.
form
.
extMaterial
.
resType2Id
&&
this
.
getOptions
()
},
methods
:
{
getOptions
()
{
const
params
=
[
this
.
form
.
extMaterial
.
resType2Id
]
if
(
this
.
form
.
extMaterial
.
resType2
&&
this
.
form
.
extMaterial
.
resType2
.
parentId
)
{
params
.
push
(
this
.
form
.
extMaterial
.
resType2
.
parentId
)
}
this
.
options
=
[]
this
.
loading
=
true
post
(
'ExtCenterResourceTypeLink/searchExtCenterResourceType'
,
params
).
then
(
res
=>
{
this
.
options
=
res
.
items
.
map
(
row
=>
{
return
{
key
:
row
.
id
,
value
:
row
.
id
,
label
:
row
.
extname
}
})
}).
finally
(()
=>
{
this
.
loading
=
false
})
},
change
(
val
)
{
this
.
$emit
(
'input'
,
val
)
},
clear
()
{
this
.
$emit
(
'input'
)
}
}
}
</
script
>
<
style
lang=
"scss"
>
</
style
>
applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/equipmenCheckNo.vue
View file @
755e3742
...
...
@@ -334,7 +334,7 @@ export default {
},
mounted
()
{
// 退库入库检验的验收单号使用原物料的验收单号不允许修改
if
(
this
.
jobResponseInTestData
&&
this
.
jobResponseInTestData
.
testNo
&&
(
this
.
jobResponseInTestData
.
subTypeName
!==
'JobResponseInTest'
||
this
.
jobResponseInTestData
.
subTypeName
===
'JobResponseInTest'
&&
this
.
basicData
.
subTypeName
.
includes
(
'BackItem'
)))
{
if
(
this
.
jobResponseInTestData
&&
this
.
jobResponseInTestData
.
testNo
&&
this
.
jobResponseInTestData
.
subTypeName
!==
'JobResponseInTest'
||
(
this
.
jobResponseInTestData
.
subTypeName
===
'JobResponseInTest'
&&
this
.
basicData
.
subTypeName
.
includes
(
'BackItem'
)))
{
this
.
subTypeNameDisabled
=
true
}
},
...
...
applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/materialCheckNo.vue
View file @
755e3742
...
...
@@ -835,7 +835,7 @@ export default {
},
mounted
()
{
// 退库入库检验的验收单号使用原物料的验收单号不允许修改
if
(
this
.
jobResponseInTestData
&&
this
.
jobResponseInTestData
.
testNo
&&
(
this
.
jobResponseInTestData
.
subTypeName
!==
'JobResponseInTest'
||
this
.
jobResponseInTestData
.
subTypeName
===
'JobResponseInTest'
&&
this
.
basicData
.
subTypeName
.
includes
(
'BackItem'
)))
{
if
(
this
.
jobResponseInTestData
&&
this
.
jobResponseInTestData
.
testNo
&&
this
.
jobResponseInTestData
.
subTypeName
!==
'JobResponseInTest'
||
(
this
.
jobResponseInTestData
.
subTypeName
===
'JobResponseInTest'
&&
this
.
basicData
.
subTypeName
.
includes
(
'BackItem'
)))
{
this
.
subTypeNameDisabled
=
true
}
},
...
...
applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/outSourceCheckNo.vue
View file @
755e3742
...
...
@@ -304,7 +304,7 @@ export default {
},
mounted
()
{
// 退库入库检验的验收单号使用原物料的验收单号不允许修改
if
(
this
.
jobResponseInTestData
&&
this
.
jobResponseInTestData
.
testNo
&&
(
this
.
jobResponseInTestData
.
subTypeName
!==
'JobResponseInTest'
||
this
.
jobResponseInTestData
.
subTypeName
===
'JobResponseInTest'
&&
this
.
basicData
.
subTypeName
.
includes
(
'BackItem'
)))
{
if
(
this
.
jobResponseInTestData
&&
this
.
jobResponseInTestData
.
testNo
&&
this
.
jobResponseInTestData
.
subTypeName
!==
'JobResponseInTest'
||
(
this
.
jobResponseInTestData
.
subTypeName
===
'JobResponseInTest'
&&
this
.
basicData
.
subTypeName
.
includes
(
'BackItem'
)))
{
this
.
subTypeNameDisabled
=
true
}
},
...
...
applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/index.vue
View file @
755e3742
...
...
@@ -114,8 +114,13 @@ export default {
if
(
!
id
)
return
get
(
`InventoryRequest/
${
id
}
`
).
then
(
res
=>
{
const
type
=
res
.
items
.
billType
if
(
!
type
)
return
this
.
$utils
.
showMessageWarning
(
'未查询到验收单信息!'
)
this
.
initData
(
type
)
if
(
!
type
&&
this
.
basicData
.
subTypeName
&&
this
.
basicData
.
subTypeName
.
includes
(
'BackItem'
))
{
const
findType
=
this
.
basicData
.
outStorage
.
inventory
.
jobResponse
.
jobOrder
.
inventoryReq
.
billType
this
.
initData
(
findType
)
}
else
{
if
(
!
type
)
return
this
.
$utils
.
showMessageWarning
(
'未查询到验收单信息!'
)
this
.
initData
(
type
)
}
}).
catch
((
err
)
=>
{
console
.
log
(
err
)
})
...
...
applications/dee-mes/src/privateComponents/components/OutStorageUseApprovedObjectApply/index.vue
View file @
755e3742
...
...
@@ -52,6 +52,7 @@ export default {
case
'InStorageUseBackItem'
:
// 领用退库入库
case
'InStorageMatchBackItem'
:
// 配套退库入库
case
'InStorageOutBackItem'
:
// 供外退库入库
case
'InStorageTestFlyBackItem'
:
// 试飞退库入库
this
.
cmpOptions
=
{
typeName
:
'InStorageBack'
,
layKey
:
'InStorageBackApproved_apply'
...
...
applications/dee-mes/src/privateComponents/components/OutStorageUseApprovedObjectConfirm/index.vue
View file @
755e3742
...
...
@@ -85,6 +85,7 @@ export default {
case
'InStorageUseBackItem'
:
// 领用退库入库
case
'InStorageMatchBackItem'
:
// 配套退库入库
case
'InStorageOutBackItem'
:
// 供外退库入库
case
'InStorageTestFlyBackItem'
:
// 试飞退库入库
this
.
cmpOptions
=
{
typeName
:
'InStorageBack'
,
layKey
:
'InStorageBackApproved_confirm'
...
...
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/inStorageUseOutBackConfirm/index.vue
View file @
755e3742
...
...
@@ -33,7 +33,11 @@ export default {
computed
:
{},
watch
:
{},
created
()
{},
mounted
()
{},
mounted
()
{
this
.
$bus
.
$on
(
'refreshUseItemConfirm'
,
(
data
)
=>
{
this
.
$refs
.
applyTable
&&
this
.
$refs
.
applyTable
.
$refs
.
asCom
.
getData
()
})
},
// 组件方法
methods
:
{
selectionChange
(
val
)
{
...
...
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/inStorageUseOutBackInTest/index.vue
0 → 100644
View file @
755e3742
<!--
* @Author: gjn
* @Date: 2024-1-9 16:49:39
* @Description:领用/供外退库入库检验
-->
<
template
>
<div
class=
"inStorageUseOutBackInTest"
>
<dee-as-com
ref=
"applyTable"
class=
"list-table"
:basic-data=
"
{ selectData,selectionRows }"
:lay-config="{ typeName: 'InStorageBackItem', layKey: 'batchSign_InStorageMatchBackInTest'}"
@selectionChange="selectionChange"
/>
</div>
</
template
>
<
script
>
export
default
{
name
:
'InStorageUseOutBackInTest'
,
components
:
{},
props
:
{
selectData
:
{
type
:
Object
,
default
:
()
=>
{}
}
},
data
()
{
return
{
selectionRows
:
[]
}
},
computed
:
{},
watch
:
{},
created
()
{},
mounted
()
{
},
// 组件方法
methods
:
{
selectionChange
(
val
)
{
this
.
selectionRows
=
val
}
}
}
</
script
>
<
style
lang=
'scss'
>
.inStorageUseOutBackInTest
{
width
:
100%
;
height
:
100%
;
box-sizing
:
border-box
;
padding
:
0
4px
;
}
</
style
>
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/taskList.vue
View file @
755e3742
...
...
@@ -28,9 +28,10 @@ export default {
InStorageMatchBackApply
:
()
=>
import
(
'./inStorageMatchBackApply'
),
// 配套退库申请
InStorageMatchBackExamin
:
()
=>
import
(
'./inStorageMatchBackExamine'
),
// 配套退库审核
InStorageMatchBackConfirm
:
()
=>
import
(
'./inStorageMatchBackConfirm'
),
// 配套退库确认
InStorageUseOutBackApply
:
()
=>
import
(
'./inStorageUseOutBackApply'
),
// 领用/供外退库申请
InStorageUseOutBackExamine
:
()
=>
import
(
'./inStorageUseOutBackExamine'
),
// 领用/供外退库审核
InStorageUseOutBackConfirm
:
()
=>
import
(
'./inStorageUseOutBackConfirm'
),
// 领用/供外退库确认
InStorageUseOutBackApply
:
()
=>
import
(
'./inStorageUseOutBackApply'
),
// 领用/供外/试飞退库申请
InStorageUseOutBackExamine
:
()
=>
import
(
'./inStorageUseOutBackExamine'
),
// 领用/供外/试飞退库申请
InStorageUseOutBackInTest
:
()
=>
import
(
'./inStorageUseOutBackInTest'
),
// 领用/供外/试飞退库检验
InStorageUseOutBackConfirm
:
()
=>
import
(
'./inStorageUseOutBackConfirm'
),
// 领用/供外/试飞退库申请
WorkerConfirm
:
()
=>
import
(
'./workerConfirm'
),
// 工人确认
WorkHourConfirm
:
()
=>
import
(
'./workHourConfirm'
),
// 工时确认
StationMasteConfirm
:
()
=>
import
(
'./stationMasteConfirm'
),
// 站位长确认
...
...
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