7.2(添加筛选,导出

2024-07-02 17:04:11 +08:00
parent fa41ed1d92
commit dc43cce3da
9 changed files with 499 additions and 56 deletions
--- a/.env.development
+++ b/.env.development
@@ -8,7 +8,7 @@ ENV = 'development'
 # 花花
 # VUE_APP_BASE_API = 'http://192.168.31.16:8080/car_admin_api'
 # 薛磊
- VUE_APP_BASE_API = 'http://192.168.0.118:8080/car_admin_api'
+ VUE_APP_BASE_API = 'http://192.168.0.125:8080/car_admin_api'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().
--- a/src/api/divide.js
+++ b/src/api/divide.js
@@ -12,6 +12,7 @@ export function platformPageListApi(params) {
 }


+
 /**
 * 分佣平台详情 /api/admin/platform/return/commission/platform/detail/{id}
 */
@@ -22,6 +23,16 @@ export function platformDetail(id) {
  });
 }

+/**
+ * 分佣平台上下架 /api/admin/platform/return/commission/platform/switch/{{id}}
+ */
+export function platformSwitch(id) {
+  return request({
+    url: `/admin/platform/return/commission/platform/switch/${id}`,
+    method: 'post',
+  });
+}
+
 /**
 * 用户详情 /api/admin/platform/return/commission/platform/join/user/detail/
 */
@@ -31,6 +42,25 @@ export function getUserDetail(id) {
    method: 'get',
  });
 }
+/**
+ * 删除用户 /api/admin/platform/return/commission/platform/join/user/delete/{id}
+ */
+export function deleteUser(id) {
+  return request({
+    url: `/admin/platform/return/commission/platform/join/user/delete/${id}`,
+    method: 'get',
+  });
+}
+/**
+ * 修改用户编号跟状态 /api/admin/platform/return/commission/platform/join/user/edit
+ */
+export function postUserEdit(data) {
+  return request({
+    url: `/admin/platform/return/commission/platform/join/user/edit`,
+    method: 'post',
+    data
+  });
+}

 //添加合作平台  /api/admin/platform/return/commission/platform/add
 export function platformAdd(data) {
@@ -245,3 +275,55 @@ export function orderUpdate(data) {
  });
 }

+//数据导出----------------------------------------------------------------------------
+// 平台列表导出 excel/admin/platform/return/commission/out
+export function exportCommission(params) {
+  return request({
+    baseURL: process.env.VUE_APP_BASE_API,
+    url: `/excel/admin/platform/return/commission/out`,
+    method: 'get',
+    responseType: 'blob',
+    params,
+  });
+}
+// 参与用户列表导出 /excel/admin/platform/return/commission/out/export/join/list
+export function exportUserList(params) {
+  return request({
+    baseURL: process.env.VUE_APP_BASE_API,
+    url: `/excel/admin/platform/return/commission/out/export/join/list`,
+    method: 'get',
+    responseType: 'blob',
+    params,
+  });
+}
+// 用户订单列表导出 /excel/admin/platform/return/commission/out/export/order/list
+export function exportOrderList(params) {
+  return request({
+    baseURL: process.env.VUE_APP_BASE_API,
+    url: `/excel/admin/platform/return/commission/out/export/order/list`,
+    method: 'get',
+    responseType: 'blob',
+    params,
+  });
+}
+
+// 分佣统计列表导出 //excel/admin/platform/return/commission/out/export/summary/list
+export function exportSummaryList(params) {
+  return request({
+    baseURL: process.env.VUE_APP_BASE_API,
+    url: `/excel/admin/platform/return/commission/out/export/summary/list`,
+    method: 'get',
+    responseType: 'blob',
+    params,
+  });
+}
+// 注册反馈列表导出 //excel/admin/platform/return/commission/out/page/list
+export function exportOutList(params) {
+  return request({
+    baseURL: process.env.VUE_APP_BASE_API,
+    url: `/excel/admin/platform/return/commission/out/page/list`,
+    method: 'get',
+    responseType: 'blob',
+    params,
+  });
+}
--- a/src/views/accessory/accList/index.vue
+++ b/src/views/accessory/accList/index.vue
@@ -5,10 +5,10 @@
        <div class="container">
          <el-form :model="formData" inline size="small" label-width="110px">
            <el-form-item label="配件名称：">
