新增活动管理优惠券管理

src/api/activity/activity.js

@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+// 分页查询
+export const pageList = (query) => {
+  return request({
+    url: '/coupon/activityInfo/pageList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增修改
+export const saveAndEdit = (data) => {
+  return request({
+    url: '/coupon/activityInfo/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 详情
+export function getSelectById(id) {
+  return request({
+    url: '/coupon/activityInfo/selectById?id=' + id,
+    method: 'get'
+  })
+}
+
+
+// 删除
+export const deleteById = (id) => {
+  return request({
+    url: '/coupon/activityInfo/deleteById',
+    method: 'delete',
+    params: {id:id}
+  })
+}

src/api/coupon/coupon.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 分页查询
+export const pageList = (query) => {
+  return request({
+    url: '/coupon/couponInfo/pageList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 未绑定优惠劵数据集
+export const unBoundList = (query) => {
+  return request({
+    url: '/coupon/couponInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增修改
+export const saveAndEdit = (data) => {
+  return request({
+    url: '/coupon/couponInfo/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 详情
+export function getSelectById(id) {
+  return request({
+    url: '/coupon/couponInfo/selectById?id=' + id,
+    method: 'get'
+  })
+}
+
+
+// 删除
+export const deleteById = (id) => {
+  return request({
+    url: '/coupon/couponInfo/deleteById',
+    method: 'delete',
+    params: {id:id}
+  })
+}

src/views/marketing/activity/dialog/addAndEdit.vue

@@ -0,0 +1,344 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: gcz
+ * @LastEditTime: 2024-03-15 14:38:54
+ * @FilePath: \great_webui\src\views\marketing\activity\dialog\addAndEdit.vue
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="700px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog">
+      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
+        <el-form-item label="活动名称" prop="activityName" required>
+          <el-input
+            v-model="form.activityName"
+            placeholder="活动名称"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="活动时间" prop="activityDate" required>
+          <el-date-picker
+            @change="dateChange"
+            v-model="form.activityDate"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="优惠劵总数" prop="couponNum" required>
+          <el-input
+            v-model="form.couponNum"
+            @change="changeNumber('couponNum')"
+            placeholder="优惠劵总数"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="优惠劵" prop="couponList" required>
+          <!-- <el-input
+            v-model="form.couponList"
+            placeholder="优惠劵"
+            clearable
+            style="width: 100%;"
+            v-show="false"
+          /> -->
+          <span style="color: deepskyblue;" @click="showSelectTable = true">选择</span>
+        </el-form-item>
+      </el-form>
+      <div class="select-table">
+          <el-table
+            :data="tempCouponList"
+            border
+            style="width: 100%;"
+          >
+            <el-table-column prop="couponBatch" label="批次号" width="140" />
+            <el-table-column prop="couponName" label="优惠劵名称" />
+            <el-table-column label="类型" align="center" prop="type">
+              <template slot-scope="scope">
+                <span>{{ scope.row.type==1?'满减':'折扣' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime) }}</span>
+              </template>
+            </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading.fullscreen.lock="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      >
+        <span v-if="loading">提交中...</span>
+        <span v-else>保存</span>
+      </el-button>
+    </span>
+    <el-dialog title="选择优惠券" :visible.sync="showSelectTable" width="700px" append-to-body>
+      <div class="dialog select-table">
+          <div class="table-title"></div>
+            <el-table
+              :data="couponList"
+              border
+              style="width: 100%;margin-bottom: 20px;"
+              @selection-change="handleSelectionChange"
+            >
+              <el-table-column type="selection" width="55" />
+              <el-table-column prop="couponBatch" label="批次号" width="140" />
+              <el-table-column prop="couponName" label="优惠劵名称" />
+              <el-table-column label="类型" align="center" prop="type">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.type==1?'满减':'折扣' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+            <span slot="footer" class="dialog-footer" style="float: right;">
+              <el-button @click="showSelectTable=false">取消</el-button>
+              <el-button
+                type="primary"
+                @click="confirmSelection"
+                element-loading-text="提交中..."
+                element-loading-spinner="el-icon-loading"
+                element-loading-background="rgba(0, 0, 0, 0.8)"
+              >
+                <span>确定</span>
+              </el-button>
+            </span>
+      </div>
+    </el-dialog>
+  </el-dialog>
+</template>
+
+<script>
+// import { updateNoticeMgr } from "@/api/system/noticeMgr";
+import { saveAndEdit } from "@/api/activity/activity";
+import { unBoundList as couponPageList } from '@/api/coupon/coupon'
+// import { getToken } from "@/utils/auth";
+// import { log } from 'mathjs';
+export default {
+  name: "addAndEdit",
+  props: {
+    dict: {
+      type: Object,
+      default: () => [],
+    },
+  },
+  components: {
+    
+  },
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      activeName: '01',
+      open: false,
+      loading: false,
+      form: {
+        id: undefined,
+      },
+      rules: {
+        activityName: [{ required: true, message: "请输入活动名称", trigger: ["change","blur"] }],
+        activityDate: [{ required: true, message: "开始时间", trigger: ["change","blur"] }],
+        startDate: [{ required: true, message: "开始时间", trigger: ["change","blur"] }],
+        endDate: [{ required: true, message: "结束时间", trigger: ["change","blur"] }],
+        couponNum: [{ required: true, message: "请输入优惠劵总数(大于或等于1的整数)", trigger: ["change","blur"] }],
+        couponList: [
+          { required: true, message: "请选择优惠劵", trigger: ["change","blur"] },
+        ],
+      },
+      tempCouponList:[],
+      couponList:[],
+      showSelectTable:false,
+    };
+  },
+  created(){
+    this.getCouponList();
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj) {
+      this.open = true;
+      this.reset();
+      if (obj){
+        this.title = "编辑活动";
+        this.$nextTick(() => {
+          this.$set(this.form, 'id', obj.id);
+          this.$set(this.form, 'activityName', obj.activityName);
+          this.$set(this.form, 'startDate', obj.startDate);
+          this.$set(this.form, 'endDate', obj.endDate);
+          this.$set(this.form, 'couponNum', obj.couponNum);
+          this.$set(this.form, 'couponList', obj.couponList);
+          this.$set(this.form, 'activityDate', [obj.startDate, obj.endDate]);
+          this.$set(this, 'tempCouponList', obj.couponInfoList||[]);
+          this.confirmSelection();
+        });
+      }else{
+        this.title = "新增活动";
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+        });
+      }
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+     reset() {
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'activityName', '');
+      this.$set(this.form, 'startDate', '');
+      this.$set(this.form, 'endDate', '');
+      this.$set(this.form, 'couponNum', '');
+      this.$set(this.form, 'couponList', []);
+      this.$set(this.form, 'activityDate', []);
+      this.$set(this, 'tempCouponList', []);
+    },
+    changeNumber(key) {
+      if(!Number.isInteger(this.form[key] * 1) || this.form[key] * 1 < 1){
+        this.$message.error("输入需大于或等于1的整数!");
+        this.$set(this.form, key, '');
+        return false
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          try {
+            this.loading = true;
+            const { code } = await saveAndEdit({ ...this.form });
+            if (code === 200) {
+              this.$message.success("操作成功!");
+              this.$emit("getList");
+              this.cancel();
+            }
+          } catch (error) {
+          } finally {
+            this.loading = false;
+          }
+        }
+      });
+    },
+    
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    /**
+     * 上传成功
+     * @date 2023-11-22
+     * @param {any} res
+     * @returns {any}
+     */
+    handleAvatarSuccess(res) {
+      if (res.code === 200) {
+        // this.form.mainImg = res?.data?.url;
+        this.$set(this.form, 'mainImg', res?.data?.url)
+      }
+    },
+    /**
+     * 上传文件之前之前
+     * @date 2023-11-22
+     * @param {any} file
+     * @returns {any}
+     */
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === "image/jpeg" || "image/png";
+      if (!isJPG) {
+        this.$message.error("上传头像图片只能是jpg或png格式!");
+      }
+      return isJPG;
+    },
+    /** 查询优惠券列表 */
+    getCouponList() {
+      couponPageList({pageNum:1,pageSize:999})
+      .then(response => {
+          this.couponList = response.data.rows;
+        }
+      );
+    },
+    dateChange(e){
+      console.log('useStartDateChange',e);
+      // console.log('useStartDate',this.form.useDate);
+      this.form.startDate  = e[0];
+      this.form.endDate = e[1];
+      console.log(' this.form.activityDate', this.form.activityDate);
+    },
+    handleSelectionChange(val) {
+      // console.log('val', val);
+      this.tempCouponList = val;
+    },
+    confirmSelection() {
+      this.showSelectTable = false;
+      console.log('this.tempCouponList', this.tempCouponList);
+      this.form.couponList = this.tempCouponList.map(item=>{return item.id});
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 0 30px;
+  max-height: 65vh;
+  overflow-y: auto;
+}
+.dialog {
+  padding: 0 30px;
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+</style>

src/views/marketing/activity/index.vue

@@ -0,0 +1,327 @@
+<!--
+ * @Description: 
+ * @Author: gcz
+ * @Date: 2024-03-04 15:03:37
+ * @LastEditors: gcz
+ * @LastEditTime: 2024-03-15 14:40:54
+ * @FilePath: \great_webui\src\views\marketing\activity\index.vue
+ * @Copyright: Copyright (c) 2016~2024 by gcz, All Rights Reserved. 
+-->
+<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="活动名称" label-width="80px">
+        <el-input
+          v-model="queryParams.activityName"
+          placeholder="请输入活动名称"
+          clearable
+          style="width: 140px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="状态">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="状态"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusList"
+            :key="dict.value"
+            :label="dict.name"
+            :value="dict.value"
+          />
+        </el-select>
+      </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="['marketing:activity:add']"
+            >添加</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table ref="tables" v-loading="loading" :data="dataList" border>
+      <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
+      <el-table-column label="活动名称" align="center" prop="activityName" />
+      <el-table-column label="活动起止时间" align="center" width="380">
+        <template slot-scope="scope">
+          <span>{{ scope.row.startDate }} - {{ scope.row.endDate  }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <el-tag type="info" v-if="scope.row.status == '1'">未开始</el-tag>
+          <el-tag type="success" v-else-if="scope.row.status == '2'">进行中</el-tag>
+          <el-tag type="danger" v-else-if="scope.row.status == '3'">已结束</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="优惠劵总数" align="center" prop="couponNum" />
+      <el-table-column label="已发放数量" align="center" prop="couponReceiveNum" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <!-- <el-button
+            size="mini"
+            type="text"
+            @click="ionlineApi(scope.row)"
+            v-hasPermi="['system:smsMgr:edit']"
+          >{{scope.row.status == '1' ? '禁用' : '启用'}}</el-button> -->
+          <el-button
+            size="mini"
+            type="text"
+            @click="seeCenter(scope.row)"
+            v-hasPermi="['marketing:activity:list']"
+          >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['marketing:activity:edit']"
+          >编辑</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row,scope.index)"
+            v-hasPermi="['marketing:activity:delete']"
+          >删除</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"
+    />
+
+    <!-- 新增/编辑弹框 -->
+    <add-and-edit
+      ref="addAndEdit"
+      :dict="dict"
+      @getList="getList"
+    />
+
+
+    <el-dialog
+      title="查看"
+      :visible.sync="visibleStatus"
+      width="600px"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <div class="view-content">
+        <div class="item u-flex">
+          <div class="item-title">活动名称：</div>
+          <div class="item-content">{{ newObj.activityName }}</div>
+        </div>
+        <div class="item u-flex">
+          <div class="item-title">活动时间：</div>
+          <div class="item-content">{{ newObj.startDate }} - {{ newObj.endDate }}</div>
+        </div>
+        <div class="item u-flex">
+          <div class="item-title">优惠劵总数：</div>
+          <div class="item-content">{{ newObj.couponNum }}</div>
+        </div>
+        <div class="item">
+          <div class="item-title">优惠劵：</div>
+          <div class="item-content">
+            <el-table
+                :data="newObj.couponInfoList"
+                border
+                style="width: 100%;"
+              >
+                <el-table-column prop="couponBatch" label="批次号" width="140" />
+                <el-table-column prop="couponName" label="优惠劵名称" />
+                <el-table-column label="类型" align="center" prop="type">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.type==1?'满减':'折扣' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+                  <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                  </template>
+                </el-table-column>
+            </el-table>
+          </div>
+        </div>
+
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="visibleStatus = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import { pageList, deleteById, ionline,getSelectById } from '@/api/activity/activity'
+import addAndEdit from "./dialog/addAndEdit.vue";
+
+export default {
+  name: "agreement",
+  dicts: ['template_ident'],
+  components: { addAndEdit },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: undefined
+      },
+      statusList: [
+        {id: 1, name: '未发布', value: 0},
+        {id: 2, name: '发布', value: 1},
+        {id: 3, name: '下架', value: 2},
+      ],
+      visibleStatus: false,
+      newObj: {},
+      visibleType: ''
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      .then(response => {
+          this.dataList = response.data.rows;
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.$set(this.queryParams, 'templateName', '');
+      this.$set(this.queryParams, 'status', '');
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    getById(row){
+      getSelectById(row.id).then((res) => {
+        console.log('getById',res);
+      }).catch(() => {});
+      
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs["addAndEdit"].openDialog("新增数据", null);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      getSelectById(row.id).then((res) => {
+        this.$refs["addAndEdit"].openDialog("修改数据", res.data);
+      }).catch(() => {});
+    },
+
+    /** 发布或者取消发布按钮操作 */
+    ionlineApi(row) {
+      this.$confirm("是否对-" + row.templateName + (row.status == 1 ? '-禁用？' : '-启用？'), '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        ionline({ id: row.id, status: row.status == 1 ? 0 : 1 }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.getList();
+          }
+        });
+      }).catch(() => {});
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除"' + row.activityName + '"的数据项？').then(function() {
+        return deleteById(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 查看按钮操作 */
+    seeCenter(obj, type) {
+      getSelectById(obj.id).then((res) => {
+        this.visibleStatus = true
+        this.visibleType = type;
+        this.newObj = res.data;
+      }).catch(() => {});
+      
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.view-content{
+  .u-flex{
+    display: flex;
+    
+  }
+}
+</style>

src/views/marketing/coupon/dialog/addAndEdit.vue

@@ -0,0 +1,373 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: gcz
+ * @LastEditTime: 2024-03-14 17:48:20
+ * @FilePath: \great_webui\src\views\marketing\coupon\dialog\addAndEdit.vue
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="700px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog">
+      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
+        <el-form-item label="优惠劵名称" prop="couponName" required>
+          <el-input
+            v-model="form.couponName"
+            placeholder="优惠劵名称"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="优惠劵类型" prop="type" required>
+          <el-radio v-model="form.type" :label="1">满减卷</el-radio>
+          <el-radio v-model="form.type" :label="2">折扣卷</el-radio>
+        </el-form-item>
+        <el-form-item label="优惠额度" prop="quota" required>
+          <el-input placeholder="优惠额度" v-model="form.quota">
+            <template slot="append">
+              <span v-if="form.type==1">元</span>
+              <span v-if="form.type==2">折</span>
+            </template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="使用对象" prop="useUserType" required>
+          <el-radio v-model="form.useUserType" :label="1">所有用户</el-radio>
+        </el-form-item>
+        <el-form-item label="使用剧目" prop="usePerform" required>
+          <el-select v-model="form.usePerform" @change="performChange" placeholder="请选择使用剧目">
+                <el-option
+                  v-for="dict in performList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+        </el-form-item>
+        <el-form-item label="使用票务" prop="useGood" required>
+          <el-select v-model="form.useGood" multiple placeholder="请选择使用票务">
+                <el-option
+                  v-for="dict in goodsList"
+                  :key="dict.goodsId"
+                  :label="dict.goodsName"
+                  :value="dict.goodsId"
+                ></el-option>
+              </el-select>
+        </el-form-item>
+        <el-form-item label="使用门槛" prop="useThresholdType" required>
+          <el-radio v-model="form.useThresholdType" :label="1">无条件</el-radio>
+          <el-radio v-model="form.useThresholdType" :label="2">指定条件</el-radio>
+        </el-form-item>
+        <el-form-item v-if="form.useThresholdType==2" label="累计消费满" prop="useThresholdAmount" required>
+          <el-input placeholder="" v-model="form.useThresholdAmount">
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="发放渠道" prop="channelType" required>
+          <el-select v-model="form.channelType" placeholder="请选择发放渠道">
+                <el-option
+                  v-for="dict in channelTypeList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+        </el-form-item>
+        <el-form-item label="发放数量" prop="issuseNum" required>
+          <el-input placeholder="" v-model="form.issuseNum" @change="changeNumber('issuseNum')">
+            <template slot="append">张</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="是否叠加" prop="isAdd" required>
+          <el-radio v-model="form.isAdd" :label="1">否</el-radio>
+          <el-radio v-model="form.isAdd" :label="2">是</el-radio>
+        </el-form-item>
+        <el-form-item label="领取限制" prop="receiveType" required>
+          <el-radio v-model="form.receiveType" :label="1">否</el-radio>
+          <el-radio v-model="form.receiveType" :label="2">是</el-radio>
+        </el-form-item>
+        <el-form-item v-if="form.receiveType==2" label="领取限制数量" prop="receiveNum" required>
+          <el-input placeholder="" v-model="form.receiveNum" @change="changeNumber('issuseNum')">
+            <template slot="append">张</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="使用时间" prop="useType" required>
+          <el-radio v-model="form.useType" :label="1">指定时间</el-radio>
+          <el-radio v-model="form.useType" :label="2">有效天数</el-radio>
+        </el-form-item>
+        <el-form-item v-if="form.useType==1" label="指定时间" prop="useDate" required>
+          <el-date-picker
+            @change="useStartDateChange"
+            v-model="form.useDate"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item v-if="form.useType==2" label="有效天数" prop="useDay" required>
+          <el-input placeholder="领取后优惠券有效使用天数" v-model="form.useDay">
+            <template slot="append">天</template>
+          </el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading.fullscreen.lock="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      >
+        <span v-if="loading">提交中...</span>
+        <span v-else>保存</span>
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+// import { updateNoticeMgr } from "@/api/system/noticeMgr";
+import { saveAndEdit } from "@/api/coupon/coupon";
+import { goodsPageList } from "@/api/programmeMr/programmeMr";
+// import { getToken } from "@/utils/auth";
+// import { log } from 'mathjs';
+export default {
+  name: "addAndEdit",
+  props: {
+    dict: {
+      type: Object,
+      default: () => [],
+    },
+  },
+  components: {
+    
+  },
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      activeName: '01',
+      open: false,
+      loading: false,
+      form: {
+        id: undefined,
+      },
+      rules: {
+        couponName: [{ required: true, message: "请输入优惠劵名称", trigger: ["change","blur"] }],
+        type: [{ required: true, message: "请选择优惠劵类型", trigger: ["change","blur"] }],
+        quota: [{ required: true, message: "请输入优惠额度", trigger: ["change","blur"] }],
+        useUserType: [{ required: true, message: "请选择使用对象", trigger: ["change","blur"] }],
+        usePerform: [
+          { required: true, message: "请选择使用剧目", trigger: ["change","blur"] },
+        ],
+        useGood	: [{ required: true, message: "请选择使用票务", trigger: ["change","blur"] }],
+        useThresholdType: [{ required: true, message: "请选择使用门槛", trigger: ["change","blur"] }],
+        useThresholdAmount: [{ required: true, message: "请输入累计消费满", trigger: ["change","blur"] }],
+        channelType	: [{ required: true, message: "请选择发放渠道", trigger: ["change","blur"] }],
+        issuseNum	: [{ required: true, message: "请输入发放数量", trigger: ["change","blur"] }],
+        isAdd	: [{ required: true, message: "请选择是否叠加", trigger: ["change","blur"] }],
+        receiveType	: [{ required: true, message: "请选择是否限制", trigger: ["change","blur"] }],
+        receiveNum	: [{ required: true, message: "请输入领取限制数量", trigger: ["change","blur"] }],
+        useType	: [{ required: true, message: "请选择使用时间", trigger: ["change","blur"] }],
+        useStartDate	: [{ required: true, message: "请选择指定时间", trigger: ["change","blur"] }],
+        useDay	: [{ required: true, message: "请输入有效天数", trigger: ["change","blur"] }],
+      },
+      channelTypeList:[
+        {label:'小程序',value:1},
+      ],
+      performList:[],
+      goodsList:[],
+    };
+  },
+  created() {
+    this.getPerformList();
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj) {
+      this.open = true;
+      this.reset();
+      if (obj){
+        this.title = "编辑优惠券";
+        this.$nextTick(() => {
+          this.$set(this.form, 'id', obj.id);
+          this.$set(this.form, 'couponName', obj.couponName);
+          this.$set(this.form, 'type', obj.type);
+          this.$set(this.form, 'quota', obj.quota);
+          this.$set(this.form, 'useUserType', obj.useUserType);
+          this.$set(this.form, 'usePerform', obj.usePerform);
+          this.$set(this.form, 'useThresholdType', obj.useThresholdType);
+          this.$set(this.form, 'useThresholdAmount', obj.useThresholdAmount);
+          this.$set(this.form, 'channelType', obj.channelType);
+          this.$set(this.form, 'issuseNum', obj.issuseNum);
+          this.$set(this.form, 'isAdd', obj.isAdd);
+          this.$set(this.form, 'receiveType', obj.receiveType);
+          this.$set(this.form, 'receiveNum', obj.receiveNum);
+          this.$set(this.form, 'useType', obj.useType);
+          this.$set(this.form, 'useStartDate', obj.useStartDate);
+          this.$set(this.form, 'useEndDate', obj.useEndDate);
+          this.$set(this.form, 'useDay', obj.useDay);
+          this.$set(this.form, 'useDate', [obj.useStartDate, obj.useEndDate]);
+          this.performChange(obj.usePerform);
+          this.$set(this.form, 'useGood', obj.useGood);
+          this.form.useGood= this.getGoodsIds(this.form.useGood);
+        });
+      }else{
+        this.title = "新增优惠券";
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+        });
+      }
+    },
+    getGoodsIds(data, type) {
+        if (type == "array") {
+            let array = data.join(",")
+            return array
+
+        } else {
+            let string = data.split(",");
+            return string
+        }
+    },
+    changeNumber(key) {
+      if(this.form[key] * 1 < 1){
+        this.$message.error("输入需大于或等于1!");
+        this.$set(this.form, key, '');
+        return false
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      delete this.form.useDate;
+      this.form.useGood = this.getGoodsIds(this.form.useGood, "array")
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          try {
+            this.loading = true;
+            const { code } = await saveAndEdit({ ...this.form });
+            if (code === 200) {
+              this.$message.success("操作成功!");
+              this.$emit("getList");
+              this.cancel();
+            }
+          } catch (error) {
+          } finally {
+            this.loading = false;
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'couponName', '');
+      this.$set(this.form, 'type', '');
+      this.$set(this.form, 'quota', '');
+      this.$set(this.form, 'useUserType', 1);
+      this.$set(this.form, 'usePerform', '');
+      this.$set(this.form, 'useGood', '');
+      this.$set(this.form, 'useThresholdType', '');
+      this.$set(this.form, 'useThresholdAmount', '');
+      this.$set(this.form, 'channelType', 1);
+      this.$set(this.form, 'issuseNum', '');
+      this.$set(this.form, 'isAdd', '');
+      this.$set(this.form, 'receiveType', '');
+      this.$set(this.form, 'receiveNum', '');
+      this.$set(this.form, 'useType', '');
+      this.$set(this.form, 'useStartDate', '');
+      this.$set(this.form, 'useEndDate', '');
+      this.$set(this.form, 'useDay', '');
+      this.$set(this.form, 'useDate', '');
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    /** 查询剧目列表 */
+    getPerformList() {
+      goodsPageList({status:1,pageNum:1,pageSize:999})
+      .then(response => {
+          this.performList = response.data.rows.map(item => {return {label:item.name,value:item.id,goodsList:item.goodsList}});
+        }
+      );
+    },
+    performChange(e){
+      // console.log('performChange',e);
+      // console.log('this.performList',this.performList);
+      // this.$set(this.form, 'useGood', '');
+      // console.log('performChange',e);
+      let goodsList = this.performList.filter(item => {return item.value == e})[0].goodsList;
+      this.goodsList = goodsList;
+      // console.log('goodsList',this.goodsList);
+      // console.log('useGood',this.form.useGood);
+      this.$set(this.form, 'useGood', null);
+
+    },
+    useStartDateChange(e){
+      // console.log('useStartDateChange',e);
+      // console.log('useStartDate',this.form.useDate);
+      this.form.useStartDate  = e[0];
+      this.form.useEndDate = e[1];
+      console.log(' this.form.useStartDate', this.form.useStartDate);
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 0 30px;
+  max-height: 65vh;
+  overflow-y: auto;
+}
+.dialog {
+  padding: 0 30px;
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+</style>

src/views/marketing/coupon/index.vue

@@ -0,0 +1,287 @@
+<!--
+ * @Description: 
+ * @Author: gcz
+ * @Date: 2024-03-04 15:03:37
+ * @LastEditors: gcz
+ * @LastEditTime: 2024-03-14 15:21:15
+ * @FilePath: \great_webui\src\views\marketing\coupon\index.vue
+ * @Copyright: Copyright (c) 2016~2024 by gcz, All Rights Reserved. 
+-->
+<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="优惠券名称" label-width="100px">
+        <el-input
+          v-model="queryParams.couponName"
+          placeholder="请输入优惠券名称"
+          clearable
+          style="width: 140px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="状态">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="状态"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusList"
+            :key="dict.value"
+            :label="dict.name"
+            :value="dict.value"
+          />
+        </el-select>
+      </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="['marketing:coupon:add']"
+            >添加</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table ref="tables" v-loading="loading" :data="dataList" border>
+      <!-- <el-table-column label="序号" align="center" type="index" width="50"></el-table-column> -->
+      <el-table-column label="批次号" align="center" prop="couponBatch" width="140" />
+      <el-table-column label="优惠劵名称" align="center" prop="couponName" />
+      <el-table-column label="优惠额度" align="center" prop="quota">
+        <template slot-scope="scope">
+          <span>{{scope.row.quota}}{{ scope.row.type==1?'(元)':'(折)' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <span>{{ scope.row.type==1?'满减':'折扣' }}</span>
+          <!-- <dict-tag :options="dict.type.template_ident" :value="scope.row.templateIdent"/> -->
+        </template>
+      </el-table-column>
+      <el-table-column label="使用对象" align="center" prop="useUserType">
+        <template slot-scope="scope">
+          <span v-if="scope.row.useUserType==1">所有用户</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="使用剧目" align="center" prop="usePerformName" />
+      <el-table-column label="使用票务" align="center" prop="useGoodName" />
+      <el-table-column label="使用时间类型" align="center" prop="useType">
+        <template slot-scope="scope">
+          <span v-if="scope.row.useType==1">指定周期</span>
+          <span v-if="scope.row.useType==2">领取后计算</span>
+          <!-- <dict-tag :options="dict.type.template_ident" :value="scope.row.templateIdent"/> -->
+        </template>
+      </el-table-column>
+      <el-table-column label="领用时间" align="center" prop="useStartDate">
+        <template slot-scope="scope">
+          <span v-if="scope.row.useType==1">{{scope.row.useStartDate}}至{{scope.row.useEndDate}}</span>
+          <span v-if="scope.row.useType==2">领取{{scope.row.useDay}}天后失效</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <!-- <el-button
+            size="mini"
+            type="text"
+            @click="ionlineApi(scope.row)"
+            v-hasPermi="['marketing:coupon:edit']"
+          >{{scope.row.status == '1' ? '禁用' : '启用'}}</el-button> -->
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['marketing:coupon:edit']"
+          >编辑</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row,scope.index)"
+            v-hasPermi="['marketing:coupon:delete']"
+          >删除</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"
+    />
+
+    <!-- 新增/编辑弹框 -->
+    <add-and-edit
+      ref="addAndEdit"
+      :dict="dict"
+      @getList="getList"
+    />
+
+
+    <el-dialog
+      title="查看"
+      :visible.sync="visibleStatus"
+      width="600px"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <div v-if="visibleType == 'img'">
+        <el-image
+          style="width: 400px; height: 100%"
+          :src="newObj.mainImg"
+          fit="cover"
+        />
+      </div>
+      <div v-if="visibleType == 'html'">
+        <div v-html="newObj.centent"></div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="visibleStatus = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import { pageList, deleteById, ionline,resetPwd } from '@/api/coupon/coupon'
+import addAndEdit from "./dialog/addAndEdit.vue";
+
+export default {
+  name: "agreement",
+  dicts: ['template_ident'],
+  components: { addAndEdit },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: undefined
+      },
+      visibleStatus: false,
+      newObj: {},
+      visibleType: ''
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      .then(response => {
+          this.dataList = response.data.rows;
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.$set(this.queryParams, 'couponName', '');
+      this.$set(this.queryParams, 'status', '');
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs["addAndEdit"].openDialog("新增数据", null);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$refs["addAndEdit"].openDialog("修改数据", row);
+    },
+
+    /** 发布或者取消发布按钮操作 */
+    ionlineApi(row) {
+      this.$confirm("是否对-" + row.couponName + (row.status == 1 ? '-禁用？' : '-启用？'), '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        ionline({ id: row.id, status: row.status == 1 ? 0 : 1 }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.getList();
+          }
+        });
+      }).catch(() => {});
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除"' + row.couponName + '"的数据项？').then(function() {
+        return deleteById(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 查看按钮操作 */
+    seeCenter(obj, type) {
+      this.visibleStatus = true
+      this.visibleType = type;
+      this.newObj = obj;
+    }
+  }
+};
+</script>

src/views/system/user/index.vue

@@ -184,8 +184,8 @@
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                     v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
-                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                  <!-- <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item> -->
                 </el-dropdown-menu>
               </el-dropdown>
             </template>