合并冲突

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'