Commit 33f39e36 by Jings

fix: 解决冲突

parents 1b13106a db1bd7d4
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: Drama * @LastEditors: Drama
* @LastEditTime: 2022-10-13 16:47:28 * @LastEditTime: 2022-10-20 20:53:26
--> -->
<!-- <!--
<taskView :brandId="brandId"></taskView> <taskView :brandId="brandId"></taskView>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<span v-else>{{ scope.row.delStatusDesc }}</span> <span v-else>{{ scope.row.delStatusDesc }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" v-if="$getButtonLimit($buttonCode.checkTaskView)"> <el-table-column width="260" label="操作" v-if="$getButtonLimit($buttonCode.checkTaskView)">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" v-if="$getButtonLimit($buttonCode.checkTaskView)" :limit-code="$buttonCode.checkTaskView" @click="toDetail(scope.$index, scope.row)">查看详情</el-button> <el-button type="text" v-if="$getButtonLimit($buttonCode.checkTaskView)" :limit-code="$buttonCode.checkTaskView" @click="toDetail(scope.$index, scope.row)">查看详情</el-button>
<el-button type="text" v-if="$getButtonLimit($buttonCode.exportTableTaskDetail)" :limit-code="$buttonCode.exportTableTaskDetail" @click="taskReport(scope.row)">导出导购明细</el-button> <el-button type="text" v-if="$getButtonLimit($buttonCode.exportTableTaskDetail)" :limit-code="$buttonCode.exportTableTaskDetail" @click="taskReport(scope.row)">导出导购明细</el-button>
......
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