Commit 6d7e8d39 by crushh

update: temp

parent 162e7f93
......@@ -371,7 +371,7 @@ export default {
*/
toDetail(index, row) {
let that = this;
that.$router.push(`taskViewDetail?ecmId=${row.ecmId}`);
that.$router.push(`taskViewDetail?ecmId=${row.ecmId}&ecmName=${row.ecmName}`);
},
/**
......
......@@ -418,14 +418,5 @@ export default {
margin-right: 10px;
}
}
.point {
display: inline-block;
width: 6px;
height: 6px;
vertical-align: top;
margin-top: 8px;
border-radius: 100%;
margin-right: 5px;
}
</style>
<style lang="sass"></style>
......@@ -35,7 +35,7 @@
<template>{{ ' ' }}</template>
</el-table-column>
<el-table-column prop="title" label="任务标题" show-overflow-tooltip></el-table-column>
<el-table-column label="指派对象" show-overflow-tooltip width="170">
<el-table-column label="导购" show-overflow-tooltip width="170">
<template slot-scope="scope">
<div class="flex flex-pack-center flex-start">
<el-popover placement="top-start" width="300" trigger="hover" @show="showSingleInfo(scope.row.clerkId)">
......@@ -140,7 +140,7 @@
</template>
</el-table-column>
<el-table-column label="逾期情况">
<template slot-scope="scope">{{ scope.row.isOverTime }}</template>
<template slot-scope="scope"> <span class="point" :style="'background:' + overdueStyle[scope.row.isOverTimeCode] + ';'"></span>{{ scope.row.isOverTime }}</template>
</el-table-column>
<el-table-column label="完成情况">
<template #header>
......@@ -156,6 +156,7 @@
</el-tooltip>
</template>
<template slot-scope="scope">
<span class="point" :style="'background:' + taskStyle[scope.row.isCompletedCode] + ';'"></span>
{{ scope.row.isCompleted }}
</template>
</el-table-column>
......@@ -254,6 +255,8 @@ export default {
title: '',
taskType: '1'
},
overdueStyle: ['none', '#F5222D', '#2F54EB'],
taskStyle: ['none', '#F5222D', '#33AF4A'],
completedOptions: [
{
label: '所有完成情况',
......
......@@ -41,6 +41,9 @@ import taskViewDetail from '@/components/app/taskViewDetail.vue';
</template>
<template slot-scope="{ $index }"><p :key="$index"></p></template>
</el-table-column>
<el-table-column label="门店分组" width="120" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.storeGroupName }}</template>
</el-table-column>
<el-table-column label="门店名称" width="120" show-overflow-tooltip>
<template slot-scope="scope">
<div style="width: 100%;white-space:nowrap;overflow:hidden;text-overflow: ellipsis;">{{ scope.row.storeName }}</div>
......@@ -188,6 +191,7 @@ export default {
startDate: that.conditionObj.dateRange[0] || '',
endDate: that.conditionObj.dateRange[1] || '',
ecmId: that.$route.query.ecmId,
ecmName: this.$route.query.ecmName,
storeIds: that.selectRadio == 1 ? '' : that.multipleSelection.map(ele => ele.storeId).join(','), // 门店分组,数组
gicEnterpriseId: that.activeBrand, // 品牌 id
selectType: that.selectRadio == 2 && that.multipleSelection.length ? 0 : this.selectRadio,
......
......@@ -11,9 +11,7 @@
<div class="task-set-content boder-box">
<div class="task-set-cell">
<div class="set-line-item flex">
<el-tooltip class="item" effect="dark" content="代理商户默认关闭双向呼叫功能,如需开通请联系达摩运营或实施进行开通" placement="top-start" :open-delay="200">
<span class="set-line-item_title text-right"> <i style="cursor: pointer;font-style: normal;padding-bottom: 2px; border-bottom: 1px dashed rgb(47, 84, 235);" class="font-14 color-606266">话务任务拨打</i></span>
</el-tooltip>
<span class="set-line-item_title text-right"> <i style="cursor: pointer;font-style: normal;padding-bottom: 2px;" class="font-14 color-606266">话务任务拨打</i></span>
<el-checkbox-group v-model="setObj.taskCallTypes">
<el-checkbox :label="item.value" v-for="item in options" :key="item.value">
<el-tooltip class="item" effect="dark" placement="top-start" :open-delay="200">
......
......@@ -425,3 +425,12 @@
.transfor-body .el-tree-node>.el-tree-node__children {
overflow: unset;
}
.point {
display: inline-block;
width: 6px;
height: 6px;
vertical-align: top;
margin-top: 8px;
border-radius: 100%;
margin-right: 5px;
}
\ No newline at end of file
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