tab相关BUG修改 jira269
This commit is contained in:
parent
5c45ee5ea5
commit
ddc0b15123
|
@ -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 }
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 启动流程出错回调
|
// 启动流程出错回调
|
||||||
|
|
|
@ -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 }
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -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 }
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 启动流程出错回调
|
// 启动流程出错回调
|
||||||
|
|
|
@ -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 }
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 }
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 启动流程出错回调
|
// 启动流程出错回调
|
||||||
|
|
Loading…
Reference in New Issue