JXDS18FUJT vor 2 Monaten
Ursprung
Commit
8fe910fb9a
5 geänderte Dateien mit 451 neuen und 295 gelöschten Zeilen
  1. 1 1
      .env.development
  2. 9 0
      src/api/tool/order.js
  3. 10 1
      src/api/tool/report.js
  4. 419 292
      src/views/driver/order/index.vue
  5. 12 1
      src/views/driver/report/index.vue

+ 1 - 1
.env.development

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

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

@@ -53,3 +53,12 @@ export function delError(id) {
   })
 }
 
+//发起分账
+export function shareProfit(params){
+  return request({
+    url: '/order/info/shareProfit/'+params.outTradeNo,
+    method: 'get',
+    params: params
+  })
+}
+

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

@@ -15,4 +15,13 @@ export function exportReport(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+//发起分账
+export function shareProfit(params){
+  return request({
+    url: '/order/info/shareProfit/'+params.outTradeNo,
+    method: 'get',
+    params: params
+  })
+}

+ 419 - 292
src/views/driver/order/index.vue

@@ -1,44 +1,73 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-
-            <el-form-item label="用户ID" label-width="120px" prop="userId">
-                <el-input v-model="queryParams.userId" placeholder="用户ID" clearable size="small"
-                    @keyup.enter.native="handleQuery" />
-            </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="驾校名称" label-width="120px" prop="school">
-                <el-input v-model="queryParams.schoolName" placeholder="请输入驾校名称" clearable size="small"
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="姓名" label-width="120px" prop="userName">
-                <el-input v-model="queryParams.userName" placeholder="请输入姓名" clearable size="small"
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="身份证" label-width="120px" prop="logincode">
-                <el-input v-model="queryParams.logincode" placeholder="请输入身份证" clearable size="small"
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="是否分成" label-width="120px" prop="phoneType">
-                <el-select v-model="queryParams.isShare" placeholder="">
-                    <el-option value="" label="全部"></el-option>
-                    <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="tradeType">
-                <el-select v-model="queryParams.tradeType">
-                    <el-option value="" key="4" label="全部"></el-option>
-                    <el-option value="1" key="1" label="支付成功">支付成功</el-option>
-                    <el-option value="2" key="2" label="支付失败">支付失败</el-option>
-                    <el-option value="3" key="3" label="已退款"></el-option>
-
-                </el-select>
-            </el-form-item>
-            <!-- <el-form-item label="支付类型" prop="payType">
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="用户ID" label-width="120px" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="用户ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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="驾校名称" label-width="120px" prop="school">
+        <el-input
+          v-model="queryParams.schoolName"
+          placeholder="请输入驾校名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="姓名" label-width="120px" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证" label-width="120px" prop="logincode">
+        <el-input
+          v-model="queryParams.logincode"
+          placeholder="请输入身份证"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否分成" label-width="120px" prop="phoneType">
+        <el-select v-model="queryParams.isShare" placeholder="">
+          <el-option value="" label="全部"></el-option>
+          <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="tradeType">
+        <el-select v-model="queryParams.tradeType">
+          <el-option value="" key="4" label="全部"></el-option>
+          <el-option value="1" key="1" label="支付成功">支付成功</el-option>
+          <el-option value="2" key="2" label="支付失败">支付失败</el-option>
+          <el-option value="3" key="3" 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>
@@ -62,13 +91,15 @@
                 <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-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-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>
@@ -84,267 +115,363 @@
             <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
+      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="userName" />
-            <el-table-column label="身份证" align="center" prop="logincode" />
-            <el-table-column label="支付时间" align="center" width="180px" prop="createTime" />
-            <el-table-column label="商品名称" align="center" prop="goodsName" />
-            <el-table-column label="是否分成" align="center" prop="isShare">
-                <template slot-scope="scope">
-                    <span v-if="scope.row.isShare == 1">是</span>
-                    <span v-else-if="scope.row.isShare == 0">否</span>
-                    <span v-else>其他</span>
+      <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="姓名" align="center" prop="userName" />
+      <el-table-column label="身份证" align="center" prop="logincode" />
+      <el-table-column label="支付时间" align="center" width="180px" prop="createTime" />
+      <el-table-column label="商品名称" align="center" prop="goodsName" />
+      <el-table-column label="是否分成" align="center" prop="isShare">
+        <template slot-scope="scope">
+          <span v-if="scope.row.isShare == 1">是</span>
+          <span v-else-if="scope.row.isShare == 0">否</span>
+          <span v-else>其他</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="极速驾培订单ID" align="center" prop="outTradeNo" />
 
-                </template>
-            </el-table-column>
-            <el-table-column label="极速驾培订单ID" align="center" prop="outTradeNo" />
+      <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="schoolName" />
+      <el-table-column label="驾校提成" align="center" prop="schoolName">
+        <template slot-scope="scope"> {{ scope.row.schoolCommission / 100 }}元 </template>
+      </el-table-column>
+      <el-table-column label="订单价格" align="center" prop="total">
+        <template slot-scope="scope"> {{ scope.row.total / 100 }}元 </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            v-if="!scope.row.outRefundNo"
+            :disabled="scope.row.outRefundNo"
+            size="mini"
+            type="text"
+            icon="el-icon-remove-outline"
+            @click="handleRefund(scope.row)"
+            >退款</el-button
+          >
+          <el-popover
+            v-else
+            placement="bottom"
+            title="极速驾培订单退款ID"
+            width="200"
+            trigger="click"
+            :content="scope.row.outRefundNo"
+          >
+            <el-link type="danger" slot="reference">已退款</el-link>
+          </el-popover>
+          <div>
+            <el-button
+              v-if="scope.row.isFz == 1"
+             
+              size="mini"
+              type="text"
+            
+              @click="handleShareProfit(scope.row)"
+              >分账</el-button
+            >
+            <el-button
+              v-if="scope.row.isFz == 2"
+              :disabled="scope.row.isFz == 2"
+              size="mini"
+              type="text"
+             
+         
+              >分账完成</el-button
+            >
 
-            <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="schoolName" />
-            <el-table-column label="驾校提成" align="center" prop="schoolName">
-                <template slot-scope="scope">
-                    {{ scope.row.schoolCommission / 100 }}元
-                </template>
-            </el-table-column>
-            <el-table-column label="订单价格" align="center" prop="total">
-                <template slot-scope="scope">
-                    {{ scope.row.total / 100 }}元
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                    <el-button v-if="!scope.row.outRefundNo" :disabled="scope.row.outRefundNo" size="mini" type="text"
-                        icon="el-icon-remove-outline" @click="handleRefund(scope.row)">退款</el-button>
-                    <el-popover v-else placement="bottom" title="极速驾培订单退款ID" width="200" trigger="click"
-                        :content="scope.row.outRefundNo">
-                        <el-link type="danger" slot="reference">已退款</el-link>
-                    </el-popover>
-                </template>
-            </el-table-column>
-        </el-table>
+            <el-button
+              v-if="scope.row.isFz == 3"
+             
+              size="mini"
+              type="text"
+             
+              @click="handleShareProfit(scope.row)"
+              >重新分账</el-button
+            >
+            <el-button
+              v-if="scope.row.isFz == 4"
+              :disabled="scope.row.isFz == 4"
+              size="mini"
+              type="text"
+             
+              
+              >分账回退</el-button
+            >
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize" @pagination="getList" />
+    <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>
+    <!-- 添加或修改错题对话框 -->
+    <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";
+import {
+  getList,
+  getError,
+  refundOrder,
+  delError,
+  addError,
+  updateError,
+  exportError,
+  shareProfit,
+} 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: {
-                tradeType:"",
-                userId: null,
-                isShare: "",
-                userName: "",
-                logincode: "",
-                outTradeNo: null,
-                pageNum: 1,
-                pageSize: 10
+  name: "Error",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 错题表格数据
+      errorList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        tradeType: "",
+        userId: null,
+        isShare: "",
+        userName: "",
+        logincode: "",
+        outTradeNo: null,
+        pageNum: 1,
+        pageSize: 10,
 
-                // id: null,
-                // outRefundNo: null,
-                // payType: 1,
-                // phoneType: 1,
-                // school: "",
-                // schoolCommission: 0,
-                // schoolName: "",
-                // isShare: 0,
-
-            },
-            // 表单参数
-            form: {},
-            // 表单校验
-            rules: {
-            }
-        };
+        // 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;
+      });
     },
