|
|
@@ -1,30 +1,7 @@
|
|
|
<template>
|
|
|
<!-- 过滤客户资料表格 -->
|
|
|
-<<<<<<< HEAD
|
|
|
- <div class="filterTable">
|
|
|
- <div class="filter-custom-table">
|
|
|
- <a-select label-in-value
|
|
|
- class="conditionSelect"
|
|
|
- style="width: 120px"
|
|
|
- v-model:value="selectedReportType"
|
|
|
- @change="update"
|
|
|
- placeholder="请选择报表类型">
|
|
|
- <a-select-option v-for="item in reportType"
|
|
|
- :key="item.value">
|
|
|
- {{item.lable}}
|
|
|
- </a-select-option>
|
|
|
- </a-select>
|
|
|
- <a-space direction="vertical">
|
|
|
- <a-date-picker v-model:value="date"
|
|
|
- class="commonDatePicker"
|
|
|
- @change="update"
|
|
|
- :format="dateFormat" />
|
|
|
- </a-space>
|
|
|
- <!-- <FilterOption :selectList="selectList"
|
|
|
-=======
|
|
|
<Filter @update="update">
|
|
|
<!-- <FilterOption :selectList="selectList"
|
|
|
->>>>>>> f5a33d051891f596aa1de90bb7993d26608babc0
|
|
|
:inputList="[]"
|
|
|
:fixedBtnList="fixedBtnList" /> -->
|
|
|
</Filter>
|
yu.jie