|
@@ -159,6 +159,9 @@ export default {
|
|
|
]
|
|
|
}
|
|
|
},
|
|
|
+ created() {
|
|
|
+ this.getCurrentRoute()
|
|
|
+ },
|
|
|
methods: {
|
|
|
// 列表请求函数
|
|
|
getList(...p) {
|
|
@@ -172,10 +175,14 @@ export default {
|
|
|
if (item.colName === 'project_no') {
|
|
|
defaultData.render = (h, { row, index, column }) => {
|
|
|
return (<el-link type='primary' underline={false} onClick={() => {
|
|
|
- this.content = '详情'
|
|
|
- this.module = 'detail'
|
|
|
- this.detailId = row.id
|
|
|
- this.visible = true
|
|
|
+ const page = this.$router.resolve({
|
|
|
+ path: '/commercialEngineering/crossDistrictkList',
|
|
|
+ query: {
|
|
|
+ detailId: row.id,
|
|
|
+ module: 'detail'
|
|
|
+ }
|
|
|
+ })
|
|
|
+ window.open(page.href, '_blank')
|
|
|
}}>{row.projectNo}</el-link>)
|
|
|
}
|
|
|
}
|
|
@@ -272,6 +279,8 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
handleClose() {
|
|
|
+ this.getCurrentRoute('OK')
|
|
|
+
|
|
|
this.addOff(() => {
|
|
|
this.content = '新增'
|
|
|
this.module = 'add'
|
|
@@ -282,6 +291,19 @@ export default {
|
|
|
this.visible = false
|
|
|
this.$refs.pageRef.refreshList()
|
|
|
})()
|
|
|
+ },
|
|
|
+ getCurrentRoute(back) {
|
|
|
+ const { detailId, module } = this.$route.query
|
|
|
+ if (back === 'OK' && module === 'detail') {
|
|
|
+ this.$router.replace('/commercialEngineering/frockList')
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (detailId && module === 'detail') {
|
|
|
+ this.content = '详情'
|
|
|
+ this.detailId = detailId
|
|
|
+ this.module = module
|
|
|
+ this.visible = true
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|