Quellcode durchsuchen

消费导出关闭

wangtao vor 3 Jahren
Ursprung
Commit
cb290c0da2

+ 9 - 1
README.md

@@ -27,4 +27,12 @@ npm run build:stage
 
 # 构建生产环境
 npm run build:prod
-```
+```
+设备设施
+1.联调巡检管理新增接口
+
+充值系统
+1.新增消费场所商品类型静态页面
+2.新增消费场所商品管理静态页面
+3.新增消费场所预约管理静态页面
+

+ 128 - 0
src/api/recharge/consumePlaces.js

@@ -0,0 +1,128 @@
+import request from '@/utils/request'
+
+// 商品类型
+// 新增
+export function addType(data) {
+    return request({
+        url: '/dxtop/topChannel',
+        method: 'post',
+        data: data
+    })
+}
+// 删除
+export function delType(deptId) {
+    return request({
+        url: '/dxtop/topChannel/' + deptId,
+        method: 'delete',
+    })
+}
+// 修改
+export function updataType(data) {
+    return request({
+        url: '/dxtop/topChannel',
+        method: 'put',
+        data: data
+    })
+}
+
+// 查询
+export function getType(query) {
+    return request({
+        url: '/dxtop/topChannel/page',
+        method: 'get',
+        params: query
+    })
+}
+// 导出
+export function exportType(data) {
+    return request({
+        url: '/dxtop/order/exportDetail',
+        method: 'post',
+        data: data,
+    })
+}
+
+
+
+// 商品管理
+// 新增
+export function addManage(data) {
+    return request({
+        url: '/dxtop/topChannel',
+        method: 'post',
+        data: data
+    })
+}
+// 删除
+export function delManage(deptId) {
+    return request({
+        url: '/dxtop/topChannel/' + deptId,
+        method: 'delete',
+    })
+}
+// 修改
+export function updataManage(data) {
+    return request({
+        url: '/dxtop/topChannel',
+        method: 'put',
+        data: data
+    })
+}
+// 查询
+export function getManage(query) {
+    return request({
+        url: '/dxtop/topChannel/page',
+        method: 'get',
+        params: query
+    })
+}
+// 导出
+export function exportManage(data) {
+    return request({
+        url: '/dxtop/order/exportDetail',
+        method: 'post',
+        data: data,
+    })
+}
+
+
+// 预约管理
+// 新增
+export function addBooking(data) {
+    return request({
+        url: '/dxtop/topChannel',
+        method: 'post',
+        data: data
+    })
+}
+// 删除
+export function delBooking(deptId) {
+    return request({
+        url: '/dxtop/topChannel/' + deptId,
+        method: 'delete',
+    })
+}
+// 修改
+export function updataBooking(data) {
+    return request({
+        url: '/dxtop/topChannel',
+        method: 'put',
+        data: data
+    })
+}
+// 查询
+export function getBooking(query) {
+    return request({
+        url: '/dxtop/topChannel/page',
+        method: 'get',
+        params: query
+    })
+}
+// 导出
+export function exportBooking(data) {
+    return request({
+        url: '/dxtop/order/exportDetail',
+        method: 'post',
+        data: data,
+    })
+}

+ 7 - 7
src/api/recharge/consumption.js