-              <el-input v-model.trim="formData.name" placeholder="请输入配件名称" class="selWidth"> </el-input>
+              <el-input v-model.trim="formData.name" clearable placeholder="请输入配件名称" class="selWidth"> </el-input>
            </el-form-item>
            <el-form-item label="品牌名称：">
-              <el-input v-model.trim="formData.brandName" placeholder="请输入品牌名称" class="selWidth"> </el-input>
+              <el-input v-model.trim="formData.brandName" clearable placeholder="请输入品牌名称" class="selWidth"> </el-input>
            </el-form-item>
            <!-- <el-form-item label="采购方式：" prop="type">
              <el-select v-model="formData.type" placeholder="请选择" class="filter-item selWidth">
--- a/src/views/accessory/procure/index.vue
+++ b/src/views/accessory/procure/index.vue
@@ -5,10 +5,10 @@
        <div class="container">
          <el-form ref="formData" :model="formData" inline size="small" label-width="110px">
            <el-form-item label="采购单号：">
-              <el-input v-model.trim="formData.procureSn" placeholder="请输入" class="selWidth"> </el-input>
+              <el-input v-model.trim="formData.procureSn" clearable placeholder="请输入" class="selWidth"> </el-input>
            </el-form-item>
            <el-form-item label="发货状态">
-              <el-select v-model="formData.isReceipt" placeholder="请选择" class="filter-item selWidth">
+              <el-select v-model="formData.isReceipt" clearable placeholder="请选择" class="filter-item selWidth">
                <el-option label="已发货" :value="1" />
                <el-option label="未发货" :value="0" />
              </el-select>
--- a/src/views/divide/commission_order/index.vue
+++ b/src/views/divide/commission_order/index.vue
@@ -5,19 +5,47 @@
      <div slot="header" class="clearfix">
        <div class="container" v-hasPermi="['platform:merchant:page:list']">
          <el-form size="small" label-width="100px" :inline="true">
-            <el-form-item label="司机名字" label-width="100px" style="display: inline-block">
-              <el-input v-model.trim="tableFrom.name" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
+            <el-form-item label="滴友ID" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.driverKey" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入滴友ID"
+                class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="司机名字" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.name" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
+                class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="手机号" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.phone" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入手机号"
+                class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="司机编码" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.driverSn" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入司机编码"
                class="selWidth" clearable>
-                <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="carListFn(1)" />
              </el-input>
            </el-form-item>
            <el-form-item label="分佣平台" prop="status">
-              <el-select v-model="tableFrom.platformId" filterable remote reserve-keyword placeholder="请输入分佣平台"
+              <el-select v-model="tableFrom.platformId" style="width: 200px;" filterable remote reserve-keyword placeholder="请选择分佣平台"
                :remote-method="remoteMethod" :loading="loading" clearable>
                <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
                </el-option>
              </el-select>
            </el-form-item>
+            <el-form-item label="分佣方案:" label-width="100px"  style="display: inline-block">
+              <el-select v-model="tableFrom.way" style="width: 200px;" filterable remote reserve-keyword placeholder="选择分佣方案"
+                :loading="loading" clearable>
+                <el-option :key="1" label="按单量" :value="1">
+                </el-option>
+                <el-option :key="0" label="按比例" :value="0">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="订单编号" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.orderSn" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入订单编号"
+                class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
            <el-form-item label="参与时间" prop="time1" class="lang">
              <el-date-picker v-model="time1" type="datetimerange" start-placeholder="开始日期" end-placeholder="结束日期"
                :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
@@ -27,6 +55,8 @@
            <el-form-item>
              <el-button type="primary" plain icon="el-icon-search" size="mini" @click="queryListFn">搜索
              </el-button>
+              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="exportListFn">导出
+              </el-button>
              <el-button type="primary" plain icon="el-icon-plus" size="mini"
                @click="carExpListOpen = true">导入</el-button>
            </el-form-item>
@@ -37,7 +67,8 @@
      <el-table v-loading="listLoading" :data="tableData" style="width: 100%" size="small" highlight-current-row
        class="switchTable">
        <el-table-column prop="id" label="编号" />