-    created() {
-        this.getList();
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
     },
-    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 = {
-                tradeType:"",
-                userId: null,
-                isShare: "",
-                userName: "",
-                logincode: "",
-                outTradeNo: null,
-                pageNum: 1,
-                pageSize: 10
-                // id: null,
-                // outRefundNo: null,
-                // payType: 1,
-                // phoneType: 1,
-                // school: "",
-                // schoolCommission: 0,
-                // schoolName: "",
-                // ,
-            };
-            this.resetForm("form");
-        },
-        handleRefund(row) {
-            const outTradeNo = row.outTradeNo
-            this.$prompt(`确认退款${row.goodsName}吗?
-            请附带退款理由: <div>驾校名称:${row.schoolName}</div><div>学员姓名:${row.userName}</div><div>退款金额:${row.total/100}元</div> <div>订单号:${row.outTradeNo}</div> `, "警告", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-                inputPlaceholder:"请输入退款理由",
-                dangerouslyUseHTMLString:true,
-                inputPattern: /[\u4E00-\u9FA5]/,
-                inputErrorMessage: '至少输入一个中文'
-            }).then(function (obj) {
-                return refundOrder(outTradeNo, {
-                    reason: obj.value
-                });
-            }).then(() => {
-                this.getList();
-                this.msgSuccess("退款成功");
-            })
+    // 表单重置
+    reset() {
+      this.form = {
+        tradeType: "",
+        userId: null,
+        isShare: "",
+        userName: "",
+        logincode: "",
+        outTradeNo: null,
+        pageNum: 1,
+        pageSize: 10,
+        // id: null,
+        // outRefundNo: null,
+        // payType: 1,
+        // phoneType: 1,
+        // school: "",
+        // schoolCommission: 0,
+        // schoolName: "",
+        // ,
+      };
+      this.resetForm("form");
+    },
+    handleShareProfit(row) {
+      const outTradeNo = row.outTradeNo;
 
-        },
-        /** 搜索按钮操作 */
-        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 = "修改错题";
+      this.$confirm(`是否确认分账极速驾培订单ID:${row.outTradeNo}的记录`, "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return shareProfit(outTradeNo);
+        })
+        .then(() => {
+          this.getList();
+          // this.msgSuccess("");
+        });
+    },
+    handleRefund(row) {
+      const outTradeNo = row.outTradeNo;
+      this.$prompt(
+        `确认退款${row.goodsName}吗?
+            请附带退款理由: <div>驾校名称:${row.schoolName}</div><div>学员姓名:${
+          row.userName
+        }</div><div>退款金额:${row.total / 100}元</div> <div>订单号:${
+          row.outTradeNo
+        }</div> `,
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+          inputPlaceholder: "请输入退款理由",
+          dangerouslyUseHTMLString: true,
+          inputPattern: /[\u4E00-\u9FA5]/,
+          inputErrorMessage: "至少输入一个中文",
+        }
+      )
+        .then(function (obj) {
+          return refundOrder(outTradeNo, {
+            reason: obj.value,
+          });
+        })
+        .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();
             });
