tab相关BUG修改 jira269

This commit is contained in:
a0049873 2022-12-03 16:27:24 +08:00
parent 5c45ee5ea5
commit ddc0b15123
5 changed files with 86 additions and 32 deletions

View File

@ -245,7 +245,6 @@ export default {
// 退 // 退
agreeOrNot: debounce( agreeOrNot: debounce(
function (data, type) { function (data, type) {
this.dataForm.taskId = this.$route.params.taskId this.dataForm.taskId = this.$route.params.taskId
if (type === '同意') { if (type === '同意') {
// if (this.input !== '') { // if (this.input !== '') {
@ -339,15 +338,26 @@ export default {
} }
// tab // tab
if (tabName === this.$store.state.contentTabsActiveName) { if (tabName === this.$store.state.contentTabsActiveName) {
const tab = //
const tab1 = this.$store.state.contentTabs.filter(val => val.name === tabName.substring(0, tabName.indexOf('__')))[0]
// tab
const tab2 =
this.$store.state.contentTabs[ this.$store.state.contentTabs[
this.$store.state.contentTabs.length - 1 this.$store.state.contentTabs.length - 1
] ]
if (tab1) {
this.$router.push({ this.$router.push({
name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name, name: /^iframe_.+/.test(tab1.name) ? 'iframe' : tab1.name,
params: { ...tab.params }, params: { ...tab1.params },
query: { ...tab.query } query: { ...tab1.query }
}) })
} else {
this.$router.push({
name: /^iframe_.+/.test(tab2.name) ? 'iframe' : tab2.name,
params: { ...tab2.params },
query: { ...tab2.query }
})
}
} }
}, },
// //

View File

@ -248,15 +248,26 @@ export default {
} }
// tab // tab
if (tabName === this.$store.state.contentTabsActiveName) { if (tabName === this.$store.state.contentTabsActiveName) {
const tab = //
const tab1 = this.$store.state.contentTabs.filter(val => val.name === tabName.substring(0, tabName.indexOf('__')))[0]
// tab
const tab2 =
this.$store.state.contentTabs[ this.$store.state.contentTabs[
this.$store.state.contentTabs.length - 1 this.$store.state.contentTabs.length - 1
] ]
if (tab1) {
this.$router.push({ this.$router.push({
name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name, name: /^iframe_.+/.test(tab1.name) ? 'iframe' : tab1.name,
params: { ...tab.params }, params: { ...tab1.params },
query: { ...tab.query } query: { ...tab1.query }
}) })
} else {
this.$router.push({
name: /^iframe_.+/.test(tab2.name) ? 'iframe' : tab2.name,
params: { ...tab2.params },
query: { ...tab2.query }
})
}
} }
} }
}, },

View File

@ -325,15 +325,26 @@ export default {
} }
// tab // tab
if (tabName === this.$store.state.contentTabsActiveName) { if (tabName === this.$store.state.contentTabsActiveName) {
const tab = //
const tab1 = this.$store.state.contentTabs.filter(val => val.name === tabName.substring(0, tabName.indexOf('__')))[0]
// tab
const tab2 =
this.$store.state.contentTabs[ this.$store.state.contentTabs[
this.$store.state.contentTabs.length - 1 this.$store.state.contentTabs.length - 1
] ]
if (tab1) {
this.$router.push({ this.$router.push({
name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name, name: /^iframe_.+/.test(tab1.name) ? 'iframe' : tab1.name,
params: { ...tab.params }, params: { ...tab1.params },
query: { ...tab.query } query: { ...tab1.query }
}) })
} else {
this.$router.push({
name: /^iframe_.+/.test(tab2.name) ? 'iframe' : tab2.name,
params: { ...tab2.params },
query: { ...tab2.query }
})
}
} }
}, },
// //

View File

@ -344,15 +344,26 @@ export default {
} }
// tab // tab
if (tabName === this.$store.state.contentTabsActiveName) { if (tabName === this.$store.state.contentTabsActiveName) {
const tab = //
const tab1 = this.$store.state.contentTabs.filter(val => val.name === tabName.substring(0, tabName.indexOf('__')))[0]
// tab
const tab2 =
this.$store.state.contentTabs[ this.$store.state.contentTabs[
this.$store.state.contentTabs.length - 1 this.$store.state.contentTabs.length - 1
] ]
if (tab1) {
this.$router.push({ this.$router.push({
name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name, name: /^iframe_.+/.test(tab1.name) ? 'iframe' : tab1.name,
params: { ...tab.params }, params: { ...tab1.params },
query: { ...tab.query } query: { ...tab1.query }
}) })
} else {
this.$router.push({
name: /^iframe_.+/.test(tab2.name) ? 'iframe' : tab2.name,
params: { ...tab2.params },
query: { ...tab2.query }
})
}
} }
} }
} }

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-29 15:59:51 * @Date: 2022-06-29 15:59:51
* @LastEditors: Light * @LastEditors: Light
* @LastEditTime: 2022-11-30 15:45:35 * @LastEditTime: 2022-12-03 16:25:55
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!-- 流程业务表单 --> <!-- 流程业务表单 -->
@ -516,15 +516,26 @@ export default {
} }
// tab // tab
if (tabName === this.$store.state.contentTabsActiveName) { if (tabName === this.$store.state.contentTabsActiveName) {
const tab = //
const tab1 = this.$store.state.contentTabs.filter(val => val.name === tabName.substring(0, tabName.indexOf('__')))[0]
// tab
const tab2 =
this.$store.state.contentTabs[ this.$store.state.contentTabs[
this.$store.state.contentTabs.length - 1 this.$store.state.contentTabs.length - 1
] ]
if (tab1) {
this.$router.push({ this.$router.push({
name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name, name: /^iframe_.+/.test(tab1.name) ? 'iframe' : tab1.name,
params: { ...tab.params }, params: { ...tab1.params },
query: { ...tab.query } query: { ...tab1.query }
}) })
} else {
this.$router.push({
name: /^iframe_.+/.test(tab2.name) ? 'iframe' : tab2.name,
params: { ...tab2.params },
query: { ...tab2.query }
})
}
} }
}, },
// //