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

applications/architecture-dee/src/store/modules/menu.js

@@ -99,7 +99,7 @@ const actions = {
     // if (!state.activeModel || model.appId !== state.activeModel.id || (model.appId === 'todoTask' && state.activeModel.id !== 'todoTask')) {
     if (model.appId === 'todoTask' || model.appId === 'homeCenter' || model.appId === 'myMessage' ||
      model.appId === 'myTaskReceive' || model.appId === 'myCheckTaskReceive' ||
-     model.appId === 'myAirTaskReceive') { // 待办任务页特殊处理
+     model.appId === 'myAirTaskReceive' || model.appId === 'myExecutDispatch') { // 待办任务页特殊处理
       commit('SET_ACTIVE_MODEL', {
         id: model.appId,
         path: { ...model.pageInfo }

applications/dee-task-center/src/views/home/compontents/my-task.vue

@@ -124,6 +124,11 @@ export default {
           taskType: '适航任务',
           type: 'DMIR',
           appId: 'myAirTaskReceive'
+        },
+        {
+          taskType: '执行派工',
+          type: 'Dispatch',
+          appId: 'myExecutDispatch'
         }
       ]
     }
@@ -140,7 +145,7 @@ export default {
   },
   mounted: function() {
     this.quickAccessList.forEach((item, index) => {
-      this.getCustomModules(index)
+      this.getCustomModules(index, item)
     })
   },
   methods: {
@@ -263,19 +268,24 @@ export default {
         query: { title: '任务查询' }
       })
     },
-    getCustomModules(index) {
+    getCustomModules(index, item) {
+      if (item.type === 'Dispatch') {
+        get(`/indexTask/task/ProdTask`, {}).then(res => {
+          this.$set(this.quickAccessList[index], 'taskCount', res.items.count)
+        })
+      } else {
         const params = {
           type: this.quickAccessList[index].type
         }
         get(`/indexTask/task/fitOut`, params).then(res => {
           this.$set(this.quickAccessList[index], 'taskCount', res.items.count)
         })
+      }
     },
-
     goInfo(item) {
       this.clickTask = item
       // this.$emit('getTaskDetail', item ? { id: item.id, processInstanceId: item.processInstanceId, title: item.title } : null)
-      if (item.type === 'FitOut' || item.type === 'CheckOut' || item.type === 'DMIR') {
+      if (item.type === 'FitOut' || item.type === 'CheckOut' || item.type === 'DMIR' || item.type === 'Dispatch') {
         this.goModule(item)
       } else {
         this.$router.push({
@@ -293,6 +303,14 @@ export default {
       }
     },
     async goModule(module) {
+      if (module.type === 'Dispatch') {
+        this.$router.push({
+          path: '/dee-mes/instructions-dispatch',
+          query: {
+            title: module.taskType
+          }
+        })
+      } else {
         this.$router.push({
           path: '/dee-mes/taskReception',
           query: {
@@ -301,6 +319,7 @@ export default {
             showTag: 'false'
           }
         })
+      }
       this.$store.dispatch('menu/activeModel', {
         appId: module.appId,
         pageInfo: {