Browse Source

新增退款和驾校报表页面

JXDS18FUJT 2 năm trước cách đây
mục cha
commit
7ab2ddf0d5

+ 1 - 1
.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'https://jsjp-admin1.zzxcx.net/jsjp-admin'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 54 - 0
src/api/tool/order.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询订单信息列表
+export function getList(query) {
+  return request({
+    url: '/order/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 发起退款
+export function refundOrder(outTradeNo) {
+  return request({
+    url: `/order/info/refund/${outTradeNo}`,
+    method: 'put'
+  })
+}
+
+// 查询驾校报表信息
+export function exportError(query) {
+    return request({
+      url: '/order/info/school/list',
+      method: 'get',
+      params: query
+    })
+  }
+
+// 新增错题
+export function addError(data) {
+  return request({
+    url: '/question/error',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改错题
+export function updateError(data) {
+  return request({
+    url: '/question/error',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除错题
+export function delError(id) {
+  return request({
+    url: '/question/error/' + id,
+    method: 'delete'
+  })
+}
+

+ 10 - 0
src/api/tool/report.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询驾校报表信息
+export function getList(query) {
+    return request({
+      url: '/order/info/school/list',
+      method: 'get',
+      params: query
+    })
+  }

+ 282 - 0
src/views/tool/order/index.vue

@@ -0,0 +1,282 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+            <!-- <el-form-item label="是否分成" prop="phoneType">
+                <el-select v-model="queryParams.isShare" placeholder="">
+                    <el-option :value="1" label="是"></el-option>
+                    <el-option :value="0" label="否"></el-option>
+                </el-select>
+            </el-form-item> -->
+            <el-form-item label="极速驾培订单ID" label-width="120px" prop="outTradeNo">
+                <el-input v-model="queryParams.outTradeNo" placeholder="极速驾培订单ID" clearable size="small"
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <!-- <el-form-item label="支付类型" prop="payType">
+                <el-select v-model="queryParams.payType" placeholder="">
+                    <el-option :value="1" label="微信"></el-option>
+                    <el-option :value="2" label="支付宝"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="手机类型" prop="payType">
+                <el-select v-model="queryParams.payType" placeholder="">
+                    <el-option :value="1" label="苹果"></el-option>
+                    <el-option :value="2" label="安卓"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="驾校名称" prop="school">
+                <el-input v-model="queryParams.school" placeholder="请输入驾校名称" clearable size="small"
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="驾校提成" prop="questionId">
+                <el-input v-model="queryParams.schoolCommission" placeholder="请输入驾校提成" clearable size="small"
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="驾校名称" prop="schoolName">
+                <el-input v-model="queryParams.schoolName" placeholder="请输入驾校名称" clearable size="small"
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item> -->
+            <el-form-item>
+                <el-button type="cyan" 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" icon="el-icon-plus" size="mini" @click="handleAdd"
+                    v-hasPermi="['question:error:add']">新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+                    v-hasPermi="['question:error:edit']">修改</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+                    v-hasPermi="['question:error:remove']">删除</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row> -->
+
+        <el-table v-loading="loading" :data="errorList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+
+            <el-table-column label="用户id" align="center" prop="userId" />
+            <el-table-column label="商品名称" align="center" prop="goodsName" />
+            <el-table-column label="是否分成" align="center" prop="isShare">
+                <template slot-scope="scope">{{ scope.row.isShare == 1 ? '是' : '否' }}</template>
+            </el-table-column>
+            <el-table-column label="极速驾培订单ID" align="center" prop="outTradeNo" />
+            <el-table-column label="极速驾培订单退款ID" align="center" prop="outRefundNo" />
+            <el-table-column label="支付方式" align="center" prop="goodsName">
+                <template slot-scope="scope">{{ scope.row.payType == 1 ? '微信' : '支付宝' }}</template>
+            </el-table-column>
+            <el-table-column label="手机类型" align="center" prop="goodsName">
+                <template slot-scope="scope">{{ scope.row.phoneType == 1 ? '苹果' : '安卓' }}</template>
+            </el-table-column>
+            <el-table-column label="驾校" align="center" prop="school" />
+            <el-table-column label="驾校提成" align="center" prop="schoolCommission" />
+            <!-- schoolCommission -->
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+           
+                    <el-button :disabled="scope.row.outRefundNo" size="mini" type="text" icon="el-icon-remove-outline" @click="handleRefund(scope.row)"
+                     >退款</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="用户id" prop="userId">
+                    <el-input v-model="form.userId" placeholder="请输入用户id" />
+                </el-form-item>
+                <el-form-item label="题目id" prop="questionId">
+                    <el-input v-model="form.questionId" placeholder="请输入题目id" />
+                </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 { getList, getError,refundOrder, delError, addError, updateError, exportError } from "@/api/tool/order";
+
+export default {
+    name: "Error",
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 错题表格数据
+            errorList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                outTradeNo:""
+                // id: null,
+                // outRefundNo: null,
+                // payType: 1,
+                // phoneType: 1,
+                // school: "",
+                // schoolCommission: 0,
+                // schoolName: "",
+                // isShare: 0,
+
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+            }
+        };
+    },
+    created() {
+        this.getList();
+    },
+    methods: {
+        /** 查询错题列表 */
+        getList() {
+            this.loading = true;
+            getList(this.queryParams).then(response => {
+                this.errorList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                outTradeNo:""
+                // id: null,
+                // outRefundNo: null,
+                // payType: 1,
+                // phoneType: 1,
+                // school: "",
+                // schoolCommission: 0,
+                // schoolName: "",
+                // isShare: 0,
+            };
+            this.resetForm("form");
+        },
+        handleRefund(row){
+            const outTradeNo = row.outTradeNo 
+            this.$confirm(`是否确认退款(${row.goodsName})`, "警告", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(function () {
+                return refundOrder(outTradeNo);
+            }).then(() => {
+                this.getList();
+                this.msgSuccess("退款成功");
+            })
+
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "添加错题";
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const id = row.id || this.ids
+            getError(id).then(response => {
+                this.form = response.data;
+                this.open = true;
+                this.title = "修改错题";
+            });
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.id != null) {
+                        updateError(this.form).then(response => {
+                            this.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addError(this.form).then(response => {
+                            this.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$confirm('是否确认删除错题编号为"' + ids + '"的数据项?', "警告", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(function () {
+                return delError(ids);
+            }).then(() => {
+                this.getList();
+                this.msgSuccess("删除成功");
+            })
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            const queryParams = this.queryParams;
+            this.$confirm('是否确认导出所有错题数据项?', "警告", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(function () {
+                return exportError(queryParams);
+            }).then(response => {
+                this.download(response.data);
+            })
+        }
+    }
+};
+</script>

+ 300 - 0
src/views/tool/report/index.vue

@@ -0,0 +1,300 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+            <!-- <el-form-item label="是否分成" prop="phoneType">
+                <el-select v-model="queryParams.isShare" placeholder="">
+                    <el-option :value="1" label="是"></el-option>
+                    <el-option :value="0" label="否"></el-option>
+                </el-select>
+            </el-form-item> -->
+            <el-form-item label="开始时间"  label-width="120px" prop="outTradeNo">
+                <el-date-picker v-model="queryParams.startTime" type="date" placeholder="选择日期" format="yyyy 年 MM 月 dd 日"
+                    value-format="yyyyMMdd">
+                </el-date-picker>
+              
+            </el-form-item>
+            <el-form-item label="结束时间"  label-width="120px" prop="outTradeNo">
+                <el-date-picker v-model="queryParams.endTime" type="date" placeholder="选择日期" format="yyyy 年 MM 月 dd 日"
+                    value-format="yyyyMMdd">
+                </el-date-picker>
+               
+            </el-form-item>
+            <el-form-item label="驾校名称" prop="schoolName">
+                <el-input v-model="queryParams.schoolName" placeholder="请输入驾校名称" clearable size="small"
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <!-- <el-form-item label="支付类型" prop="payType">
+                <el-select v-model="queryParams.payType" placeholder="">
+                    <el-option :value="1" label="微信"></el-option>
+                    <el-option :value="2" label="支付宝"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="手机类型" prop="payType">
+                <el-select v-model="queryParams.payType" placeholder="">
+                    <el-option :value="1" label="苹果"></el-option>
+                    <el-option :value="2" label="安卓"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="驾校名称" prop="school">
+                <el-input v-model="queryParams.school" placeholder="请输入驾校名称" clearable size="small"
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="驾校提成" prop="questionId">
+                <el-input v-model="queryParams.schoolCommission" placeholder="请输入驾校提成" clearable size="small"
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            -->
+            <el-form-item>
+                <el-button type="cyan" 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" icon="el-icon-plus" size="mini" @click="handleAdd"
+                    v-hasPermi="['question:error:add']">新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+                    v-hasPermi="['question:error:edit']">修改</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+                    v-hasPermi="['question:error:remove']">删除</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row> -->
+
+        <el-table v-loading="loading" :data="errorList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+
+          
+
+            <el-table-column label="驾校名" align="center" prop="schoolName" />
+            <el-table-column label="订单总额" align="center" prop="orderTotal" >
+                <template slot-scope="scope">
+                    {{ scope.row.orderTotal/100}}元
+                </template>
+            </el-table-column>
+            <el-table-column label="驾校提成" align="center" prop="schoolCommission" >
+                <template slot-scope="scope">
+                    {{ scope.row.schoolCommission/100}}元
+                </template>
+            </el-table-column>
+            <!-- schoolCommission -->
+            <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+           
+                    <el-button :disabled="scope.row.outRefundNo" size="mini" type="text" icon="el-icon-remove-outline" @click="handleRefund(scope.row)"
+                     >退款</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="用户id" prop="userId">
+                    <el-input v-model="form.userId" placeholder="请输入用户id" />
+                </el-form-item>
+                <el-form-item label="题目id" prop="questionId">
+                    <el-input v-model="form.questionId" placeholder="请输入题目id" />
+                </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 { getList, getError, refundOrder, delError, addError, updateError, exportError } from "@/api/tool/report";
+
+export default {
+    name: "Error",
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 错题表格数据
+            errorList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10
+                // id: null,
+                // outRefundNo: null,
+                // payType: 1,
+                // phoneType: 1,
+                // school: "",
+                // schoolCommission: 0,
+                // schoolName: "",
+                // isShare: 0,
+
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+            }
+        };
+    },
+    created() {
+        this.getList();
+    },
+    methods: {
+        /** 查询错题列表 */
+        getList() {
+            this.loading = true;
+            getList(this.queryParams).then(response => {
+                this.errorList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.queryParams = {
+                outTradeNo: "",
+                startTime: null,
+                endTime: null,
+                pageNum: 1,
+                pageSize: 10
+                // id: null,
+                // outRefundNo: null,
+                // payType: 1,
+                // phoneType: 1,
+                // school: "",
+                // schoolCommission: 0,
+                // schoolName: "",
+                // isShare: 0,
+            };
+            this.resetForm("form");
+        },
+        handleRefund(row) {
+            const outTradeNo = row.outTradeNo
+            this.$confirm(`是否确认退款(${row.goodsName})`, "警告", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(function () {
+                return refundOrder(outTradeNo);
+            }).then(() => {
+                this.getList();
+                this.msgSuccess("退款成功");
+            })
+
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            if(this.queryParams.startTime&&this.queryParams.endTime&&Number(this.queryParams.startTime)>Number(this.queryParams.endTime)){
+                this.msgError('开始时间不能大于结束时间')
+                return 
+               
+               
+            }
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "添加错题";
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const id = row.id || this.ids
+            getError(id).then(response => {
+                this.form = response.data;
+                this.open = true;
+                this.title = "修改错题";
+            });
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.id != null) {
+                        updateError(this.form).then(response => {
+                            this.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addError(this.form).then(response => {
+                            this.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$confirm('是否确认删除错题编号为"' + ids + '"的数据项?', "警告", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(function () {
+                return delError(ids);
+            }).then(() => {
+                this.getList();
+                this.msgSuccess("删除成功");
+            })
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            const queryParams = this.queryParams;
+            this.$confirm('是否确认导出所有错题数据项?', "警告", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(function () {
+                return exportError(queryParams);
+            }).then(response => {
+                this.download(response.data);
+            })
+        }
+    }
+};
+</script>

+ 1 - 16
vue.config.js

@@ -27,22 +27,7 @@ module.exports = {
   // 如果你不需要生产环境的 source map,可以将其设置为 false 以加速生产环境构建。
   productionSourceMap: false,
   // webpack-dev-server 相关配置
-  devServer: {
-    host: '0.0.0.0',
-    port: port,
-    open: true,
-    proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
-      }
-    },
-    disableHostCheck: true
-  },
+
   configureWebpack: {
     name: name,
     resolve: {