Commit 8877358f by huaying

fix: 客户日志

parent db298adc
......@@ -2,12 +2,13 @@
<div style="padding:20px">
<div class="logTop">
<el-cascader
style="width:260px;"
placeholder="全部类型/全部事由"
:options="options"
filterable>
</el-cascader>
<el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch"> </el-date-picker>
<p class="font14 tip-p">展示近一年的日志</p>
<el-date-picker style="width: 256px; margin-left:10px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch"> </el-date-picker>
<p class="font14 tip-p" v-if="!memberId">展示近一年的日志</p>
</div>
<el-table :data="tableData" style="width: 100%">
<el-table-column prop="createTime" label="时间">
......
......@@ -729,7 +729,7 @@
<!-- 标签备注end -->
<!-- 客户日志 -->
<customer-log style="padding:0" v-if="section.name==='log'" :memberId="memberId"></customer-log>
<!-- <customer-log style="padding:0" v-if="section.name==='log'" :memberId="memberId"></customer-log> -->
<!-- <template v-if="section.name==='log'">
<el-table :data="tableData" v-loading="tableLoading" style="width: 100%">
<el-table-column prop="createTime" label="时间">
......@@ -761,7 +761,13 @@
</template> -->
<!-- 客户日志end -->
</div>
</div>
<dm-sub-title text="客户日志" type="fill" style="margin-bottom: 20px;font-size:14px;">
客户日志
<span style="margin-left: 10px; color: #909399;font-size:12px">(展示近一年的日志)</span>
</dm-sub-title>
<customer-log style="padding:0" :memberId="memberId"></customer-log>
</div>
<!-- 基本信息修改弹窗 -->
<baseinfo-dialog
......@@ -888,4 +894,10 @@ export default { ...action };
height: 22px !important;
top: 9px;
}
.subTitle .text {
font-size: 14px !important;
}
.subTitle .line {
margin-right: 8px !important;
}
</style>
......@@ -174,7 +174,7 @@ export default {
{ title: '营销活动标签', key: 'marketingTagList' },
],
},
{ title: '客户日志', name: 'log', class: 'log-info-contain' },
// { title: '客户日志', name: 'log', class: 'log-info-contain' },
],
marketingRecordNum: 0
};
......
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