Commit b536bd1a authored by “lixuyan”'s avatar “lixuyan”

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

parents 8b86ba0b 77591904
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -210,6 +210,7 @@ export default { ...@@ -210,6 +210,7 @@ export default {
}, },
goHome() { goHome() {
this.$router.push(`/`) this.$router.push(`/`)
this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
}, },
back() { back() {
this.$router.push('/navigation') this.$router.push('/navigation')
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
v-show="!['系统管理','应用中心','安全中心','运维中心'].includes(activeModel.name)" v-show="!['系统管理','应用中心','安全中心','运维中心'].includes(activeModel.name)"
ref="homeLink" ref="homeLink"
class="home tags-view-item" class="home tags-view-item"
:to="{ path: '/'}" :to="{ path: '/',query:{showMenu:false}}"
tag="span" tag="span"
> >
<i class="el-icon-s-home" /> <i class="el-icon-s-home" />
......
...@@ -40,7 +40,6 @@ axios.interceptors.request.use( ...@@ -40,7 +40,6 @@ axios.interceptors.request.use(
return config.url.includes(el) return config.url.includes(el)
}) })
if (!disLoading) { if (!disLoading) {
console.log(12121)
loadingInstance = Loading.service({ loadingInstance = Loading.service({
fullscreen: true, fullscreen: true,
background: 'rgba(0, 0, 0, 0.0)' background: 'rgba(0, 0, 0, 0.0)'
......
...@@ -234,6 +234,7 @@ export default { ...@@ -234,6 +234,7 @@ export default {
toPage.query.menuRootAppId = app.id toPage.query.menuRootAppId = app.id
localStorage.setItem('moduleName', app.title) localStorage.setItem('moduleName', app.title)
this.$router.push(toPage) this.$router.push(toPage)
this.$store.dispatch('app/openSideBar', { withoutAnimation: false })
}, },
getActiveTab(menus) { getActiveTab(menus) {
for (let i = 0; i < menus.length; i++) { for (let i = 0; i < menus.length; i++) {
......
...@@ -148,6 +148,7 @@ export default { ...@@ -148,6 +148,7 @@ export default {
} }
}) })
this.requests.find(item => item.name === '配套出库').lists = data this.requests.find(item => item.name === '配套出库').lists = data
this.currentAoClick(data[0], 0)
}).catch(err => console.log(err)).finally(() => { }).catch(err => console.log(err)).finally(() => {
this.loading = false this.loading = false
}) })
......
<template> <template>
<div class="proPreConfirmRight"> <div class="proPreConfirmRight">
<dee-as-com <dee-as-com
:basic-data=" {...currentAo.joExecutePlan[0]}" :basic-data=" {...(currentAo&&currentAo.joExecutePlan&&currentAo.joExecutePlan[0]||{})}"
:lay-config="{ typeName: 'JoExecutePlan', layKey: 'batchSign_proPreConfirm_aoInfo'}" :lay-config="{ typeName: 'JoExecutePlan', layKey: 'batchSign_proPreConfirm_aoInfo'}"
/> />
<dee-as-com <dee-as-com
...@@ -55,8 +55,10 @@ export default { ...@@ -55,8 +55,10 @@ export default {
this.selectionRows = val this.selectionRows = val
}, },
init(currentAo) { init(currentAo) {
setTimeout(() => {
this.$refs.outStorageMatch && this.$refs.outStorageMatch.$refs.asCom.getData(currentAo && currentAo.id || 0) 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) this.$refs.outStorageMatchItem && this.$refs.outStorageMatchItem.$refs.asCom.getData(currentAo && currentAo.id || 0)
}, 100)
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment