修改统计，兑换记录增加查询条件

src/views/goods/voucher/exchange.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="姓名" prop="userName">
           <el-input  v-model="queryParams.userName" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery"/>
         </el-form-item>
@@ -22,6 +22,12 @@
             <el-option v-for="dict in dict.type.voucher_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="代金券名称" prop="name">
+          <el-input v-model="queryParams.discountName" placeholder="请输入代金券名称" clearable @keyup.enter.native="handleQuery"/>
+        </el-form-item>
+        <el-form-item label="商户名称" prop="sellers">
+          <el-input v-model="queryParams.discountSeller" placeholder="请输入商户名称" clearable @keyup.enter.native="handleQuery"/>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

src/views/stat/voucher/index.vue

@@ -31,14 +31,22 @@
         </el-card>
       </el-col>
 
-      <el-col :span="24" class="card-box">
+      <el-col :span="12" class="card-box">
         <el-card>
-          <div slot="header"><span>代金券类别发放统计</span></div>
+          <div slot="header"><span>代金券发放比例</span></div>
           <div class="el-table el-table--enable-row-hover el-table--medium">
             <div ref="activities" style="height: 550px" />
           </div>
         </el-card>
       </el-col>
+      <el-col :span="12" class="card-box">
+        <el-card>
+          <div slot="header">
+            <span>代金券发放数</span>
+          </div>
+          <div ref="usedmemory" style="height: 550px" />
+        </el-card>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -68,6 +76,7 @@ export default {
     handleQuery() {
       this.$modal.loading("正在加载活动统计数据，请稍候！");
       this.getActivity();
+      this.getUser();
     },
     // 重置
     resetQuery() {
@@ -98,6 +107,46 @@ export default {
       myChart.setOption(option);
       this.$modal.closeLoading();
     },
+    async getUser() {
+      const res = await issuedCountTyType(this.queryParams);
+      const data = res?.data;
+      const myChart = echarts.init(this.$refs.usedmemory);
+      const option = {
+        xAxis: {
+          type: 'category',
+          data: (() => {
+            let list = [];
+              data.map((item) => {
+                  list.push(item.name);
+              });
+              return list;
+          })(),
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            data,
+            type: 'bar',
+            label: {
+              show: true,
+              position: 'top'
+            },
+            itemStyle: {
+              normal: {
+                color: function(params) {
+                    return '#3f48cc'
+                }
+              }
+            }
+          }
+        ]
+      };
+      myChart.setOption(option);
+
+      this.$modal.closeLoading();
+    }
   }
 };
 </script>