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

applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/index.vue

@@ -299,8 +299,8 @@ export default {
             return {
               value: row.defCode,
               label: row.defName,
-              status: row.extPosition[0].extPositionPlans[0] ? row.extPosition[0].extPositionPlans[0].planState : '',
-              postionId: row.extPosition[0].extPositionPlans[0] ? row.extPosition[0].extPositionPlans[0].id : ''
+              status: row.extPosition && row.extPosition.length && row.extPosition[0].extPositionPlans && row.extPosition[0].extPositionPlans[0] ? row.extPosition[0].extPositionPlans[0].planState : '',
+              postionId: row.extPosition && row.extPosition.length && row.extPosition[0].extPositionPlans && row.extPosition[0].extPositionPlans[0] ? row.extPosition[0].extPositionPlans[0].id : ''
             }
           })
           this.$set(this.searchFormData, 'sorties', this.sortiesData[0].value)

applications/dee-mes/src/views/taskReception/components/taskReceiveCard/index.vue

@@ -252,18 +252,17 @@ export default {
                       'Delivery',
                       'Run'
                     ]
-                  },
-                  {
-                    'fieldName': 'prodTask.extProcessSkillUser.dxUserInfoId',
-                    'operator': 'EQ',
-                    // 'value': 1626781927440
-                    value: user
-                  },
-                  {
-                    'fieldName': 'prodTask.subTypeName',
-                    'operator': 'EQ',
-                    'value': this.$route.query.title === '装配任务' ? 'FitOut' : 'CheckOut'
                   }
+                  // {
+                  //   'fieldName': 'prodTask.extProcessSkillUser.dxUserInfoId',
+                  //   'operator': 'EQ',
+                  //   value: user
+                  // },
+                  // {
+                  //   'fieldName': 'prodTask.subTypeName',
+                  //   'operator': 'EQ',
+                  //   'value': this.$route.query.title === '装配任务' ? 'FitOut' : 'CheckOut'
+                  // }
                 ],
                 'operator': 'AND'
               },
@@ -314,6 +313,18 @@ export default {
         },
         'operator': this.$route.query.title === '装配任务' ? 'NEQ' : 'EQ'
       }
+      if (this.$route.query.title !== '适航任务') {
+        param.searchQueryCondition.searchItems.children[0].items.push({
+          'fieldName': 'prodTask.extProcessSkillUser.dxUserInfoId',
+          'operator': 'EQ',
+          value: user
+        })
+        param.searchQueryCondition.searchItems.children[0].items.push({
+          'fieldName': 'prodTask.subTypeName',
+          'operator': 'EQ',
+          'value': this.$route.query.title === '装配任务' ? 'FitOut' : 'CheckOut'
+        })
+      }
       that.processLoading = true
       post('/JoExecutePlan/getTaskAcceptance', param)
         .then((res) => {