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/api/system/coupon.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询优惠券列表
+export function listCoupon(query) {
+  return request({
+    url: '/system/coupon/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询优惠券详细
+export function getCoupon(couponId) {
+  return request({
+    url: '/system/coupon/' + couponId,
+    method: 'get'
+  })
+}
+
+// 新增优惠券
+export function addCoupon(data) {
+  return request({
+    url: '/system/coupon',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改优惠券
+export function updateCoupon(data) {
+  return request({
+    url: '/system/coupon',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除优惠券
+export function delCoupon(couponId) {
+  return request({
+    url: '/system/coupon/' + couponId,
+    method: 'delete'
+  })
+}

src/assets/icons/svg/coupon.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1722825439703" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5426" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M821.333333 138.666667c64.8 0 117.333333 52.533333 117.333334 117.333333v149.333333a32 32 0 0 1-32 32 74.666667 74.666667 0 0 0 0 149.333334 32 32 0 0 1 32 32v149.333333c0 64.8-52.533333 117.333333-117.333334 117.333333H202.666667c-64.8 0-117.333333-52.533333-117.333334-117.333333V618.666667a32 32 0 0 1 32-32 74.666667 74.666667 0 0 0 0-149.333334 32 32 0 0 1-32-32V256c0-64.8 52.533333-117.333333 117.333334-117.333333h618.666666zM428.576 329.994667a32 32 0 0 0-43.733333-2.581334l-1.514667 1.344a32 32 0 0 0-2.581333 43.733334L452.565333 458.666667H405.333333l-1.877333 0.053333A32 32 0 0 0 373.333333 490.666667l0.053334 1.877333A32 32 0 0 0 405.333333 522.666667h80v42.666666H405.333333l-1.877333 0.053334A32 32 0 0 0 373.333333 597.333333l0.053334 1.877334A32 32 0 0 0 405.333333 629.333333h80v42.666667l0.053334 1.877333A32 32 0 0 0 517.333333 704l1.877334-0.053333A32 32 0 0 0 549.333333 672v-42.666667H618.666667l1.877333-0.053333A32 32 0 0 0 650.666667 597.333333l-0.053334-1.877333A32 32 0 0 0 618.666667 565.333333h-69.333334v-42.666666H618.666667l1.877333-0.053334A32 32 0 0 0 650.666667 490.666667l-0.053334-1.877334A32 32 0 0 0 618.666667 458.666667h-47.253334l71.84-86.186667 1.248-1.589333a32 32 0 0 0-50.421333-39.381334L512 430.016l-82.08-98.506667z" fill="#bfbfbf" p-id="5427"></path></svg>

src/assets/icons/svg/marketing.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1722823248832" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4334" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M863.187627 919.371093H122.88v-62.208h771.413333v62.208h-31.105706z m-192.853334-111.977813v-410.589867c0-21.149013 13.687467-26.125653 31.105707-41.058986 31.102293-24.886613 100.778667-85.848747 100.778667-85.848747l58.48064 32.34816L894.293333 223.85664v583.53664h-223.95904z m-49.769813-360.820053v360.820053h-12.4416c-65.9456 0-123.17696 1.242453-186.630827 0h-24.886613V446.57664s73.407147 43.543893 108.243627 41.055573c36.08576-2.491733 115.715413-41.058987 115.715413-41.058986z m176.674133-230.181547c-8.704 7.46496-17.411413 12.4416-24.879786 19.90656-75.895467 64.703147-151.79776 130.64192-226.44736 195.341653-19.90656 17.41824-38.570667 19.909973-60.965547 4.97664-51.012267-32.34816-104.512853-60.965547-154.282667-94.562986-28.617387-19.90656-48.523947-17.41824-72.16128 6.219093-21.152427 21.15584-46.03904 38.570667-68.43392 57.238187-16.172373 12.4416-33.590613 19.909973-49.769813 2.48832-16.172373-17.41824-4.97664-32.34816 9.956693-44.793174 37.328213-31.105707 74.653013-60.965547 111.977814-92.071253 18.664107-16.175787 34.839893-14.92992 55.99232-2.48832 63.453867 39.816533 126.907733 77.141333 192.853333 116.954453 80.86528-69.676373 160.498347-139.352747 242.61632-210.271573-12.4416-12.4416-21.149013-21.152427-33.590613-34.83648 57.234773-13.687467 110.738773-27.374933 170.45504-43.547307-16.175787 57.23136-29.85984 107.001173-44.793174 160.50176-17.411413-13.68064-32.34816-26.12224-48.52736-41.055573zM294.58432 376.89344c47.27808 13.687467 52.258133 39.816533 52.258133 82.117973 1.242453 99.536213 0 247.599787 0 348.378454H122.88v-284.928c0-6.219093 14.933333-17.41824 21.152427-22.39488 49.769813-41.05216 100.78208-82.11456 150.551893-123.173547z" fill="#bfbfbf" p-id="4335"></path></svg>

src/views/system/article/index.vue

@@ -1,6 +1,16 @@
 <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="deptId" v-if="userName == 'admin'">
+        <el-select v-model="queryParams.deptId" placeholder="请选择运营商" clearable>
+          <el-option
+            v-for="item in deptOptions"
+            :key="item.deptId"
+            :label="item.deptName"
+            :value="item.deptId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="标题" prop="title">
         <el-input
           v-model="queryParams.title"
@@ -66,6 +76,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="文章id" align="center" prop="articleId" />
       <el-table-column label="分类" align="center" key="classifyName" prop="classify.classifyName" :show-overflow-tooltip="true" />
+      <el-table-column label="运营商" align="center" prop="deptName" />
+      <el-table-column label="运营区" align="center" prop="areaName" />
 <!--      <el-table-column label="分类" align="center" prop="classifyName">-->
 <!--        <template slot-scope="scope">-->
 <!--          <dict-tag :options="dict.type.article_classify" :value="scope.row.classify"/>-->
@@ -87,6 +99,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
+            v-if="(scope.row.classify.classifyName != '帮助中心' && scope.row.classify.classifyName != '猜你想问' && scope.row.classify.classifyName != '使用问题') || userName == 'admin'"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -94,6 +107,7 @@
             v-hasPermi="['system:article:edit']"
           >修改</el-button>
           <el-button
+            v-if="(scope.row.classify.classifyName != '帮助中心' && scope.row.classify.classifyName != '猜你想问' && scope.row.classify.classifyName != '使用问题') || userName == 'admin'"
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -190,7 +204,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
-      // userName: undefined,
+      userName: undefined,
       // 遮罩层
       loading: true,
       // 运营区下拉框
@@ -234,8 +248,8 @@ export default {
     };
   },
   created() {
-    // console.log("当前用户信息：",this.$store.state.user.name)
-    // this.userName = this.$store.state.user.name;
+    console.log("当前用户信息：",this.$store.state.user.name)
+    this.userName = this.$store.state.user.name;
     this.getList();
     this.getClassifyTree();
   },

src/views/system/articleClassify/index.vue

@@ -199,6 +199,7 @@
   } from '@/api/system/articleClassify'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  import { listDept2 } from '@/api/system/dept'
 
 export default {
   name: "Dept",
@@ -263,7 +264,7 @@ export default {
     /** 查询分类列表 */
     getList() {
       this.loading = true;
-      listDept(this.queryParams).then(response => {
+      listDept2({status: '0',pageNum:1,pageSize:999  }).then(response => {
         this.deptList = this.handleTree(response.data, "classifyId");
         this.loading = false;
       });

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

@@ -0,0 +1,353 @@
+<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="type">
+        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable>
+          <el-option
+            v-for="dict in dict.type.et_coupon_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="运营区" prop="areaName">
+        <el-input
+          v-model="queryParams.areaName"
+          placeholder="请输入运营区"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+          <el-option
+            v-for="dict in dict.type.et_coupon_status"
+            :key="dict.value"
+            :label="dict.label"
+            :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="['system:coupon: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:coupon: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:coupon: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:coupon:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="couponList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="优惠券id" align="center" prop="couponId" />
+      <el-table-column label="类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.et_coupon_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+      <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>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.et_coupon_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <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:coupon:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:coupon: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="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option
+              v-for="dict in dict.type.et_coupon_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="折扣比例" prop="discountPercent">
+          <el-input v-model="form.discountPercent" placeholder="请输入折扣比例" />
+        </el-form-item>
+        <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="discountAmount">
+          <el-input v-model="form.discountAmount" placeholder="请输入抵扣金额" />
+        </el-form-item>
+        <el-form-item label="有效时间" prop="expirationTime">
+          <el-date-picker clearable
+            v-model="form.expirationTime"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择有效时间">
+          </el-date-picker>
+        </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 { listCoupon, getCoupon, delCoupon, addCoupon, updateCoupon } from "@/api/system/coupon";
+
+export default {
+  name: "Coupon",
+  dicts: ['et_coupon_type', 'et_coupon_status','et_coupon_time_limit'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 优惠券表格数据
+      couponList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: null,
+        discountPercent: null,
+        areaId: null,
+        userId: null,
+        discountAmount: null,
+        expirationTime: null,
+        status: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "用户不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    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;
+      listCoupon(this.queryParams).then(response => {
+        this.couponList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        couponId: null,
+        type: null,
+        discountPercent: null,
+        areaId: null,
+        userId: null,
+        discountAmount: null,
+        createTime: null,
+        expirationTime: null,
+        status: 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.couponId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加优惠券";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const couponId = row.couponId || this.ids
+      getCoupon(couponId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改优惠券";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.couponId != null) {
+            updateCoupon(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCoupon(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const couponIds = row.couponId || this.ids;
+      this.$modal.confirm('是否确认删除优惠券编号为"' + couponIds + '"的数据项？').then(function() {
+        return delCoupon(couponIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/coupon/export', {
+        ...this.queryParams
+      }, `coupon_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/system/dept/index.vue

@@ -107,12 +107,17 @@
           <span class="balance-cell">{{ scope.row.balance }}元</span>
         </template>
       </el-table-column>
+      <el-table-column label="收款码" align="center" prop="collectionCode" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.collectionCode" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="200" sortable="custom" :sort-orders="['descending', 'ascending']">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -143,17 +148,18 @@
                 @pagination="getList" />
 
     <!-- 添加或修改运营商对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="运营商名称" label-width="90" prop="deptName">
-              <el-input v-model="form.deptName" style="width: 67%;" placeholder="请输入运营商名称" />
+            <el-form-item label="运营商名称" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入运营商名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="绑定提现账户" prop="phonenumber" label-width="120">
               <el-select
+                style="width: 80%"
                 ref="headerSearchSelect"
                 v-model="form.appUserId"
                 :remote-method="queryPhonenumber"
@@ -239,7 +245,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="平台服务费(%)" label-width="90" prop="platformServiceFee">
-                <el-input style="width: 65%" v-model="form.platformServiceFee" placeholder="请输入平台服务费" />
+                <el-input style="width: 78%" v-model="form.platformServiceFee" placeholder="请输入平台服务费" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -256,18 +262,25 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="充值手续费" label-width="90" prop="handlingCharge">
-                <el-input style="width: 65%" v-model="form.handlingCharge" placeholder="请输入充值手续费" />
+              <el-form-item label="充值手续费" prop="handlingCharge">
+                <el-input v-model="form.handlingCharge" placeholder="请输入充值手续费" />
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="form.handlingChargeType == '1'">
-              <el-form-item label="比例(‰)" label-width="90" >
-                <el-input style="width: 65%" v-model="form.withdrawHandlingCharge" placeholder="请输入手续费" />
+              <el-form-item label="比例(‰)" >
+                <el-input v-model="form.withdrawHandlingCharge" placeholder="请输入手续费" />
               </el-form-item>
             </el-col>
             <el-col :span="12" v-else>
-              <el-form-item label="每笔(元)" label-width="90" >
-                <el-input style="width: 65%" v-model="form.withdrawHandlingCharge" placeholder="请输入手续费" />
+              <el-form-item label="每笔(元)" >
+                <el-input v-model="form.withdrawHandlingCharge" placeholder="请输入手续费" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="收款码" prop="collectionCode">
+                <image-upload v-model="form.collectionCode" :limit="1"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -277,26 +290,28 @@
                 <el-switch v-model="form.isUsePlatformApp" class="drawer-switch" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-show="form.isUsePlatformApp != true">
-              <el-form-item label="appid" prop="appid">
-                <el-input style="width: 93%" v-model="form.appid" placeholder="请输入appid" />
-              </el-form-item>
-            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12"  v-show="form.isUsePlatformApp != true">
               <el-form-item label="appSecret" prop="appSecret">
                 <el-input v-model="form.appSecret" placeholder="请输入appSecret" />
               </el-form-item>
             </el-col>
+            <el-col :span="12" v-show="form.isUsePlatformApp != true">
+              <el-form-item label="appid" prop="appid">
+                <el-input style="width: 100%" v-model="form.appid" placeholder="请输入appid" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="12" v-show="form.isUsePlatformApp != true">
               <el-form-item label="小程序名称" prop="appName" label-width="90px">
-                <el-input style="width: 93%" v-model="form.appName" placeholder="请输入小程序名称" />
+                <el-input style="width: 100%" v-model="form.appName" placeholder="请输入小程序名称" />
               </el-form-item>
             </el-col>
             <el-col :span="12" v-show="form.isUsePlatformApp != true">
               <el-form-item label="域名" prop="domain">
-                <el-input style="width: 93%" v-model="form.domain" placeholder="请输入域名" />
+                <el-input style="width: 100%" v-model="form.domain" placeholder="请输入域名" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -305,7 +320,7 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="商户号" prop="merchantId">
-                  <el-input style="width: 93%" v-model="form.merchantId" placeholder="请输入商户号" />
+                  <el-input style="width: 100%" v-model="form.merchantId" placeholder="请输入商户号" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -675,7 +690,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加运营商";
-      listDept().then(response => {
+      listDept2({status: '0',pageNum:1,pageSize:999  }).then(response => {
         // console.log("response=============",response)
         this.deptOptions = response.data;
         listArea({ pageNum: 1, pageSize: 999,}).then(response => {

src/views/system/fee/index.vue

@@ -343,7 +343,7 @@
 <script>
 import { listFee, getFee, delFee, addFee, updateFee } from "@/api/system/fee";
 import { listArea, selectAreaListByDeptId } from '@/api/system/area'
-import { listDept, listDeptExcludeChild } from '@/api/system/dept'
+import { listDept, listDept2, listDeptExcludeChild } from '@/api/system/dept'
 
 export default {
   name: "Fee",
@@ -466,8 +466,8 @@ export default {
     this.userName = this.$store.state.user.name;
     this.getList();
     if(this.userName === 'admin'){
-      listDept({status: '0' }).then(response => {
-        this.deptOptions = response.data;
+      listDept2({status: '0',pageNum:1,pageSize:999  }).then(response => {
+        this.deptOptions = response.rows;
       });
     }
     listArea(this.queryParams).then(response => {

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: {
     /** 查询车辆型号列表 */

src/views/system/order/index.vue

@@ -271,25 +271,65 @@
             <el-form-item label="计费模板：" >{{ form.rule.name }}</el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.etRefund">
-          <el-col :span="12">
-            <el-form-item label="预约费退款：">{{ formatFee(form.etRefund.appointmentFee) }}</el-form-item>
-            <el-form-item label="调度费退款：">{{ formatFee(form.etRefund.dispatchFee) }}</el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="骑行费用退款：" >{{ formatFee(form.etRefund.ridingFee) }}</el-form-item>
-            <el-form-item label="停车点外调度费退款：" >{{ formatFee(form.etRefund.manageFee) }}</el-form-item>
+        <el-row v-if="form.etRefunds.length > 0">
+          <el-col :span="24">
+            <el-card v-for="(refund, index) in form.etRefunds" :key="index" class="refund-card">
+              <span style="font-weight: 700">退款{{index+1}}</span>
+              <div class="refund-content">
+                <el-row>
+                  <el-col :span="12">
+                    <el-form-item label="预约费退款：">{{ formatFee(refund.appointmentFee) }}</el-form-item>
+                    <el-form-item label="运营区外调度费退款：" label-width="100">{{ formatFee(refund.dispatchFee) }}</el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="骑行费用退款：">{{ formatFee(refund.ridingFee) }}</el-form-item>
+                    <el-form-item label="停车点外调度费退款：" label-width="100">{{ formatFee(refund.manageFee) }}</el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="12">
+                    <el-form-item label="退款原因：">{{ refund.reason }}</el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="退款时间：">{{ refund.createTime }}</el-form-item>
+                  </el-col>
+                </el-row>
+              </div>
+            </el-card>
           </el-col>
         </el-row>
-        <el-row v-if="form.etRefund">
+<!--        <el-row v-if="form.etRefunds.length > 0">-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item v-for="(refund, index) in form.etRefunds" :key="index" label="预约费退款：">{{ formatFee(refund.appointmentFee) }}</el-form-item>-->
+<!--            <el-form-item v-for="(refund, index) in form.etRefunds" :key="index" label="调度费退款：">{{ formatFee(refund.dispatchFee) }}</el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item v-for="(refund, index) in form.etRefunds" :key="index" label="骑行费用退款：" >{{ formatFee(refund.ridingFee) }}</el-form-item>-->
+<!--            <el-form-item v-for="(refund, index) in form.etRefunds" :key="index" label="停车点外调度费退款：" >{{ formatFee(refund.manageFee) }}</el-form-item>-->
+<!--          </el-col>-->
+<!--&lt;!&ndash;          <el-col :span="12">&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-form-item label="预约费退款：">{{ formatFee(form.etRefund.appointmentFee) }}</el-form-item>&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-form-item label="调度费退款：">{{ formatFee(form.etRefund.dispatchFee) }}</el-form-item>&ndash;&gt;-->
+<!--&lt;!&ndash;          </el-col>&ndash;&gt;-->
+<!--&lt;!&ndash;          <el-col :span="12">&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-form-item label="骑行费用退款：" >{{ formatFee(form.etRefund.ridingFee) }}</el-form-item>&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-form-item label="停车点外调度费退款：" >{{ formatFee(form.etRefund.manageFee) }}</el-form-item>&ndash;&gt;-->
+<!--&lt;!&ndash;          </el-col>&ndash;&gt;-->
+<!--        </el-row>-->
+<!--        <el-row v-if="form.etRefunds.length > 0">-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item v-for="(refund, index) in etRefunds" :key="index" label="退款原因：">{{ refund.reason }}</el-form-item>-->
+<!--            <el-form-item v-for="(refund, index) in etRefunds" :key="index" label="退款时间：">{{ refund.createTime }}</el-form-item>-->
+<!--&lt;!&ndash;            <el-form-item label="退款原因：">{{ form.etRefund.reason }}</el-form-item>&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-form-item label="退款时间：">{{ form.etRefund.createTime }}</el-form-item>&ndash;&gt;-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+        <el-row v-if="form.etRefunds.length > 0">
           <el-col :span="12">
-            <el-form-item label="退款原因：">{{ form.etRefund.reason }}</el-form-item>
-            <el-form-item label="退款时间：">{{ form.etRefund.createTime }}</el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="form.etRefund">
-          <el-col :span="12">
-            <el-form-item label="结算总费用：">{{ formatFee(form.payFee-form.etRefund.appointmentFee-form.etRefund.dispatchFee-form.etRefund.ridingFee-form.etRefund.manageFee) }}</el-form-item>
+            <el-form-item label="结算总费用：">
+              {{ formatFee(calculateNetFee()) }}
+            </el-form-item>
+<!--            <el-form-item label="结算总费用：">{{ formatFee(form.payFee-form.etRefund.appointmentFee-form.etRefund.dispatchFee-form.etRefund.ridingFee-form.etRefund.manageFee) }}</el-form-item>-->
           </el-col>
         </el-row>
       </el-form>
@@ -568,6 +608,14 @@ export default {
       const formattedFee = parseFloat(fee).toFixed(2);
       return `${formattedFee}元`;
     },
+    calculateNetFee() {
+      // 计算总退款
+      let totalRefund = this.form.etRefunds.reduce((total, refund) => {
+        return total + refund.appointmentFee + refund.dispatchFee + refund.ridingFee + refund.manageFee;
+      }, 0);
+      // 计算结算总费用
+      return this.form.payFee - totalRefund;
+    },
     formatStatus(status) {
       //状态：0-预约中，1-取消预约，2-开始骑行，3-骑行结束，4-订单结束
       if (!status) return '未知';
@@ -653,6 +701,7 @@ export default {
           vehicleNum: null,
           mac: null
         },
+        etRefunds: [],
         etRefund: {
           appointmentFee: null,
           ridingFee: null,
@@ -794,4 +843,19 @@ export default {
   .el-dialog:not(.is-fullscreen) {
     margin-top: 1vh !important;
   }
+  .refund-card {
+    margin-bottom: 10px; /* 卡片之间的间距 */
+    border: 1px solid #dcdfe6; /* 边框颜色 */
+    border-radius: 4px; /* 边角圆润 */
+    /*padding: 10px; !* 内边距 *!*/
+  }
+
+  .refund-content {
+    padding: 10px;
+  }
+
+  .el-card__body {
+    padding: 10px !important;
+  }
+
 </style>

src/views/system/withdraw/index.vue

@@ -325,7 +325,7 @@ export default {
     });
     this.getList();
     if(this.userName === 'admin'){
-      listDept({status: '0' }).then(response => {
+      listDept({status: '0',pageNum:1,pageSize:999  }).then(response => {
         this.deptOptions = response.data;
       });
     }