Commit d20d8d4d by 黑潮

fix: 修改bug

parent 005297d4
......@@ -134,7 +134,7 @@
height: 57px;
line-height: 57px;
border-top: 1px solid #E4E7ED;
z-index: 999;
z-index: 99999;
&.on{
width: calc(100% - 200px);
left: 200px;
......@@ -264,4 +264,4 @@
background:rgba(255,247,230,1);
border:1px solid rgba(255,213,145,1);
}
}
\ No newline at end of file
}
......@@ -707,10 +707,12 @@ export default {
}
}
// 会员卡升降级
if (this.form.effectAction === 'degrade' || this.form.effectAction === 'upgrade') {
this.$tips({ type: 'warning', message: '请选择触发的会员卡等级' });
return;
}
// if (this.form.effectAction === 'degrade' || this.form.effectAction === 'upgrade') {
// if (this.form.gradeIds.length == 0) {
// this.$tips({ type: 'warning', message: '请选择触发的会员卡等级' });
// return;
// }
// }
}
if (this.xsxsFlag == 1) {
if (this.analyseConfig.open_flag === '') {
......
......@@ -19,6 +19,15 @@
</el-tooltip>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" element-loading-text="拼命加载中">
<el-table-column align="left" fixed="left" :min-width="200" show-overflow-tooltip label="计划名称">
<template slot-scope="scope">
<el-button v-if="xsxsFlag && isOpenFlag(scope.row.analyseJson)" style="vertical-align: middle;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;width: 100%;text-align:left" type="text" @click="toTouch(scope.row)">
<img style="vertical-align: middle;" src="../../assets/img/data.png" />
<span style="vertical-align: middle;">{{ scope.row.ecmPlanName }}</span>
</el-button>
<span v-else>{{ scope.row.ecmPlanName }}</span>
</template>
</el-table-column>
<el-table-column v-for="(v, i) in tableHeader" :fixed="v.fixed" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter">
<template slot="header" slot-scope="scope">
<span>
......@@ -100,7 +109,6 @@ export default {
total: 0,
loading: false,
tableHeader: [
{ label: '计划名称', prop: 'ecmPlanName', minWidth: '160', align: 'left', fixed: 'left' },
{
label: '时效',
prop: 'effectType',
......
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