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

applications/architecture-dee/src/layout/components/AppMain.vue

@@ -23,6 +23,15 @@ export default {
       return this.$route.fullPath
     }
   },
+  watch: {
+    '$route'(route) {
+      // 缓存任务接收页面
+      if (route.name === 'DeeMesTaskReception') {
+        console.log(454554)
+        this.$store.dispatch('tagsView/addView', route)
+      }
+    }
+  },
   methods: {
 
   }

applications/dee-mes/src/privateComponents/components/TempWorkAllocationEditList/index.vue

@@ -36,7 +36,7 @@
             <span v-else>{{ scope.row.dxUserInfo.name }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="workHour" label="工时分配（min）">
+        <el-table-column prop="workHour" label="工时分配（h）">
           <template slot-scope="scope">
             <span>{{ scope.row.workHour }}
             </span>

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

@@ -10,7 +10,7 @@ import TaskReceiveCard from './components/taskReceiveCard/index'
 import TaskReceiveTable from './components/taskReceiveTable/index'
 
 export default {
-  name: 'TaskReceive',
+  name: 'DeeMesTaskReception',
   components: {
     TaskReceiveCard,
     TaskReceiveTable