-        <el-table-column prop="userSn" label="用户id" />
+        <el-table-column prop="orderSn" label="订单编号" />
+        <el-table-column prop="driverKey" label="滴友ID" />
        <el-table-column prop="userName" label="司机名字" show-overflow-tooltip></el-table-column>
        <el-table-column prop="phone" label="手机号" show-overflow-tooltip></el-table-column>
        <el-table-column prop="way" label="分佣方案" show-overflow-tooltip>
@@ -155,7 +186,7 @@

    <!-- 修改返佣金额 -->
    <el-dialog title="修改返佣金额" :visible.sync="unpRebateAmountShow" destroy-on-close>
-      <el-form :model="form">
+      <el-form :model="unpRebateAmountData">
        <el-form-item label="分佣金额" :label-width="formLabelWidth">
          <el-input-number type="text" :precision="2"  v-model="unpRebateAmountData.rebateAmount" :min="0" :max="999999999"
          ></el-input-number>
@@ -173,7 +204,7 @@
  </div>
 </template>
 <script>
-import { platformPageListApi, revenueListApi, excelImportOrder, getImportOrderRate, orderExportError, orderReturnDetail, orderUpdate } from "@/api/divide.js"
+import { platformPageListApi, revenueListApi, excelImportOrder, getImportOrderRate, orderExportError, orderReturnDetail, orderUpdate,exportOrderList } from "@/api/divide.js"
 export default {
  name: 'carBrand',
  components: {},
@@ -425,6 +456,32 @@ export default {
        }
      });
    },
