谢杰标 2 жил өмнө
parent
commit
84d847485a

+ 8 - 0
src/api/financed/index.js

@@ -83,6 +83,14 @@ export function tenantExport(query) {
     params: query,
     params: query,
   });
   });
 }
 }
+// 佣金结算导出
+export function commissionExport(query) {
+  return request({
+    url: "/system/top/order/commissionListExport",
+    method: "get",
+    params: query,
+  });
+}
 // 订单应收应付统计
 // 订单应收应付统计
 export function sellerExport(query) {
 export function sellerExport(query) {
   return request({
   return request({

+ 1 - 1
src/utils/request.js

@@ -9,7 +9,7 @@ axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
 // 创建axios实例
 // export const baseURL = process.env.VUE_APP_BASE_API
 // export const baseURL = process.env.VUE_APP_BASE_API
 // export const baseURL = 'https://ptapi.gdzzkj.net/'
 // export const baseURL = 'https://ptapi.gdzzkj.net/'
-export const baseURL = "http://192.168.1.7:7077/";
+export const baseURL = "http://192.168.1.222:7077/";
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API;
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API;
 const service = axios.create({
 const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分
   // axios中请求配置有baseURL选项,表示请求URL公共部分

+ 13 - 5
src/views/financed/arap/index.vue

@@ -173,8 +173,6 @@ import dislogBadBill from "../components/dislogBadBill.vue";
 import { exportFn } from "@/utils/index.js";
 import { exportFn } from "@/utils/index.js";
 import {
 import {
   orderList,
   orderList,
-  sellerList,
-  tenantList,
   companyList,
   companyList,
   orderExport,
   orderExport,
   tenantExport,
   tenantExport,
@@ -183,6 +181,7 @@ import {
   commissionList,
   commissionList,
   sellerPercentageList,
   sellerPercentageList,
   monthOrderList,
   monthOrderList,
+  commissionExport,
 } from "@/api/financed/index";
 } from "@/api/financed/index";
 export default {
 export default {
   name: "cost",
   name: "cost",
@@ -339,6 +338,11 @@ export default {
           prop: "orderReceived",
           prop: "orderReceived",
           hidden: true,
           hidden: true,
         },
         },
+        {
+          label: "已退金额(元)",
+          prop: "predictReceiveDay",
+          hidden: true,
+        },
         {
         {
           label: "未收账款(元)",
           label: "未收账款(元)",
           prop: "orderUncollected",
           prop: "orderUncollected",
@@ -352,7 +356,7 @@ export default {
         },
         },
         {
         {
           label: "剩余天数",
           label: "剩余天数",
-          prop: "predictPayDay",
+          prop: "predictReceiveDay",
           hidden: true,
           hidden: true,
         },
         },
         {
         {
@@ -667,12 +671,16 @@ export default {
       ] = true;
       ] = true;
     },
     },
     batchExport() {
     batchExport() {
-      const fn = [orderExport, tenantExport, sellerExport][this.type];
+      const fn = [orderExport, tenantExport, sellerExport, commissionExport][
+        this.type
+      ];
       fn(this.formData).then((res) => {
       fn(this.formData).then((res) => {
         if (res.msg) {
         if (res.msg) {
           exportFn(
           exportFn(
             res.msg,
             res.msg,
-            `导出${["应收应付", "机构分成", "业务员提成"][this.type]}数据`
+            `导出${
+              ["应收应付", "机构分成", "业务员提成", "佣金结算"][this.type]
+            }数据`
           );
           );
         } else {
         } else {
           this.$message.error("导出失败");
           this.$message.error("导出失败");