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

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

@@ -124,6 +124,7 @@
 <script>
 import { post } from '@/utils/http'
 export default {
+  name: 'DeeMesInspectionDispatch',
   provide() {
     return {
       searchFormData: this.searchFormData

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

@@ -19,7 +19,7 @@
 import missingParts from './components/missingParts'
 import stationPlanList from './components/stationPlanList'
 export default {
-  name: 'InstructionsIssued',
+  name: 'DeeMesInstructionsIssued',
   components: { missingParts, stationPlanList },
   data() {
     return {

applications/dee-mes/src/views/taskExecution/index.vue

@@ -735,14 +735,15 @@ export default {
           if (res && res.items.content.length) {
             var data = res.items.content[0]
             const inspectPerson = []
-            data.prodTask.forEach(element => {
-              if (element.subTypeName === 'CheckOut') {
-                if (element.extProcessSkillUser) {
-                  inspectPerson.push(element.extProcessSkillUser.dxUserInfo.name)
+            if (data.prodTask) {
+              data.prodTask.forEach(element => {
+                if (element.subTypeName === 'CheckOut') {
+                  if (element.extProcessSkillUser) {
+                    inspectPerson.push(element.extProcessSkillUser.dxUserInfo.name)
+                  }
                 }
-              }
-            })
-            console.log(3434, inspectPerson)
+              })
+            }
             that.headerData = {
               id: data.id,
               serialNumber: data.extProcessPlan.serialNumber,