@@ -17,10 +17,10 @@ export function listDetal(data) {
 //     })
 // }
 // 导出
-export function exportDetail(data) {
-    return request({
-        url: '/dxtop/order/exportDetail',
-        method: 'post',
-        data: data,
-    })
-}
+// export function exportDetail(data) {
+//     return request({
+//         url: '',
+//         method: 'post',
+//         data: data,
+//     })
+// }

+ 2 - 0
src/assets/icons/svg/消费圈.svg

@@ -0,0 +1,2 @@
+<?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="1655964120000" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9288" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M378.234 209.654c0 72.578 58.835 131.41 131.41 131.41 72.578 0 131.41-58.835 131.41-131.41 0-72.578-58.835-131.41-131.41-131.41-72.578 0-131.41 58.835-131.41 131.41z" p-id="9289"></path><path d="M683.446 704.214c0 72.578 58.835 131.41 131.41 131.41s131.41-58.835 131.41-131.41c0-72.578-58.835-131.41-131.41-131.41-72.578 0-131.41 58.835-131.41 131.41z" p-id="9290"></path><path d="M73.021 707.039c0 0 0 0 0 0 0 72.578 58.835 131.41 131.41 131.41 72.578 0 131.41-58.835 131.41-131.41 0 0 0 0 0 0 0 0 0 0 0 0 0-72.578-58.835-131.41-131.41-131.41-72.578 0-131.41 58.835-131.41 131.41s0 0 0 0z" p-id="9291"></path><path d="M235.34 536.136c7.595-151.826 136.562-222.494 136.562-222.494-38.124-47.205-34.832-113.162-34.832-113.162-234.038 120.118-218.351 355.462-218.351 355.462 58.417-32.402 116.621-19.805 116.621-19.805z" p-id="9292"></path><path d="M785.014 535.962c59.883-12.112 116.621 20.556 116.621 20.556-4.363-267.092-218.34-356.034-218.34-356.034 3.216 66.868-34.835 113.157-34.835 113.157 135.989 79.969 136.554 222.317 136.554 222.317z" p-id="9293"></path><path d="M659.409 783.066c-157.802 99.58-299.227-0.505-299.227-0.505-28.933 59.067-84.976 82.331-84.976 82.331 247.875 177.168 469.573 0.286 469.573 0.286-62.066-26.966-85.374-82.112-85.374-82.112z" p-id="9294"></path></svg>

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 0
src/assets/icons/svg/预约.svg


+ 1 - 1
src/store/modules/user.js

@@ -112,4 +112,4 @@ const user = {
     }
 }
 
-export default user
+export default user

+ 0 - 1
src/views/login.vue

@@ -142,7 +142,6 @@ export default {
       }else{
         this.passwordtxt = "password"
       }
