Commit 235b67db authored by jiaxu.yan's avatar jiaxu.yan

feat(合并代码): 合并代码

parent 0ed674e9
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<div class="cell-value"> <div class="cell-value">
<el-link <el-link
type="primary" type="primary"
@click="goNext('/task/task-detail?id=' + item.id)" @click="goNext('/task/task-detail?taskId=' + item.id)"
> >
{{ item.taskName ? item.taskName : '---' }} {{ item.taskName ? item.taskName : '---' }}
<span class="green">(已归档)</span> <span class="green">(已归档)</span>
......
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<div class="cell-value"> <div class="cell-value">
<el-link <el-link
type="primary" type="primary"
@click="goNext('/task/task-detail?id=' + item.id)" @click="goNext('/task/task-detail?taskId=' + item.id)"
> >
{{ item.taskName ? item.taskName : '---' }} {{ item.taskName ? item.taskName : '---' }}
<span class="green">(已归档)</span> <span class="green">(已归档)</span>
......
...@@ -97,7 +97,10 @@ ...@@ -97,7 +97,10 @@
class="cell-value" class="cell-value"
:title="item.taskName ? item.taskName : '---'" :title="item.taskName ? item.taskName : '---'"
> >
<el-link type="primary" @click="goDetail(item.id)"> <el-link
type="primary"
@click="goNext('/task/task-detail?taskId=' + item.id)"
>
{{ item.taskName ? item.taskName : '---' }} {{ item.taskName ? item.taskName : '---' }}
</el-link> </el-link>
</div> </div>
......
...@@ -97,7 +97,10 @@ ...@@ -97,7 +97,10 @@
class="cell-value" class="cell-value"
:title="item.taskName ? item.taskName : '---'" :title="item.taskName ? item.taskName : '---'"
> >
<el-link type="primary" @click="goNext()"> <el-link
type="primary"
@click="goNext('/task/task-detail?taskId=' + item.id)"
>
{{ item.taskName ? item.taskName : '---' }} {{ item.taskName ? item.taskName : '---' }}
</el-link> </el-link>
</div> </div>
...@@ -341,7 +344,7 @@ ...@@ -341,7 +344,7 @@
icon="edit" icon="edit"
title="修改" title="修改"
class="button-item" class="button-item"
@click.native="goNext(item.id)" @click.native="goNext('/task/new?taskId=' + item.id)"
></page-button> ></page-button>
<page-button <page-button
v-if="item.taskStatus === 'NEW'" v-if="item.taskStatus === 'NEW'"
...@@ -364,7 +367,7 @@ ...@@ -364,7 +367,7 @@
<div class="cell-value"> <div class="cell-value">
<el-link <el-link
type="primary" type="primary"
@click="goNext('/task/task-detail?id=' + item.id)" @click="goNext('/task/task-detail?taskId=' + item.id)"
> >
{{ item.taskName ? item.taskName : '---' }} {{ item.taskName ? item.taskName : '---' }}
<span class="green">(已归档)</span> <span class="green">(已归档)</span>
...@@ -662,12 +665,9 @@ export default { ...@@ -662,12 +665,9 @@ export default {
} }
}, },
/* 跳转到问卷详情*/ /* 跳转到问卷详情*/
goNext(id) { goNext(URL) {
this.$router.push({ this.$router.push({
path: '/task/new', path: URL
query: {
taskId: id
}
}) })
}, },
teakDelete(id) { teakDelete(id) {
......
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