Skip to content

T
TF-MOM-WEB
Commit a96b295f authored by jingnan's avatar jingnan 👀
Browse files
Options

Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

parents c8929bf4 bbb00e5e
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
applications/dee-mes/src/views/assemblyPlanManagement/inspectionDispatch/index.vue
View file @ a96b295f
...@@ -474,8 +474,8 @@ export default { ...@@ -474,8 +474,8 @@ export default {
}, },
{ {
'fieldName': 'planState', 'fieldName': 'planState',
'operator': 'EQ', 'operator': 'IN',
'value': 'Issued' 'value': ['Issued', 'Delivery', 'Run']
}, },
{ {
'fieldName': 'extProcessPlan.id', 'fieldName': 'extProcessPlan.id',
...@@ -484,7 +484,7 @@ export default { ...@@ -484,7 +484,7 @@ export default {
{ {
'fieldName': 'dmirStatus', 'fieldName': 'dmirStatus',
'operator': 'EQ', 'operator': 'EQ',
'value': 'Y' 'value': 'N'
} }
], ],
'operator': 'AND' 'operator': 'AND'
......
applications/dee-mes/src/views/assemblyPlanManagement/instructionsDispatch/index.vue
View file @ a96b295f
...@@ -313,6 +313,7 @@ export default { ...@@ -313,6 +313,7 @@ export default {
{ {
id: item.id, id: item.id,
operator: 'MODIFY', operator: 'MODIFY',
planState: 'Delivery',
prodTask: user prodTask: user
} }
) )
...@@ -556,12 +557,12 @@ export default { ...@@ -556,12 +557,12 @@ export default {
{ {
'fieldName': 'extProcessPlan.id', 'fieldName': 'extProcessPlan.id',
'operator': 'NOTNULL' 'operator': 'NOTNULL'
},
{
'fieldName': 'dmirStatus',
'operator': 'NEQ',
'value': 'Y'
} }
// {
// 'fieldName': 'dmirStatus',
// 'operator': 'NEQ',
// 'value': 'Y'
// }
], ],
'operator': 'AND' 'operator': 'AND'
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment