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

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

@@ -210,6 +210,7 @@ export default {
     },
     goHome() {
       this.$router.push(`/`)
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
     },
     back() {
       this.$router.push('/navigation')

applications/architecture-dee/src/layout/components/TagsView/index.vue

@@ -21,7 +21,7 @@
         v-show="!['系统管理','应用中心','安全中心','运维中心'].includes(activeModel.name)"
         ref="homeLink"
         class="home tags-view-item"
-        :to="{ path: '/'}"
+        :to="{ path: '/',query:{showMenu:false}}"
         tag="span"
       >
         <i class="el-icon-s-home" />

applications/architecture-dee/src/utils/http.js

@@ -40,7 +40,6 @@ axios.interceptors.request.use(
       return config.url.includes(el)
     })
     if (!disLoading) {
-      console.log(12121)
       loadingInstance = Loading.service({
         fullscreen: true,
         background: 'rgba(0, 0, 0, 0.0)'

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

@@ -234,6 +234,7 @@ export default {
       toPage.query.menuRootAppId = app.id
       localStorage.setItem('moduleName', app.title)
       this.$router.push(toPage)
+      this.$store.dispatch('app/openSideBar', { withoutAnimation: false })
     },
     getActiveTab(menus) {
       for (let i = 0; i < menus.length; i++) {

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/proPreparatWorkerConfirm/components/left.vue

@@ -148,6 +148,7 @@ export default {
           }
         })
         this.requests.find(item => item.name === '配套出库').lists = data
+        this.currentAoClick(data[0], 0)
       }).catch(err => console.log(err)).finally(() => {
         this.loading = false
       })

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/proPreparatWorkerConfirm/components/right.vue

 <template>
   <div class="proPreConfirmRight">
     <dee-as-com
-      :basic-data=" {...currentAo.joExecutePlan[0]}"
+      :basic-data=" {...(currentAo&&currentAo.joExecutePlan&&currentAo.joExecutePlan[0]||{})}"
       :lay-config="{ typeName: 'JoExecutePlan', layKey: 'batchSign_proPreConfirm_aoInfo'}"
     />
     <dee-as-com
@@ -55,8 +55,10 @@ export default {
       this.selectionRows = val
     },
     init(currentAo) {
-      this.$refs.outStorageMatch && this.$refs.outStorageMatch.$refs.asCom.getData(currentAo && currentAo.id || 0)
-      this.$refs.outStorageMatchItem && this.$refs.outStorageMatchItem.$refs.asCom.getData(currentAo && currentAo.id || 0)
+      setTimeout(() => {
+        this.$refs.outStorageMatch && this.$refs.outStorageMatch.$refs.asCom.getData(currentAo && currentAo.id || 0)
+        this.$refs.outStorageMatchItem && this.$refs.outStorageMatchItem.$refs.asCom.getData(currentAo && currentAo.id || 0)
+      }, 100)
     }
   }
 }