合并冲突

0bbca423 · jingnan · e4526157 · 957ffc87 · 0bbca423
Commit 0bbca423 authored Sep 27, 2023 by jingnan 👀
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

index.vue .../views/taskReception/components/taskReceiveCard/index.vue +5 -0

No files found.
--- a/applications/dee-mes/src/views/taskReception/components/taskReceiveCard/index.vue
+++ b/applications/dee-mes/src/views/taskReception/components/taskReceiveCard/index.vue
@@ -258,6 +258,11 @@ export default {
                    'operator': 'EQ',
                    // 'value': 1626781927440
                    value: user
+                  },
+                  {
+                    'fieldName': 'prodTask.subTypeName',
+                    'operator': 'EQ',
+                    'value': this.$route.query.title === '装配任务' ? 'FitOut' : 'CheckOut'
                  }
                ],
                'operator': 'AND'