Commit 967c3fea authored by 刘怀志's avatar 刘怀志

Merge remote-tracking branch 'origin/develop' into develop

parents 10fb4c85 e09a28e4
...@@ -63,9 +63,21 @@ ...@@ -63,9 +63,21 @@
<span>{{ parseTime(row.createTime) }}</span> <span>{{ parseTime(row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="任务编号" align="left" prop="createTime" /> <el-table-column label="任务编号" align="left" prop="createTime" >
<el-table-column label="任务名称" align="left" prop="createTime" /> <template slot-scope="scope">
<el-table-column label="任务组长" align="left" prop="createTime" /> 1010202121
</template>
</el-table-column>
<el-table-column label="任务名称" align="left" prop="createTime" >
<template slot-scope="scope">
一汽丰田体系审查
</template>
</el-table-column>
<el-table-column label="任务组长" align="left" prop="createTime">
<template slot-scope="scope">
赵小刚
</template>
</el-table-column>
<el-table-column label="任务状态" align="left" width="210" prop="status"> <el-table-column label="任务状态" align="left" width="210" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="task-status" @click="handleNotStarted(scope)"> <div class="task-status" @click="handleNotStarted(scope)">
......
...@@ -63,9 +63,21 @@ ...@@ -63,9 +63,21 @@
<span>{{ parseTime(row.createTime) }}</span> <span>{{ parseTime(row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="任务编号" align="left" prop="createTime" /> <el-table-column label="任务编号" align="left" prop="createTime" >
<el-table-column label="任务名称" align="left" prop="createTime" /> <template slot-scope="scope">
<el-table-column label="任务组长" align="left" prop="createTime" /> 1010202121
</template>
</el-table-column>
<el-table-column label="任务名称" align="left" prop="createTime" >
<template slot-scope="scope">
一汽丰田体系审查
</template>
</el-table-column>
<el-table-column label="任务组长" align="left" prop="createTime">
<template slot-scope="scope">
赵小刚
</template>
</el-table-column>
<el-table-column label="任务状态" align="left" width="210" prop="status"> <el-table-column label="任务状态" align="left" width="210" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="task-status" @click="handleNotStarted(scope)"> <div class="task-status" @click="handleNotStarted(scope)">
......
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