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

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

@@ -253,10 +253,7 @@ export default {
                   {
                     'fieldName': 'planState',
                     'operator': 'IN',
-                    'value': [
-                      'Delivery',
-                      'Run'
-                    ]
+                    'value': this.$route.query.title === '装配任务' ? ['Delivery', 'Run', 'Paused'] : ['Delivery', 'Run']
                   }
                   // {
                   //   'fieldName': 'prodTask.extProcessSkillUser.dxUserInfoId',
@@ -343,10 +340,14 @@ export default {
                   item.inspectPerson = []
                   item.prodTask.forEach(element => {
                     if (element.subTypeName === 'CheckOut') {
+                      if (element.extProcessSkillUser) {
                         item.inspectPerson.push(element.extProcessSkillUser.dxUserInfo.name)
+                      }
                     } else if (element.subTypeName === 'FitOut') {
+                      if (element.extProcessSkillUser) {
                         item.operatPerson.push(element.extProcessSkillUser.dxUserInfo.name)
                       }
+                    }
                   })
                 }
               })