1.领取优惠券

src/api/system/claimLog.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询优惠券领取记录列表
+export function listClaimLog(query) {
+  return request({
+    url: '/system/claimLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询优惠券领取记录详细
+export function getClaimLog(claimId) {
+  return request({
+    url: '/system/claimLog/' + claimId,
+    method: 'get'
+  })
+}
+
+// 新增优惠券领取记录
+export function addClaimLog(data) {
+  return request({
+    url: '/system/claimLog',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改优惠券领取记录
+export function updateClaimLog(data) {
+  return request({
+    url: '/system/claimLog',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除优惠券领取记录
+export function delClaimLog(claimId) {
+  return request({
+    url: '/system/claimLog/' + claimId,
+    method: 'delete'
+  })
+}

src/views/system/claimLog/index.vue

@@ -0,0 +1,274 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="区域" prop="areaId">
+        <el-input
+          v-model="queryParams.areaId"
+          placeholder="请输入区域"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="优惠券" prop="couponId">
+        <el-input
+          v-model="queryParams.couponId"
+          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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:claimLog:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:claimLog:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:claimLog:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:claimLog:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="claimLogList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="领取id" align="center" prop="claimId" />
+      <el-table-column label="区域" align="center" prop="areaId" />
+      <el-table-column label="用户" align="center" prop="userId" />
+      <el-table-column label="优惠券" align="center" prop="couponId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:claimLog:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:claimLog:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改优惠券领取记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="区域" prop="areaId">
+          <el-input v-model="form.areaId" placeholder="请输入区域" />
+        </el-form-item>
+        <el-form-item label="用户" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户" />
+        </el-form-item>
+        <el-form-item label="优惠券" prop="couponId">
+          <el-input v-model="form.couponId" placeholder="请输入优惠券" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listClaimLog, getClaimLog, delClaimLog, addClaimLog, updateClaimLog } from "@/api/system/claimLog";
+
+export default {
+  name: "ClaimLog",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 优惠券领取记录表格数据
+      claimLogList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        areaId: null,
+        userId: null,
+        couponId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询优惠券领取记录列表 */
+    getList() {
+      this.loading = true;
+      listClaimLog(this.queryParams).then(response => {
+        this.claimLogList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        claimId: null,
+        areaId: null,
+        userId: null,
+        couponId: null,
+        createTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.claimId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加优惠券领取记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const claimId = row.claimId || this.ids
+      getClaimLog(claimId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改优惠券领取记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.claimId != null) {
+            updateClaimLog(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addClaimLog(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const claimIds = row.claimId || this.ids;
+      this.$modal.confirm('是否确认删除优惠券领取记录编号为"' + claimIds + '"的数据项？').then(function() {
+        return delClaimLog(claimIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/claimLog/export', {
+        ...this.queryParams
+      }, `claimLog_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/system/coupon/index.vue

@@ -11,17 +11,17 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="运营区" prop="areaId">
+      <el-form-item label="运营区" prop="areaName">
         <el-input
-          v-model="queryParams.areaId"
+          v-model="queryParams.areaName"
           placeholder="请输入运营区"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="用户" prop="userId">
+      <el-form-item label="用户" prop="userName">
         <el-input
-          v-model="queryParams.userId"
+          v-model="queryParams.userName"
           placeholder="请输入用户"
           clearable
           @keyup.enter.native="handleQuery"
@@ -97,10 +97,15 @@
           <dict-tag :options="dict.type.et_coupon_type" :value="scope.row.type"/>
         </template>
       </el-table-column>
-      <el-table-column label="折扣比例" align="center" prop="discountPercent" />
-      <el-table-column label="运营区" align="center" prop="areaId" />
-      <el-table-column label="用户" align="center" prop="userId" />
-      <el-table-column label="抵扣金额" align="center" prop="discountAmount" />
+      <el-table-column label="限制次数" align="center" prop="limitNum">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.et_coupon_time_limit" :value="scope.row.limitNum"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="折扣比例" align="center" prop="discountPercent" :formatter="formatDiscountPercent"/>
+      <el-table-column label="运营区" align="center" prop="areaName" />
+      <el-table-column label="用户" align="center" prop="userName" />
+      <el-table-column label="抵扣金额" align="center" prop="discountAmount"  :formatter="formatDiscountAmount"/>
       <el-table-column label="有效时间" align="center" prop="expirationTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.expirationTime, '{y}-{m}-{d}') }}</span>
@@ -168,7 +173,7 @@
           <el-date-picker clearable
             v-model="form.expirationTime"
             type="date"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择有效时间">
           </el-date-picker>
         </el-form-item>
@@ -186,7 +191,7 @@ import { listCoupon, getCoupon, delCoupon, addCoupon, updateCoupon } from "@/api
 
 export default {
   name: "Coupon",
-  dicts: ['et_coupon_type', 'et_coupon_status'],
+  dicts: ['et_coupon_type', 'et_coupon_status','et_coupon_time_limit'],
   data() {
     return {
       // 遮罩层
@@ -233,6 +238,19 @@ export default {
     this.getList();
   },
   methods: {
+    formatDiscountAmount(row){
+      if (row.discountAmount === null || row.discountAmount === '') {
+        return '';
+      }
+      return row.discountAmount + '元';
+    },
+    formatDiscountPercent(row, column, cellValue){
+      if (cellValue == null) {
+        return '';
+      }
+      const formattedValue = (cellValue * 100).toFixed(0) + '%';
+      return formattedValue;
+    },
     /** 查询优惠券列表 */
     getList() {
       this.loading = true;

src/views/system/model/index.vue

@@ -155,7 +155,6 @@
 import { listModel, getModel, delModel, addModel, updateModel } from "@/api/system/model";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { deptTreeSelect } from '@/api/system/user'
 import { listDept2 } from '@/api/system/dept'
 
 export default {
@@ -225,9 +224,11 @@ export default {
   },
   created() {
     this.getList();
-    this.getDeptTree();
     console.log("当前用户信息：",this.$store.state.user.name)
     this.userName = this.$store.state.user.name;
+    if(this.userName == 'admin'){
+      this.getDeptTree();
+    }
   },
   methods: {
     /** 查询车辆型号列表 */