6.28(优化

2024-06-28 23:17:25 +08:00
parent 8128139a0e
commit daa072b468
3 changed files with 66 additions and 47 deletions
--- a/src/api/divide.js
+++ b/src/api/divide.js
@@ -173,6 +173,18 @@ export function excelImportOrder(data,id) {
  });
 }

+
+/**
+ * 订单详情 /api/admin/platform/comm/plat/order/return/detail/{{id}}
+ */
+export function orderReturnDetail(id) {
+  return request({
+    url: `/admin/platform/comm/plat/order/return/detail/${id}`,
+    method: 'get',
+  });
+}
+
+
 /**获取导入订单流水进度 /excel/admin/comm/plat/order/getImportRate */
 export function getImportOrderRate(data) {
  return request({
--- a/src/views/divide/commission_order/index.vue
+++ b/src/views/divide/commission_order/index.vue
@@ -19,14 +19,13 @@
              </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 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="primary" plain icon="el-icon-plus" size="mini"
                @click="carExpListOpen = true">导入</el-button>
@@ -43,13 +42,13 @@
        <el-table-column prop="phone" label="手机号" show-overflow-tooltip></el-table-column>
        <el-table-column prop="way" label="分佣方案" show-overflow-tooltip>
          <template slot-scope="scope">
-           {{ scope.row.way==0?'按比例':'按单量' }}
+            {{ scope.row.way == 0 ? '按比例' : '按单量' }}
          </template>
        </el-table-column>
        <el-table-column prop="way" label="分佣方式" show-overflow-tooltip>
          <template slot-scope="scope">
-           <span v-if=" scope.row.way==0">{{ scope.row.ratio }}</span>
-           <span v-else>{{ scope.row.eachMoney }}/单</span>
+            <span v-if="scope.row.way == 0">{{ scope.row.ratio }}</span>
+            <span v-else>{{ scope.row.eachMoney }}/单</span>
          </template>
        </el-table-column>
        <el-table-column prop="actualAmount" label="订单金额" show-overflow-tooltip></el-table-column>
@@ -79,11 +78,11 @@
    <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-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
-              <div style="height: 20px;"></div>
+          :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>
+        <div style="height: 20px;"></div>
        <div v-if="!impDataFlag">
          <el-upload width="100%" class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/"
            :http-request="handleUploadForm" multiple :limit="1" :file-list="fileList">
@@ -113,50 +112,52 @@
    <!-- 详情 -->
    <el-drawer :visible.sync="loadingFrom" size="100%">
      <div class="descriBOX">
-        <el-descriptions title="汽车参数模板详情" :column="2" border>
+        <el-descriptions title="订单详情" :column="2" border>
          <el-descriptions-item label="id">{{ formData.id }}</el-descriptions-item>
          <el-descriptions-item label="用户id">{{ formData.uid }}</el-descriptions-item>
+          <el-descriptions-item label="用户昵称">{{ formData.userName }}</el-descriptions-item>
+          <el-descriptions-item label="手机号">{{ formData.phone }}</el-descriptions-item>
          <el-descriptions-item label="返佣平台id">{{ formData.platformId }}</el-descriptions-item>
          <el-descriptions-item label="返佣平台sn">{{ formData.platformSn }}</el-descriptions-item>
-          <!-- <el-descriptions-item label="车牌号">{{ carData.carNo }}</el-descriptions-item> -->
          <el-descriptions-item label="返佣平台名称">{{ formData.platformName }}</el-descriptions-item>
-          <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="logo">
-            <imagePreview :src="formData.image" style="width: 40px; height: 40px" />
+          <el-descriptions-item label="用户头像">
+            <imagePreview :src="formData.avatar" style="width: 40px; height: 40px" />
          </el-descriptions-item>
-          <el-descriptions-item label="审核状态">
-            <span v-if="formData.status == 0"> 未参与</span>
-            <span v-if="formData.status == 1"> 待审核</span>
-            <span v-if="formData.status == 2"> 审核失败</span>
-            <span v-if="formData.status == 3"> 审核成功</span>
+          <el-descriptions-item label="分佣方案"> {{ formData.way == 0 ? '按比例' : '按单量' }}</el-descriptions-item>
+          <el-descriptions-item label="分佣方式">
+            <span v-if="formData.way == 0">{{ formData.ratio }}</span>
+            <span v-else>{{ formData.eachMoney }}/单</span>
          </el-descriptions-item>
-          <!-- <el-descriptions-item label="动力类型">{{
-          carData.powerType == 0 ? '纯电' : carData.powerType == 1 ? '油电' : '纯油'
-        }}</el-descriptions-item> -->
-          <el-descriptions-item label="参与时间">{{ formData.participationTime }}</el-descriptions-item>
-          <el-descriptions-item label="绑定时间">{{ formData.bindingTime }}</el-descriptions-item>
+          <el-descriptions-item label="是否统计">{{ formData.isCounted }}</el-descriptions-item>
+          <el-descriptions-item label="订单实际价格">{{ formData.actualAmount }}</el-descriptions-item>
+          <el-descriptions-item label="订单总价">{{ formData.totalPrice }}</el-descriptions-item>
+          <el-descriptions-item label="订单编号">{{ formData.orderSn }}</el-descriptions-item>
+          <el-descriptions-item label="订单金额">{{ formData.actualAmount }}</el-descriptions-item>
+          <el-descriptions-item label="分佣金额">{{ formData.rebateAmount }}</el-descriptions-item>
+          <el-descriptions-item label="平台名称">{{ formData.platformName }}</el-descriptions-item>
+          <el-descriptions-item label="汇总编号">{{ formData.summarySn }}</el-descriptions-item>
          <el-descriptions-item label="创建时间">{{ formData.createTime }}</el-descriptions-item>
-          <el-descriptions-item label="修改时间">{{ formData.updateTime }}</el-descriptions-item>
+          
        </el-descriptions>
      </div>
    </el-drawer>
  </div>
 </template>
 <script>
-import { platformPageListApi, revenueListApi,excelImportOrder,getImportOrderRate,orderExportError} from "@/api/divide.js"
+import { platformPageListApi, revenueListApi, excelImportOrder, getImportOrderRate, orderExportError, orderReturnDetail } from "@/api/divide.js"
 export default {
  name: 'carBrand',
-  components: {  },
+  components: {},
  data() {
    return {
-      formData:{},
-      loadingFrom:false,
+      formData: {},
+      loadingFrom: false,
      //参与时间
-      time1:[],
+      time1: [],
      //导入类型
-      expType:1,
+      expType: 1,
      //导入弹出层
      carExpListOpen: false,
      //导入开关
@@ -194,16 +195,16 @@ export default {
    //时间
    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();
    },
-     //搜索
-     queryListFn(){
+    //搜索
+    queryListFn() {
      this.tableFrom.page = 1;
      this.carListFn();
    },
@@ -260,7 +261,7 @@ export default {
    // 详情
    onInfo(id) {
      this.loadingFrom = true;
-      platformDetail(id).then((res) => {
+      orderReturnDetail(id).then((res) => {
        this.formData = res;
      });
    },
@@ -278,13 +279,13 @@ export default {
    },
    // 导入车辆表
    toChannelShop() {
-      if(!this.tableFrom.platformId){
+      if (!this.tableFrom.platformId) {
        this.$message.success('请选择导入平台');
        return
      }
      if (this.file) {
        this.buttFlag = true;
-          excelImportOrder(this.file,this.tableFrom.platformId)
+        excelImportOrder(this.file, this.tableFrom.platformId)
          .then((res) => {
            // console.log(res);
            this.importData = res;
@@ -305,7 +306,7 @@ export default {
            }
          });
        }, 2000);
-       
+
      } else {
        this.$message.success('请选择文件');
      }
@@ -418,7 +419,7 @@ export default {
      this.buttFlag = false;
      this.impDataFlag = false;
      this.carExpListOpen = false;
-      this.fileList=[]
+      this.fileList = []
      //导入数据返回
      this.importData = {};
    },
@@ -431,6 +432,10 @@ export default {
  width: 90px;
 }

+.descriBOX {
+  padding: 30px;
+}
+
 .el-dropdown-link {
  cursor: pointer;
  color: #1890ff;
--- a/src/views/divide/divide_user_list/index.vue
+++ b/src/views/divide/divide_user_list/index.vue
@@ -49,7 +49,7 @@
        <el-table-column prop="userSn" label="用户id" />
        <el-table-column prop="platformId" label="返佣平台id" />
        <el-table-column prop="platformSn" label="返佣平台编号" />
-        <el-table-column prop="joinSn" label="参与编号" />
+        <!-- <el-table-column prop="joinSn" label="参与编号" /> -->
        <el-table-column prop="platformName" label="平台名称" show-overflow-tooltip></el-table-column>
        <el-table-column prop="realName" label="司机名字" show-overflow-tooltip></el-table-column>
        <el-table-column prop="phone" label="手机号" show-overflow-tooltip></el-table-column>
@@ -121,6 +121,8 @@
        <el-descriptions title="用户详情" :column="2" border>
          <el-descriptions-item label="id">{{ formData.id }}</el-descriptions-item>
          <el-descriptions-item label="用户id">{{ formData.uid }}</el-descriptions-item>
+          <el-descriptions-item label="司机名称">{{ formData.realName }}</el-descriptions-item>
+          <el-descriptions-item label="身份证号">{{ formData.idCard }}</el-descriptions-item>
          <el-descriptions-item label="返佣平台id">{{ formData.platformId }}</el-descriptions-item>
          <el-descriptions-item label="返佣平台sn">{{ formData.platformSn }}</el-descriptions-item>
          <el-descriptions-item label="车牌号">{{ carData.carNo }}</el-descriptions-item>