-        },
-        /** 提交按钮 */
-        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();
-                        });
-                    }
-                }
+          } 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);
-            })
+          }
         }
-    }
+      });
+    },
+    /** 删除按钮操作 */
+    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>
+</script>

+ 12 - 1
src/views/driver/report/index.vue

@@ -119,6 +119,9 @@
       <el-form-item label="总佣金" label-width="120px" prop="outTradeNo">
         <span>{{ totalCommission }}</span>
       </el-form-item>
+      <el-form-item label="分账金额" label-width="120px" prop="outTradeNo">
+        <span>{{ fzMoney }}</span>
+      </el-form-item>
     </el-form>
 
     <!-- <el-row :gutter="10" class="mb8">
@@ -171,6 +174,7 @@
           {{ scope.row.orderTotal / 100 }}元
         </template>
       </el-table-column>
+  
 
       <el-table-column label="驾校提成" align="center" prop="schoolCommission">
         <template slot-scope="scope">
@@ -201,7 +205,11 @@
           {{ scope.row.subsidy / 100 }}元
         </template>
       </el-table-column>
-
+      <el-table-column label="分账金额" align="center" prop="schoolCommission">
+        <template slot-scope="scope">
+          {{ scope.row.fzMoney / 100 }}元
+        </template>
+      </el-table-column>
       <!-- schoolCommission -->
       <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
@@ -276,6 +284,7 @@ export default {
       total: 0,
       totalPrice: "",
       totalCommission: "",
+      fzMoney:"",
       // 错题表格数据
       errorList: [],
       // 弹出层标题
@@ -325,6 +334,7 @@ export default {
         this.total = response.total;
         this.totalPrice = Number(response.data.total) / 100 + "元";
         this.totalCommission = Number(response.data.commission) / 100 + "元";
+        this.fzMoney = Number(response.data.fzMoney) / 100 + "元";
         this.loading = false;
       });
     },
@@ -355,6 +365,7 @@ export default {
       };
       this.resetForm("form");
     },
+
     handleRefund(row) {
       const outTradeNo = row.outTradeNo;
       this.$confirm(`是否确认退款(${row.goodsName})`, "警告", {