+    //导出订单列表
+    exportListFn(){
+      exportOrderList(this.tableFrom).then((res) => {
+        let URL = window.URL || window.webkitURL;
+        let blob = res.data;
+        let objectUrl = URL.createObjectURL(blob);
+        if (res.fileName) {
+          let a = document.createElement('a');
+          if (typeof a.download === 'undefined') {
+            window.location = objectUrl;
+          } else {
+            a.href = objectUrl;
+            const time = new Date();
+            const year = time.getFullYear(); // 获取年份
+            const month = time.getMonth() + 1; // 获取月份
+            const day = time.getDate(); // 获取日期
+            // 将时间转换为特定格式的字符串
+            const formattedDate = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+            a.download = `${formattedDate}carList.xlsx`;
+            document.body.appendChild(a);
+            a.click();
+            a.remove();
+          }
+        }
+      });
+    },
    //导出模版
    carExportFn() {
      carExport({
--- a/src/views/divide/divide_list/index.vue
+++ b/src/views/divide/divide_list/index.vue
@@ -6,20 +6,38 @@
        <div class="container" v-hasPermi="['platform:merchant:page:list']">
          <el-form size="small" label-width="100px" :inline="true">
            <el-form-item label="平台名称：" label-width="100px" style="display: inline-block">
-              <el-input v-model.trim="tableFrom.name" @keyup.enter.native="carListFn(1)" placeholder="请输入平台名称："
+              <el-input v-model.trim="tableFrom.name" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入平台名称："
                class="selWidth" clearable>
-                <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="carListFn(1)" />
              </el-input>
            </el-form-item>
+            <el-form-item label="平台编码：" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.platformSn" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入平台编码："
+                class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="分佣方案:" label-width="100px" style="display: inline-block">
+              <el-select v-model="tableFrom.way" style="width: 200px;" filterable remote reserve-keyword placeholder="选择分佣方案"
+                :loading="loading" clearable>
+                <el-option :key="1" label="按单量" :value="1">
+                </el-option>
+                <el-option :key="0" label="按比例" :value="0">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="省市区" prop="selectedOptions" class="lang">
+              <el-cascader style="width: 200px;" clearable :options="pcTextArr" v-model="selectedOptions"
+                @change="addressChoose"></el-cascader>
+            </el-form-item>
            <el-form-item label="合作时间" prop="time1" class="lang">
-              <el-date-picker v-model="time1" type="datetimerange" start-placeholder="开始日期"
-                end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd HH:mm:ss" @change="timeChange">
+              <el-date-picker v-model="time1" type="datetimerange" start-placeholder="开始日期" end-placeholder="结束日期"
+                :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
+                @change="timeChange">
              </el-date-picker>
            </el-form-item>
            <el-form-item>
-              <el-button type="primary" plain icon="el-icon-search" size="mini" @click="queryListFn"
-               >搜索
+              <el-button type="primary" plain icon="el-icon-search" size="mini" @click="queryListFn">搜索
+              </el-button>
+              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="exportListFn">导出
              </el-button>
            </el-form-item>
          </el-form>
@@ -29,8 +47,9 @@
      <el-table v-loading="listLoading" :data="tableData" style="width: 100%" size="small" highlight-current-row
        class="switchTable">
        <el-table-column prop="id" label="ID" />
-        <el-table-column prop="name" label="平台名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="platformSn" label="平台编码" ></el-table-column>
+        <el-table-column prop="name" label="平台简称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="abbreviation" label="平台全称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="platformSn" label="平台编码"></el-table-column>
        <el-table-column prop="image" label="logo" show-overflow-tooltip>
          <template slot-scope="scope">
            <imagePreview :src="scope.row.image" style="width: 40px; height: 40px" />
@@ -55,6 +74,12 @@
          </template>
        </el-table-column>
        <el-table-column prop="startTime" label="合作时间" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="name" label="显示状态" min-width="90">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.isShow" :active-value="true" :inactive-value="false" active-text="开启"
+              inactive-text="关闭" disabled @click.native="carSeriesSwitchFn(scope.row)" />
+          </template>
+        </el-table-column>
        <el-table-column label="操作" min-width="110" fixed="right" align="center">
          <template slot-scope="scope">
            <el-button type="text" size="small" @click="onEdit(scope.row)" class="mr10">修改</el-button>
@@ -72,15 +97,19 @@
  </div>
 </template>
 <script>
-import { platformPageListApi, platformAdd, platformUpdate, platformDelete, platformDetail } from "@/api/divide.js"
+import { pcTextArr } from 'element-china-area-data';
+import { platformPageListApi, platformAdd, platformUpdate, platformDelete, platformDetail, platformSwitch,exportCommission } from "@/api/divide.js"
 import CreatMerchant from './creatMerchant';
 export default {
  name: 'carBrand',
  components: { CreatMerchant },
  data() {
    return {
+      // 省市区级联
+      pcTextArr,
+      selectedOptions:[],
      //时间
-      time1:[],
+      time1: [],
      title: '添加',
      activeName: '0',
      loading: false,
@@ -129,22 +158,61 @@ export default {
  computed: {},
  mounted() { },
  created() {
-    // console.log('created');
+    // console.log(this.pcTextArr);
+    this.pcTextArr.forEach(item => {
+      if (item.label == '北京市') {
+        item.children = [{
+          label: "北京市",
+          value: "北京市"
+        }]
+      }
+      if (item.label == '天津市') {
+        item.children = [{
+          label: "天津市",
+          value: "天津市"
+        }]
+      }
+      if (item.label == '上海市') {
+        item.children = [{
+          label: "上海市",
+          value: "上海市"
+        }]
+      }
+      if (item.label == '重庆市') {
+        item.children = [{
+          label: "重庆市",
+          value: "重庆市"
+        }]
+      }
+    });
    this.carListFn();
  },
  methods: {
-     //搜索
-     queryListFn(){
+    //监听省市
+    addressChoose(e) {
+      console.log(e[0]);
+      this.tableFrom.city=e[1]
+    },
+    /**  开启关闭 */
+    carSeriesSwitchFn(row) {
+      // console.log(row.id, row.isShow);
+      platformSwitch(row.id).then(() => {
+        this.$message.success('修改成功');
+        this.carListFn();
+      });
+    },
+    //搜索
+    queryListFn() {
      this.tableFrom.page = 1;
      this.carListFn();
    },
    //时间
    timeChange(e) {
      console.log(e);
-      if(e){
-        this.tableFrom.dateLimit=e.join(',')
-      }else{
-        this.tableFrom.dateLimit=''
+      if (e) {
+        this.tableFrom.dateLimit = e.join(',')
+      } else {
+        this.tableFrom.dateLimit = ''
      }
      this.tableFrom.page = 1;
      this.carListFn();
@@ -205,6 +273,33 @@ export default {
      this.title = '添加分佣平台';
      this.resettingFn();
    },
+    //导出数据 
+    exportListFn(){
+      exportCommission(this.tableFrom).then((res) => {
+        // console.log(res);
+        let URL = window.URL || window.webkitURL;
+        let blob = res.data;
+        let objectUrl = URL.createObjectURL(blob);
+        if (res.fileName) {
+          let a = document.createElement('a');
+          if (typeof a.download === 'undefined') {
+            window.location = objectUrl;
+          } else {
+            a.href = objectUrl;
+            const time = new Date();
+            const year = time.getFullYear(); // 获取年份
+            const month = time.getMonth() + 1; // 获取月份
+            const day = time.getDate(); // 获取日期
+            // 将时间转换为特定格式的字符串
+            const formattedDate = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+            a.download = `${formattedDate}carList.xlsx`;
+            document.body.appendChild(a);
+            a.click();
+            a.remove();
+          }
+        }
+      });
+    },
  },
 };
 </script>
--- a/src/views/divide/divide_user_list/index.vue
+++ b/src/views/divide/divide_user_list/index.vue
@@ -6,18 +6,49 @@
        <div class="container" v-hasPermi="['platform:merchant:page:list']">
          <el-form size="small" label-width="100px" :inline="true">
            <el-form-item label="司机名字" label-width="100px" style="display: inline-block">
-              <el-input v-model.trim="tableFrom.name" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
-                class="selWidth" clearable>
-                <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="queryListFn(1)" />
+              <el-input v-model.trim="tableFrom.name" style="width: 200px;" @keyup.enter.native="carListFn(1)"
+                placeholder="请输入司机名字" class="selWidth" clearable>
              </el-input>
            </el-form-item>
            <el-form-item label="分佣平台" prop="status">
-              <el-select v-model="tableFrom.platformId" filterable remote reserve-keyword placeholder="请输入分佣平台"
-                :remote-method="remoteMethod" :loading="loading" clearable>
+              <el-select v-model="tableFrom.platformId" style="width: 200px;" filterable remote reserve-keyword
+                placeholder="请输入分佣平台" :remote-method="remoteMethod" :loading="loading" clearable>
                <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
                </el-option>
              </el-select>
            </el-form-item>
+            <el-form-item label="滴友ID" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.driverKey" style="width: 200px;" @keyup.enter.native="carListFn(1)"
+                placeholder="请输入滴友ID" class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="手机号" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.phone" style="width: 200px;" @keyup.enter.native="carListFn(1)"
+                placeholder="请输入手机号" class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="身份证号" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.codeId" style="width: 200px;" @keyup.enter.native="carListFn(1)"
+                placeholder="请输入身份证号" class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="司机编码" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.driverSn" style="width: 200px;" @keyup.enter.native="carListFn(1)"
+                placeholder="请输入司机编码" class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="审核状态" label-width="100px" style="display: inline-block">
+              <el-select v-model="tableFrom.status" style="width: 200px;" filterable remote reserve-keyword
+                placeholder="请输入审核状态" :remote-method="remoteMethod" :loading="loading" clearable>
+                <el-option label="待审核" :value="1"> </el-option>
+                <el-option label="审核失败" :value="2"> </el-option>
+                <el-option label="审核成功" :value="3"> </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="省市区" prop="selectedOptions" class="lang">
+              <el-cascader style="width: 200px;" clearable :options="pcTextArr" v-model="selectedOptions"
+                @change="addressChoose"></el-cascader>
+            </el-form-item>
            <el-form-item label="参与时间" prop="time1" class="lang">
              <el-date-picker v-model="time1" type="datetimerange" start-placeholder="开始日期" end-placeholder="结束日期"
                :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
@@ -48,7 +79,7 @@
      <el-table v-loading="listLoading" :data="tableData" style="width: 100%" size="small" highlight-current-row
        class="switchTable">
        <el-table-column prop="id" label="编号" />
-        <el-table-column prop="userSn" label="用户id" />
+        <el-table-column prop="driverKey" label="滴友ID" />
        <el-table-column prop="platformId" label="返佣平台id" />
        <el-table-column prop="platformSn" label="返佣平台编号" />
        <!-- <el-table-column prop="joinSn" label="参与编号" /> -->
@@ -72,12 +103,14 @@
        </el-table-column>
        <el-table-column prop="status" label="城市" show-overflow-tooltip>
          <template slot-scope="scope">
-           {{ scope.row.province }}{{ scope.row.city }}
+            {{ scope.row.province }}{{ scope.row.city }}
          </template>
        </el-table-column>
        <el-table-column label="操作" min-width="110" fixed="right" align="center">
          <template slot-scope="scope">
            <el-button type="text" size="small" @click="onInfo(scope.row.id)" class="mr10">详情</el-button>
+            <el-button type="text" size="small" @click="unpUser(scope.row)" class="mr10">修改</el-button>
+            <el-button type="text" size="small" @click="delUser(scope.row.id)" class="mr10">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -90,8 +123,8 @@
    <!-- 导入汽车列表 -->
    <el-dialog title="导入" :visible.sync="carExpListOpen" width="25%" :before-close="handleClose">
      <div>
-        <el-select  v-model="tableFrom.platformId" filterable remote reserve-keyword
-          placeholder="请输入导入平台" :remote-method="remoteMethod" :loading="loading" clearable>
+        <el-select v-model="tableFrom.platformId" filterable remote reserve-keyword placeholder="请输入导入平台"
+          :remote-method="remoteMethod" :loading="loading" clearable>
          <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
          </el-option>
        </el-select>
@@ -137,7 +170,7 @@
          <el-descriptions-item label="参与编码">{{ formData.joinSn }}</el-descriptions-item>
          <el-descriptions-item label="滴友id">{{ formData.driverKey }}</el-descriptions-item>
          <el-descriptions-item label="司机编码">{{ formData.driverSn }}</el-descriptions-item>
-          <el-descriptions-item label="分佣城市">  {{ formData.province }}{{ formData.city }}</el-descriptions-item>
+          <el-descriptions-item label="分佣城市"> {{ formData.province }}{{ formData.city }}</el-descriptions-item>
          <el-descriptions-item label="logo">
            <imagePreview :src="formData.image" style="width: 40px; height: 40px" />
          </el-descriptions-item>
@@ -157,14 +190,42 @@
        </el-descriptions>
      </div>
    </el-drawer>
+
+    <!-- 修改状态，司机编码 -->
+    <el-dialog title="修改返佣金额" :visible.sync="unpUserShow" destroy-on-close>
+      <el-form :model="unpUserData">
+        <el-form-item label="司机编码" label-width="100px">
+          <el-input v-model="unpUserData.driverSn" style="width: 200px;" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="审核状态" label-width="100px">
+          <el-select v-model="unpUserData.status" style="width: 200px;" filterable remote reserve-keyword
+            placeholder="请输入审核状态" :remote-method="remoteMethod" :loading="loading" clearable>
+            <el-option label="待审核" :value="1"> </el-option>
+            <el-option label="审核失败" :value="2"> </el-option>
+            <el-option label="审核成功" :value="3"> </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="unpUserShow = false">取 消</el-button>
+        <el-button type="primary" @click="submitAmountFn">确 定</el-button>
+      </div>
+    </el-dialog>
  </div>
 </template>
 <script>
-import { platformPageListApi, platformUserList, getUserDetail, carExport, carExportUnregistered, carExportError, excelUserSn, carGetImportRate, excelUserCondition, conditionRate, ExportRefError } from "@/api/divide.js"
+import { pcTextArr } from 'element-china-area-data';
+import { platformPageListApi, platformUserList, getUserDetail, carExport, carExportUnregistered, carExportError, excelUserSn, carGetImportRate, excelUserCondition, conditionRate, ExportRefError, exportUserList,postUserEdit,deleteUser } from "@/api/divide.js"
 export default {
  name: 'carBrand',
  data() {
    return {
+      //修改弹出层
+      unpUserShow: false,
+      unpUserData: {},
+      //省级联动
+      pcTextArr,
+      selectedOptions: [],
      //详情弹出层
      loadingFrom: false,
      //详情
@@ -207,9 +268,62 @@ export default {
    // console.log('created');
    this.carListFn();
    this.remoteMethod()
-
+    this.pcTextArr.forEach(item => {
+      if (item.label == '北京市') {
+        item.children = [{
+          label: "北京市",
+          value: "北京市"
+        }]
+      }
+      if (item.label == '天津市') {
+        item.children = [{
+          label: "天津市",
+          value: "天津市"
+        }]
+      }
+      if (item.label == '上海市') {
+        item.children = [{
+          label: "上海市",
+          value: "上海市"
+        }]
+      }
+      if (item.label == '重庆市') {
+        item.children = [{
+          label: "重庆市",
+          value: "重庆市"
+        }]
+      }
+    });
  },
  methods: {
+    //删除信息
+    delUser(id){
+      this.$modalSure('删除当前数据?').then(() => {
+        deleteUser(id).then((data) => {
+            this.$message.success('删除成功');
+            this.carListFn();
+          });
+      });
+    },
+    //提交修改 信息
+    submitAmountFn() {
+      console.log(this.unpUserData);
+      postUserEdit(this.unpUserData).then(res=>{
+        this.carListFn();
+      })
+      this.unpUserShow = false
+    },
+    //修改信息
+    unpUser(row) {
+      this.unpUserShow = true
+      this.unpUserData = row
+
+    },
+    //省市
+    addressChoose(e) {
+      console.log(e);
+      this.tableFrom.city = e[1]
+    },
    //时间
    timeChange(e) {
      console.log(e);
@@ -345,10 +459,6 @@ export default {
        return 0;
      }
      return total <= 0 ? 0 : Math.floor(Math.round((num / total) * 10000) / 100.0);
-    },
-    //d导出列表
-    exportListFn(){
-      
    },
    //导出失败文件
    carExportErrorFn() {
@@ -436,6 +546,33 @@ export default {
        }
      });
    },
+    //导出用户列表
+    exportListFn() {
+      exportUserList(this.tableFrom).then((res) => {
+        // console.log(res);
+        let URL = window.URL || window.webkitURL;
+        let blob = res.data;
+        let objectUrl = URL.createObjectURL(blob);
+        if (res.fileName) {
+          let a = document.createElement('a');
+          if (typeof a.download === 'undefined') {
+            window.location = objectUrl;
+          } else {
+            a.href = objectUrl;
+            const time = new Date();
+            const year = time.getFullYear(); // 获取年份
+            const month = time.getMonth() + 1; // 获取月份
+            const day = time.getDate(); // 获取日期
+            // 将时间转换为特定格式的字符串
+            const formattedDate = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+            a.download = `${formattedDate}carList.xlsx`;
+            document.body.appendChild(a);
+            a.click();
+            a.remove();
+          }
+        }
+      });
+    },
    //导出模版
    carExportFn() {
      carExport({
--- a/src/views/divide/login_failed/index.vue
+++ b/src/views/divide/login_failed/index.vue
@@ -6,13 +6,27 @@
        <div class="container" v-hasPermi="['platform:merchant:page:list']">
          <el-form size="small" label-width="100px" :inline="true">
            <el-form-item label="司机名字" label-width="100px" style="display: inline-block">
-              <el-input v-model.trim="tableFrom.name" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
+              <el-input v-model.trim="tableFrom.name" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
+                class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="滴友ID" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.driverKey" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
+                class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="手机号" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.phone" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
+                class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="身份证号" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.codeId" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
                class="selWidth" clearable>
-                <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="queryListFn(1)" />
              </el-input>
            </el-form-item>
            <el-form-item label="分佣平台" prop="status">
-              <el-select v-model="tableFrom.platformId" filterable remote reserve-keyword placeholder="请输入分佣平台"
+              <el-select v-model="tableFrom.platformId" clearable style="width: 200px;" filterable remote reserve-keyword placeholder="请输入分佣平台"
                :remote-method="remoteMethod" :loading="loading">
                <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
                </el-option>
@@ -29,7 +43,7 @@
               >搜索
              </el-button>
              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="carExportFn"
-                v-hasPermi="['system:shop:export']">导出
+               >导出
              </el-button>
            </el-form-item>
          </el-form>
@@ -76,7 +90,7 @@
 </template>
 <script>
 // import { platformAdd,platformUpdate ,platformDelete,platformDetail} from "@/api/divide.js"
-import { platformPageListApi, userFailList, platformDetail, exportUserError,} from "@/api/divide.js"
+import { platformPageListApi, userFailList, platformDetail, exportOutList,} from "@/api/divide.js"
 // import CreatMerchant from './creatMerchant';
 export default {
  name: 'carBrand',
@@ -186,7 +200,7 @@ export default {
 
    //导出模版
    carExportFn() {
-      exportUserError().then((res) => {
+      exportOutList(this.tableFrom).then((res) => {
        // console.log(res);
        let URL = window.URL || window.webkitURL;
        let blob = res.data;
--- a/src/views/divide/user_statistics/index.vue
+++ b/src/views/divide/user_statistics/index.vue
@@ -6,17 +6,44 @@
        <div class="container" v-hasPermi="['platform:merchant:page:list']">
          <el-form size="small" label-width="100px" :inline="true">
            <el-form-item label="司机名字" label-width="100px" style="display: inline-block">
-              <el-input v-model.trim="tableFrom.userName" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
+              <el-input v-model.trim="tableFrom.userName" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
                class="selWidth" clearable>
-                <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="carListFn(1)" />
              </el-input>
            </el-form-item>
+            <el-form-item label="手机号" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.phone" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
+                class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="司机编码" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.driverSn" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
+                class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="滴友ID" label-width="100px" style="display: inline-block">
+              <el-input v-model.trim="tableFrom.driverKey" style="width: 200px;" @keyup.enter.native="carListFn(1)" placeholder="请输入司机名字"
+                class="selWidth" clearable>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="状态" label-width="100px" style="display: inline-block">
+              <el-select v-model="tableFrom.status" style="width: 200px;" filterable remote reserve-keyword placeholder="请选择状态"
+                clearable>
+                <el-option label="冻结期" :value="2">  </el-option>
+                <el-option label="解冻期" :value="3">  </el-option>
+              </el-select>
+            </el-form-item>
            <el-form-item label="创建时间" prop="time1" class="lang">
              <el-date-picker v-model="time1" type="datetimerange" start-placeholder="开始日期"
                end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"
                format="yyyy-MM-dd HH:mm:ss" @change="timeChange">
              </el-date-picker>
            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" plain icon="el-icon-search" size="mini" @click="queryListFn">搜索
+              </el-button>
+              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="exportListFn">导出
+              </el-button>
+            </el-form-item>
          </el-form>
        </div>
      </div>
@@ -24,6 +51,7 @@
        class="switchTable">
        <el-table-column prop="userSn" label="用户编号" />
        <el-table-column prop="userName" label="司机名字" />
+        <el-table-column prop="phone" label="司机手机号" />
        <el-table-column prop="totCommAmt" label="分佣金额" />
        <el-table-column prop="driverKey" label="滴友id" />
        <el-table-column prop="driverSn" label="司机编号" ></el-table-column>
@@ -50,7 +78,7 @@
  </div>
 </template>
 <script>
-import {userSummaryList} from "@/api/divide.js"
+import {userSummaryList,exportSummaryList} from "@/api/divide.js"
 export default {
  name: 'carBrand',
  data() {
@@ -90,7 +118,11 @@ export default {
    resettingFn() {
      this.formData = {};
    },
-
+     //搜索
+     queryListFn() {
+      this.tableFrom.page = 1;
+      this.carListFn();
+    },
    //分页
    pageChange(page) {
      this.tableFrom.page = page;
@@ -108,6 +140,32 @@ export default {
        this.total = res.total;
      });
    },
+    //导出
+    exportListFn(){
+      exportSummaryList(this.tableFrom).then((res) => {
+        let URL = window.URL || window.webkitURL;
+        let blob = res.data;
+        let objectUrl = URL.createObjectURL(blob);
+        if (res.fileName) {
+          let a = document.createElement('a');
+          if (typeof a.download === 'undefined') {
+            window.location = objectUrl;
+          } else {
+            a.href = objectUrl;
+            const time = new Date();
+            const year = time.getFullYear(); // 获取年份
+            const month = time.getMonth() + 1; // 获取月份
+            const day = time.getDate(); // 获取日期
+            // 将时间转换为特定格式的字符串
+            const formattedDate = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+            a.download = `${formattedDate}carList.xlsx`;
+            document.body.appendChild(a);
+            a.click();
+            a.remove();
+          }
+        }
+      });
+    }
  },
 };
 </script>