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

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

@@ -242,6 +242,13 @@ export default {
           }
         },
         { title: '指令名称', key: 'extProcessPlan.name', align: 'left', minWidth: 280 },
+        { title: '是否协同',
+          key: 'extProcessPlan.name',
+          align: 'left',
+          formatter(row) {
+            return row.cooperatives ? '协同' : ''
+          }
+        },
         { title: '机型', key: 'extProcessPlan.planeType', align: 'left' },
         { title: '架次', key: 'extProcessPlan.sorties', align: 'left' },
         { title: '站位', key: 'extProcessPlan.positionNumber', align: 'left' },
@@ -595,6 +602,9 @@ export default {
         'openProps': [
           {
             'name': 'extProcessPlan'
+          },
+          {
+            'name': 'cooperatives'
           }
         ],
         'sortItem': [

applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/components/stationPlanList.vue

@@ -421,7 +421,8 @@ export default {
                 positionId: node.data.id,
                 type: 'cooperate',
                 serialNumber: '',
-                name: '协同办公'
+                name: '协同办公',
+                id: 'cooperate'
               })
               res.items.forEach(element => {
                 element.level = 3

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

@@ -44,7 +44,7 @@ import gantt from './gantt.vue'
 import missingParts from './missingParts'
 import stationPlanList from './stationPlanList'
 export default {
-  name: 'StationPlanMaintenance',
+  name: 'DeeMesStationPlanMaintenance',
   components: { searchBar, station, gantt, missingParts, stationPlanList },
   data() {
     return {