-
     },
     getCode() {
       getCodeImg().then(res => {

+ 5 - 0
src/views/recharge/channel/index.vue

@@ -26,6 +26,11 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="adminList" height="calc(100vh - 10vh - 120px)">
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <template slot-scope="scope">
+         {{scope.$index + 1}}
+        </template>
+      </el-table-column>
       <el-table-column label="渠道名称" align="center" prop="name" show-overflow-tooltip />
       <el-table-column label="渠道标识" align="center" prop="aliasName" show-overflow-tooltip />
       <el-table-column label="创建人" align="center" prop="createBy"  show-overflow-tooltip />

+ 363 - 0
src/views/recharge/consumePlaces/bookingManagement/index.vue

@@ -0,0 +1,363 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="预约人" >
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入预约人"
+          clearable
+          size="small"
+          style="width: 140px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品类型" >
+          <el-select v-model="queryParams.type"  placeholder="请选择商品类型" size="small"  style="width: 80px">
+            <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in typeList" :key="item" />
+          </el-select>
+      </el-form-item>
+      <el-form-item label="预约日期" >
+         <el-date-picker v-model="queryParams.orderTime" type="datetime" placeholder="选择预约日期" value-format="yyyy-MM-dd" />
+      </el-form-item>
+
+      <el-form-item label="执行时段" >
+          <el-select v-model="queryParams.startTime"  placeholder="请选择开始时间" size="small"  style="width: 80px">
+            <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in implementTime" :key="item" />
+          </el-select>
+          --
+          <el-select v-model="queryParams.endTime"  placeholder="请选择截止时间" size="small"  style="width: 80px">
+            <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in implementTime" :key="item" />
+          </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['system:admin:export']"
+        >导出</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:admin:add']"
+        >新增</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="adminList" >
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <template slot-scope="scope">
+         {{scope.$index + 1}}
+        </template>
+      </el-table-column>
+      <el-table-column label="预约人" align="center" prop="a" show-overflow-tooltip/>
+      <el-table-column label="商品类型" align="center" prop="a" show-overflow-tooltip/>
+      <el-table-column label="商品名称" align="center" prop="b" show-overflow-tooltip />
+      <el-table-column label="预约日期" align="center" prop="b" show-overflow-tooltip />
+      <el-table-column label="预约时段" align="center" prop="b" show-overflow-tooltip />
+      <el-table-column label="状态" align="center" prop="b" show-overflow-tooltip />
+      <el-table-column label="单价(元、每次)" align="center" prop="b" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="center" prop="d"  show-overflow-tooltip />
+      <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-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:admin:remove']"
+          >退订</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.current"
+      :limit.sync="queryParams.size"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog   :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false"  >
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
+        <el-row :gutter="20">
+          <el-col :span="16">
+            <el-form-item label="商品名称" prop="name" >
+              <el-input v-model="form.name" placeholder="请输入商品名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生效状态" prop="status" >
+              <el-select v-model="form.status"  placeholder="请选择生效状态" size="small"  style="width: 80px">
+                <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in statusList" :key="item" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="商品类型" prop="type" >
+              <el-select v-model="form.type"  placeholder="请选择商品类型" size="small"  style="width: 80px">
+                <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in typeList" :key="item" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="重复周期" prop="checkList" >
+              <el-checkbox-group v-model="form.checkList" >
+                <el-checkbox v-for="date in cycleList" :label="date.key" :key="date.key">{{date.label}}</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="执行时段" >
+                <el-select v-model="form.startTime"  placeholder="请选择开始时间" size="small"  style="width: 80px">
+                  <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in implementTime" :key="item" />
+                </el-select>
+                --
+                <el-select v-model="form.endTime"  placeholder="请选择截止时间" size="small"  style="width: 80px">
+                  <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in implementTime" :key="item" />
+                </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm" v-if="!loading">确 定</el-button>
+          <el-button :loading="loading" type="primary" @click="submitForm" v-else>提交中...</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { addBooking, updataBooking, delBooking, getBooking, exportBooking } from "@/api/recharge/consumePlaces";
+export default {
+  name: "admin",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      dialogFormVisible:false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 参数表格数据
+      adminList: [
+        {a:1,b:2,c:3,d:4,f:5}
+      ],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 类型数据字典
+      typeOptions: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        current: 1,
+        size: 10,
+        name: undefined,
+        aliasName: undefined,
+      },
+
+      typeList:[
+        {value:"",lable:"全部"},
+        {value:"1",lable:"商品1"},
+        {value:"2",lable:"商品2"},
+      ],
+
+      implementTime:[],//执行时段
+      // 表单参数
+      form: {
+
+      },
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "商品名称不能为空", trigger: "blur" }
+        ],
+        logo: [
+          { required: true, message: "商品类型不能为空", trigger: "change" }
+        ],
+        logo: [
+          { required: true, message: "重复周期不能为空", trigger: "change" }
+        ],
+        logo: [
+          { required: true, message: "执行时段不能为空", trigger: "change" }
+        ],
+        logo: [
+          { required: true, message: "单价不能为空", trigger: "change" }
+        ],
+
+      },
+
+
+    };
+  },
+  created() {
+    this.getList()
+    this.zxtime()
+  },
+  methods: {
+    /** 执行时间 */
+    zxtime(){
+      let arr = []
+      for(let i = 0; i<48;i++){
+        arr[i] = {}
+        if(i%2 == "NaN"){
+          arr[i].dictValue="00:00:00"
+        }
+        if(i%2 == "0"){
+          if(i/2>=10){
+            arr[i].dictValue= i/2 + ":00:00"
+          }else{
+            arr[i].dictValue="0" + i/2 + ":00:00"
+          }
+        }
+        if(i%2 == "1"){
+          if(i/2>=10){
+            arr[i].dictValue=(i-1)/2 + ":30:00"
+          }else{
+            arr[i].dictValue="0" + (i-1)/2 + ":30:00"
+          }
+        }
+      }
+      this.implementTime = arr
+    },
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true;
+      getBooking(this.queryParams).then(response => {
+        this.adminList = response.data.records
+        this.loading = false;
+      })
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        name: undefined,
+        status: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.current = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.form.id =undefined
+      this.form.name =undefined
+      this.form.introduce =undefined
+      this.reset();
+      this.open = true;
+      this.title = "添加参数";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.form =JSON.stringify(row)
+      this.open = true;
+      this.title = "修改参数";
+    },
+
+    /** 提交按钮 */
+    submitForm(row) {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (this.form.id != undefined) {
+            updataBooking(this.form).then(response => {
+              this.loading = false
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).catch(()=>{
+              this.loading = false,
+              this.open = false
+            })
+          } else {
+            addBooking(this.form).then(response => {
+              this.loading = false
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).catch(()=>{
+              this.loading = false,
+              this.open = false
+            })
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认退订', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delBooking(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 刷新缓存按钮操作 */
+    handleRefreshCache() {
+      refreshCache().then(() => {
+        this.msgSuccess("刷新成功");
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      let queryParams = {...this.queryParams};
+      delete queryParams.current
+      delete queryParams.size
+      this.exportLoading = true;
+      exportBooking(queryParams).then(response =>{
+        this.exportLoading = false;
+        localStorage.setItem('fileExportId', response.data)
+        this.$router.push({path:'/recharge/fileExport'})
+      })
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+</style>
+

+ 397 - 0
src/views/recharge/consumePlaces/commodityManagement/index.vue

@@ -0,0 +1,397 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="类型名称" >
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入类型名称"
+          clearable
+          size="small"
+          style="width: 140px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="生效状态" >
+          <el-select v-model="queryParams.status"  placeholder="请选择生效状态" size="small"  style="width: 80px">
+            <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in statusList" :key="item" />
+          </el-select>
+      </el-form-item>
+      <el-form-item label="商品类型" >
+          <el-select v-model="queryParams.type"  placeholder="请选择商品类型" size="small"  style="width: 80px">
+            <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in typeList" :key="item" />
+          </el-select>
+      </el-form-item>
+      <el-form-item label="重复周期" >
+          <el-select v-model="queryParams.cycle"  placeholder="请选择重复周期" size="small"  style="width: 80px">
+            <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in cycleList" :key="item" />
+          </el-select>
+      </el-form-item>
+      <el-form-item label="执行时段" >
+          <el-select v-model="queryParams.startTime"  placeholder="请选择开始时间" size="small"  style="width: 80px">
+            <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in implementTime" :key="item" />
+          </el-select>
+          --
+          <el-select v-model="queryParams.endTime"  placeholder="请选择截止时间" size="small"  style="width: 80px">
+            <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in implementTime" :key="item" />
+          </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['system:admin:export']"
+        >导出</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:admin:add']"
+        >新增</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="adminList" >
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <template slot-scope="scope">
+         {{scope.$index + 1}}
+        </template>
+      </el-table-column>
+      <el-table-column label="商品名称" align="center" prop="a" show-overflow-tooltip/>
+      <el-table-column label="商品类型" align="center" prop="a" show-overflow-tooltip/>
+      <el-table-column label="生效状态" align="center" prop="b" show-overflow-tooltip />
+      <el-table-column label="重复周期" align="center" prop="b" show-overflow-tooltip />
+      <el-table-column label="开始时间" align="center" prop="b" show-overflow-tooltip />
+      <el-table-column label="截止时间" align="center" prop="b" show-overflow-tooltip />
+      <el-table-column label="单价(元、每次)" align="center" prop="b" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="center" prop="d"  show-overflow-tooltip />
+      <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:admin:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:admin:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.current"
+      :limit.sync="queryParams.size"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog   :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false"  >
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
+        <el-row :gutter="20">
+          <el-col :span="16">
+            <el-form-item label="商品名称" prop="name" >
+              <el-input v-model="form.name" placeholder="请输入商品名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生效状态" prop="status" >
+              <el-select v-model="form.status"  placeholder="请选择生效状态" size="small"  style="width: 80px">
+                <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in statusList" :key="item" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="商品类型" prop="type" >
+              <el-select v-model="form.type"  placeholder="请选择商品类型" size="small"  style="width: 80px">
+                <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in typeList" :key="item" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="重复周期" prop="checkList" >
+              <el-checkbox-group v-model="form.checkList" >
+                <el-checkbox v-for="date in cycleList" :label="date.key" :key="date.key">{{date.label}}</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="执行时段" >
+                <el-select v-model="form.startTime"  placeholder="请选择开始时间" size="small"  style="width: 80px">
+                  <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in implementTime" :key="item" />
+                </el-select>
+                --
+                <el-select v-model="form.endTime"  placeholder="请选择截止时间" size="small"  style="width: 80px">
+                  <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in implementTime" :key="item" />
+                </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm" v-if="!loading">确 定</el-button>
+          <el-button :loading="loading" type="primary" @click="submitForm" v-else>提交中...</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { addManage, updataManage, delManage, getManage, exportManage } from "@/api/recharge/consumePlaces";
+export default {
+  name: "admin",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      dialogFormVisible:false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 参数表格数据
+      adminList: [
+        {a:1,b:2,c:3,d:4,f:5}
+      ],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 类型数据字典
+      typeOptions: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        current: 1,
+        size: 10,
+        name: undefined,
+        aliasName: undefined,
+      },
+      statusList:[
+        {value:"",lable:"全部"},
+        {value:"1",lable:"有效"},
+        {value:"2",lable:"无效"},
+      ],
+      typeList:[
+        {value:"",lable:"全部"},
+        {value:"1",lable:"商品1"},
+        {value:"2",lable:"商品2"},
+      ],
+      cycleList:[
+        {value:"",lable:"全部"},
+        {value:"1",lable:"每日"},
+        {value:"2",lable:"每工作日"},
+        {value:"3",lable:"周末"},
+      ],
+      implementTime:[],//执行时段
+      cycleList:[
+        {key:1,lable:"周一"},
+        {key:2,lable:"周二"},
+        {key:3,lable:"周三"},
+        {key:4,lable:"周四"},
+        {key:5,lable:"周五"},
+        {key:6,lable:"周六"},
+        {key:7,lable:"周日"},
+        {key:8,lable:"每天"},
+        {key:9,lable:"每工作日"},
+        {key:10,lable:"周末"}
+      ],
+      // 表单参数
+      form: {
+
+      },
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "商品名称不能为空", trigger: "blur" }
+        ],
+        logo: [
+          { required: true, message: "商品类型不能为空", trigger: "change" }
+        ],
+        logo: [
+          { required: true, message: "重复周期不能为空", trigger: "change" }
+        ],
+        logo: [
+          { required: true, message: "执行时段不能为空", trigger: "change" }
+        ],
+        logo: [
+          { required: true, message: "单价不能为空", trigger: "change" }
+        ],
+
+      },
+
+
+    };
+  },
+  created() {
+    this.getList()
+    this.zxtime()
+  },
+  methods: {
+    /** 执行时间 */
+    zxtime(){
+      let arr = []
+      for(let i = 0; i<48;i++){
+        arr[i] = {}
+        if(i%2 == "NaN"){
+          arr[i].dictValue="00:00:00"
+        }
+        if(i%2 == "0"){
+          if(i/2>=10){
+            arr[i].dictValue= i/2 + ":00:00"
+          }else{
+            arr[i].dictValue="0" + i/2 + ":00:00"
+          }
+        }
+        if(i%2 == "1"){
+          if(i/2>=10){
+            arr[i].dictValue=(i-1)/2 + ":30:00"
+          }else{
+            arr[i].dictValue="0" + (i-1)/2 + ":30:00"
+          }
+        }
+      }
+      this.implementTime = arr
+    },
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true;
+      getManage(this.queryParams).then(response => {
+        this.adminList = response.data.records
+        this.loading = false;
+      })
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        name: undefined,
+        status: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.current = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.form.id =undefined
+      this.form.name =undefined
+      this.form.introduce =undefined
+      this.reset();
+      this.open = true;
+      this.title = "添加参数";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.form =JSON.stringify(row)
+      this.open = true;
+      this.title = "修改参数";
+    },
+
+    /** 提交按钮 */
+    submitForm(row) {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (this.form.id != undefined) {
+            updataManage(this.form).then(response => {
+              this.loading = false
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).catch(()=>{
+              this.loading = false,
+              this.open = false
+            })
+          } else {
+            addManage(this.form).then(response => {
+              this.loading = false
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).catch(()=>{
+              this.loading = false,
+              this.open = false
+            })
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delManage(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 刷新缓存按钮操作 */
+    handleRefreshCache() {
+      refreshCache().then(() => {
+        this.msgSuccess("刷新成功");
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      let queryParams = {...this.queryParams};
+      delete queryParams.current
+      delete queryParams.size
+      this.exportLoading = true;
+      exportManage(queryParams).then(response =>{
+        this.exportLoading = false;
+        localStorage.setItem('fileExportId', response.data)
+        this.$router.push({path:'/recharge/fileExport'})
+      })
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+</style>
+

+ 321 - 0
src/views/recharge/consumePlaces/commodityType/index.vue

@@ -0,0 +1,321 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="类型名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入类型名称"
+          clearable
+          size="small"
+          style="width: 140px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="生效状态" prop="status">
+          <el-select v-model="queryParams.status"  placeholder="请选择生效状态" size="small"  style="width: 80px">
+            <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in statusList" :key="item" />
+          </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['system:admin:export']"
+        >导出</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:admin:add']"
+        >新增</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="adminList" >
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <template slot-scope="scope">
+         {{scope.$index + 1}}
+        </template>
+      </el-table-column>
+      <el-table-column label="商品类型" align="center" prop="a" show-overflow-tooltip/>
+      <el-table-column label="生效状态" align="center" prop="b" show-overflow-tooltip />
+      <el-table-column label="备注" align="center" prop="c" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="center" prop="d"  show-overflow-tooltip />
+      <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:admin:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:admin:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.current"
+      :limit.sync="queryParams.size"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog   :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false"  >
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
+        <el-row :gutter="20">
+          <el-col :span="16">
+            <el-form-item label="类型名称" prop="name" >
+              <el-input v-model="form.name" placeholder="请输入类型名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生效状态" prop="type" >
+              <el-select v-model="form.type"  placeholder="请选择生效状态" size="small"  style="width: 80px">
+                <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in typeList" :key="item" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="门禁控制器编码" prop="type" >
+              <el-select v-model="form.type"  placeholder="请选择门禁控制器编码" size="small"  style="width: 80px">
+                <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in typeList" :key="item" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+           <el-col :span="12">
+            <el-form-item label="门禁通道编码" prop="type" >
+              <el-select v-model="form.type"  placeholder="请选择门禁通道编码" size="small"  style="width: 80px">
+                <el-option :label="index.label"  :value="index.value" v-for = "(index, item) in typeList" :key="item" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="introduce">
+              <el-input type="textarea" :rows="4" placeholder="请输入备注" v-model="form.introduce">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm" v-if="!loading">确 定</el-button>
+          <el-button :loading="loading" type="primary" @click="submitForm" v-else>提交中...</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addType, updataType, delType, getType, exportType } from "@/api/recharge/consumePlaces";
+export default {
+  name: "admin",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      dialogFormVisible:false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 图片显示
+      fileList:[{"url":''}],
+      // 参数表格数据
+      adminList: [
+        {a:1,b:2,c:3,d:4,f:5}
+      ],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 类型数据字典
+      typeOptions: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        current: 1,
+        size: 10,
+        name: undefined,
+        aliasName: undefined,
+      },
+      statusList:[
+        {value:"",lable:"全部"},
+        {value:"1",lable:"有效"},
+        {value:"2",lable:"无效"},
+      ],
+      // 表单参数
+      form: {
+
+      },
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "类型名称不能为空", trigger: "blur" }
+        ],
+        logo: [
+          { required: true, message: "生效状态不能为空", trigger: "change" }
+        ],
+        logo: [
+          { required: true, message: "门禁控制编码不能为空", trigger: "change" }
+        ],
+        logo: [
+          { required: true, message: "门禁通道编码不能为空", trigger: "change" }
+        ],
+      },
+
+
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true;
+      getType(this.queryParams).then(response => {
+        this.adminList = response.data.records
+        this.loading = false;
+      })
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        name: undefined,
+        status: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.current = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.form.id =undefined
+      this.form.name =undefined
+      this.form.introduce =undefined
+      this.reset();
+      this.open = true;
+      this.title = "添加参数";
+    },
+
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.form = JSON.stringify(row)
+      this.open = true;
+      this.title = "修改参数";
+    },
+
+    /** 提交按钮 */
+    submitForm(row) {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (this.form.id != undefined) {
+            updataType(this.form).then(response => {
+              this.loading = false
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).catch(()=>{
+              this.loading = false,
+              this.open = false
+            })
+          } else {
+            addType(this.form).then(response => {
+              this.loading = false
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).catch(()=>{
+              this.loading = false,
+              this.open = false
+            })
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delType(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 刷新缓存按钮操作 */
+    handleRefreshCache() {
+      refreshCache().then(() => {
+        this.msgSuccess("刷新成功");
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      let queryParams = {...this.queryParams};
+      delete queryParams.current
+      delete queryParams.size
+      this.exportLoading = true;
+      exportType(queryParams).then(response =>{
+        this.exportLoading = false;
+        localStorage.setItem('fileExportId', response.data)
+        this.$router.push({path:'/recharge/fileExport'})
+      })
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+</style>
+

+ 7 - 5
src/views/recharge/consumption/index.vue

@@ -29,7 +29,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
+        <!-- <el-button
           type="warning"
           plain
           icon="el-icon-download"
@@ -37,11 +37,16 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['system:admin:export']"
-        >导出</el-button>
+        >导出</el-button> -->
       </el-form-item>
     </el-form>
 
     <el-table v-loading="loading" :data="adminList" height="calc(100vh  - 10vh - 170px)">
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <template slot-scope="scope">
+         {{scope.$index + 1}}
+        </template>
+      </el-table-column>
       <el-table-column label="姓名" align="center" prop="name"  show-overflow-tooltip />
       <el-table-column label="卡编号" align="center" prop="cardNo" show-overflow-tooltip />
       <el-table-column label="消费金额(元)" align="center" prop="amt" show-overflow-tooltip />
@@ -53,9 +58,6 @@
           <span v-if="scope.row.type == 1001" style="color:#F56C6C">消费撤单</span>
         </template>
       </el-table-column>
-
-
-
       <el-table-column label="餐饮时段" align="center" prop="part" show-overflow-tooltip >
         <template slot-scope="scope">
           <span v-if="scope.row.part == 1" style="color:#909399">早餐</span>

+ 5 - 0
src/views/recharge/detailed/index.vue

@@ -84,6 +84,11 @@
     </el-form>
 
     <el-table v-loading="loading" :data="adminList" height="calc(100vh  - 10vh - 170px)">
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <template slot-scope="scope">
+         {{scope.$index + 1}}
+        </template>
+      </el-table-column>
       <el-table-column label="姓名" align="center" prop="userName"  show-overflow-tooltip />
       <el-table-column label="手机号" align="center" prop="userPhone" show-overflow-tooltip />
       <el-table-column label="充值金额(元)" align="center" prop="money" show-overflow-tooltip />

+ 7 - 2
src/views/recharge/fileExport/index.vue

@@ -28,6 +28,11 @@
     </el-form>
 
     <el-table v-loading="loading" :data="adminList" height="calc(100vh - 10vh - 120px)">
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <template slot-scope="scope">
+         {{scope.$index + 1}}
+        </template>
+      </el-table-column>
       <el-table-column label="id" align="center" prop="id"  show-overflow-tooltip />
       <el-table-column label="文件名称" align="center" prop="funcType"  show-overflow-tooltip />
       <el-table-column label="文件大小" align="center" prop="fileSize"  show-overflow-tooltip >
@@ -38,7 +43,7 @@
       </el-table-column>
       <el-table-column label="任务开始时间" align="center" prop="startTime"  show-overflow-tooltip />
       <el-table-column label="任务结束时间" align="center" prop="endTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"  show-overflow-tooltip >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"   >
         <template slot-scope="scope">
           <el-button v-if ="scope.row.isSuccess && scope.row.url && scope.row.activeFlag == '1' && scope.row.delFlag == '0'"
             size="mini"
@@ -51,7 +56,7 @@
             <span v-if="scope.row.result == '' || scope.row.result == null">文件整理中...请稍后查看</span>
             <span else>{{scope.row.result}}</span>
           </span>
-          <el-button else-if
+          <el-button v-if ="!scope.row.isSuccess || !scope.row.url || scope.row.activeFlag != '1' || scope.row.delFlag != '0'"
             size="mini"
             type="text"
             icon="el-icon-bottom"

+ 7 - 2
src/views/recharge/fileManagement/index.vue

@@ -42,6 +42,11 @@
     </el-form>
 
     <el-table v-loading="loading" :data="adminList" height="calc(100vh - 10vh - 120px)">
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <template slot-scope="scope">
+         {{scope.$index + 1}}
+        </template>
+      </el-table-column>
       <el-table-column label="id" align="center" prop="id"  show-overflow-tooltip />
       <el-table-column label="文件名称" align="center" prop="oriName"  show-overflow-tooltip />
       <el-table-column label="文件大小" align="center" prop="fileSize"  show-overflow-tooltip >
@@ -61,7 +66,7 @@
           <span :class="scope.row.delFlag == '0' ? 'success' :  'danger'">{{scope.row.delFlag == '0' ? '未删除' :  '删除'}}</span>
         </template>
       </el-table-column> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"  show-overflow-tooltip >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"   >
         <template slot-scope="scope">
           <el-button v-if ="scope.row.url && scope.row.delFlag == '0' && scope.row.activeFlag == '1'"
             size="mini"
@@ -69,7 +74,7 @@
             icon="el-icon-bottom"
             @click="handleExport(scope.row)"
           >下载</el-button>
-          <el-button else-if
+          <el-button v-if ="!scope.row.url || scope.row.delFlag != '0' || scope.row.activeFlag != '1'"
             size="mini"
             type="text"
             icon="el-icon-bottom"

+ 5 - 1
src/views/recharge/qrCode/index.vue

@@ -26,7 +26,11 @@
     </el-form>
 
     <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <template slot-scope="scope">
+         {{scope.$index + 1}}
+        </template>
+      </el-table-column>
       <el-table-column label="二维码名称" align="center" prop="name"  show-overflow-tooltip />
       <el-table-column label="渠道名称" align="center" prop="topChannelName" show-overflow-tooltip />
       <el-table-column label="二维码" align="center" prop="qrPath" show-overflow-tooltip  >

+ 5 - 0
src/views/recharge/radio/index.vue

@@ -27,6 +27,11 @@
 
 
     <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <template slot-scope="scope">
+         {{scope.$index + 1}}
+        </template>
+      </el-table-column>
       <el-table-column label="身份信息" align="center" prop="identity"  show-overflow-tooltip />
       <el-table-column label="充值到账比例" align="center" prop="proportion" show-overflow-tooltip />
       <el-table-column label="创建人" align="center" prop="createBy"  show-overflow-tooltip />

+ 5 - 0
src/views/recharge/reportForm/index.vue

@@ -37,6 +37,11 @@
     </el-form>
 
     <el-table v-loading="loading" :data="adminList" height="calc(100vh - 10vh - 120px)">
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <template slot-scope="scope">
+         {{scope.$index + 1}}
+        </template>
+      </el-table-column>
       <el-table-column label="时间" align="center" prop="reportDate"  show-overflow-tooltip />
       <el-table-column label="报表种类" align="center" show-overflow-tooltip >
         <template slot-scope="scope">

+ 5 - 0
src/views/system/product/index.vue

@@ -25,6 +25,11 @@
     </el-form>
 
     <el-table v-loading="loading" :data="adminList" >
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <template slot-scope="scope">
+         {{scope.$index + 1}}
+        </template>
+      </el-table-column>
       <el-table-column label="公司名称" align="center" prop="name" show-overflow-tooltip/>
       <el-table-column label="公司介绍" align="center" prop="introduce" show-overflow-tooltip />
       <el-table-column label="公司LOGO">

+ 1 - 1
vue.config.js

@@ -125,4 +125,4 @@ module.exports = {
                 }
             )
     }
-}
+}

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.