|
|
@@ -14,6 +14,16 @@
|
|
|
end-placeholder="结束日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="卡种" prop="cardType" label-width="50px">
|
|
|
+ <el-select v-model="queryParams.cardType" clearable placeholder="请选择卡种">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in cardTypeList"
|
|
|
+ :key="dict.id"
|
|
|
+ :label="dict.name"
|
|
|
+ :value="dict.id">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="卡号" prop="cardNo">
|
|
|
<el-input
|
|
|
v-model="queryParams.cardNo"
|
|
|
@@ -87,6 +97,7 @@
|
|
|
},
|
|
|
configUrl: {
|
|
|
list: '/merchant/equityCard/projectConsumptionYearCount', // 列表地址
|
|
|
+ cardTypeApi: '/merchant/equityCard', // 卡种
|
|
|
delect: '', // 删除地址
|
|
|
upload: '',// 导入地址
|
|
|
download:'', // 下载模板地址
|
|
|
@@ -115,6 +126,7 @@
|
|
|
cardNo: undefined,
|
|
|
name: undefined
|
|
|
},
|
|
|
+ cardTypeList: [],
|
|
|
dateRange: [],
|
|
|
// 控制列表是否显示
|
|
|
columns: [
|
|
|
@@ -128,8 +140,26 @@
|
|
|
},
|
|
|
created() {
|
|
|
this.getList();
|
|
|
+ this.getcardTypeList()
|
|
|
},
|
|
|
methods: {
|
|
|
+ /** 查询权益卡类型列表 */
|
|
|
+ getcardTypeList() {
|
|
|
+ listTableApi(
|
|
|
+ this.configUrl.cardTypeApi,
|
|
|
+ this.addDateRange(
|
|
|
+ {
|
|
|
+ pageNum: 1,
|
|
|
+ pageSize: 9999,
|
|
|
+ },
|
|
|
+ this.dateRange)).then(response => {
|
|
|
+ this.cardTypeList = response.rows;
|
|
|
+ }
|
|
|
+ ).catch (error=>{
|
|
|
+ console.error('获取列表失败!!!!',error)
|
|
|
+ this.cardTypeList = [];
|
|
|
+ })
|
|
|
+ },
|
|
|
// 默认接受四个值 { 当前行的值, 当前列的值, 行的下标, 列的下标 }
|
|
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
|
|
|
// 判断列的属性
|
