chore:删除部分无用代码,添加部分后端报表

src/api/InvoiceSaleSettings/commodityCost/index.ts

@@ -1,37 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-import { ResponseListType, ResponseType } from "../../types";
-import { ICateType, IGoodDetail, IGoodType } from "./types";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-
-// 商品列表
-export const httpList = (data: object): ResponseListType<IGoodType> => {
-  return http.request("post", `${yewuApi}goodlist`, {
-    data: {
-      ...data,
-      isZx: 0
-    }
-  });
-};
-
-// 商品详情
-export const httpDetail = (data: object): ResponseType<IGoodDetail> => {
-  return http.request("post", `${yewuApi}goodinfo`, { data });
-};
-
-export const httpCatlist = (data: object): ResponseListType<ICateType> => {
-  return http.request("post", `${yewuApi}catquery`, { data });
-};
-
-//添加商品类目
-export const httpAdd = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}addgood`, { data });
-};
-
-export const httpBatch = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}addGoodBatch`, { data });
-};
-
-export * from "./types";

src/api/InvoiceSaleSettings/commodityCost/types.ts

@@ -1,79 +0,0 @@
-const goodTypeDemo = {
-  id: "2319",
-  spuCode: "SKU2206241104494972",
-  good_name: "青汁糯米团",
-  companyNo: "GS2203161855277894",
-  supplierNo: "QS2206080928329800",
-  is_stock: "0",
-  craft_desc: "",
-  after_sales: "请当配送员面进行货物验收，过后非质量原因无法为您办理退换服务。",
-  good_img:
-    "http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本 (2)_20220624110430.png,http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本_20220624110430.png,http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f_20220624110430.png",
-  good_thumb_img:
-    "http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本 (2)_20220624110425.png",
-  good_info_img:
-    "http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本_20220624110434.png",
-  creater: "泮路萌",
-  createrid: "85",
-  cat_name: "休闲零食",
-  unit_name: "箱",
-  status: "0",
-  inv_cat_name: "",
-  inv_cat_code: "",
-  inv_tax: "",
-  inv_good_name: "",
-  addtime: "2022-06-24 11:04:49",
-  updatetime: "2022-06-24 11:05:35",
-  companyName: "北京万宇恒通国际科贸有限公司",
-  supplierName: "漳州佬食仁电子商务有限公司",
-  isZx: ""
-};
-
-const catDemo = {
-  id: 3840,
-  cat_name: "电化学式分析仪器",
-  cat_code: "109060501",
-  status: 1,
-  addtime: "2022-08-23 11:41:38",
-  tax: ["13%"],
-  addtax: "",
-  sumitem: "否",
-  desc: "包括极谱分析仪、电位式分析仪器、电解式分析仪器、电导式分析仪器、电量式分析仪器、滴定仪、湿化学分析仪、溶解氧测定仪、其他电化学式分析仪器",
-  short_name: "分析仪器",
-  merge_code: "1090605010000000000"
-};
-
-const goodDetailDemo = {
-  id: 2319,
-  spuCode: "SKU2206241104494972",
-  good_name: "青汁糯米团",
-  companyNo: "GS2203161855277894",
-  supplierNo: "QS2206080928329800",
-  is_stock: 0,
-  craft_desc: "",
-  after_sales: "请当配送员面进行货物验收，过后非质量原因无法为您办理退换服务。",
-  good_img:
-    "http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本 (2)_20220624110430.png,http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本_20220624110430.png,http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f_20220624110430.png",
-  good_thumb_img:
-    "http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本 (2)_20220624110425.png",
-  good_info_img:
-    "http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本_20220624110434.png",
-  creater: "泮路萌",
-  createrid: 85,
-  cat_name: "休闲零食",
-  unit_name: "箱",
-  status: 0,
-  inv_cat_name: "分析仪器",
-  inv_cat_code: "1090605010000000000",
-  inv_tax: "13%",
-  inv_good_name: "电疗实",
-  isZx: 0,
-  addtime: "2022-06-24 11:04:49",
-  updatetime: "2022-08-24 16:30:18",
-  companyName: "北京万宇恒通国际科贸有限公司",
-  supplierName: ""
-};
-
-export type IGoodType = typeof goodTypeDemo;
-export type ICateType = typeof catDemo;
-export type IGoodDetail = typeof goodDetailDemo;

src/api/InvoiceSaleSettings/consultingCost/index.ts

@@ -1,19 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-import { ResponseListType } from "../../types";
-import { IGoodType } from "./types";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-
-// 商品列表
-export const httpList = (data: object): ResponseListType<IGoodType> => {
-  return http.request("post", `${yewuApi}goodlist`, {
-    data: {
-      ...data,
-      isZx: 1
-    }
-  });
-};
-
-export * from "./types";

src/api/InvoiceSaleSettings/consultingCost/types.ts

@@ -1,79 +0,0 @@
-const goodTypeDemo = {
-  id: "2319",
-  spuCode: "SKU2206241104494972",
-  good_name: "青汁糯米团",
-  companyNo: "GS2203161855277894",
-  supplierNo: "QS2206080928329800",
-  is_stock: "0",
-  craft_desc: "",
-  after_sales: "请当配送员面进行货物验收，过后非质量原因无法为您办理退换服务。",
-  good_img:
-    "http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本 (2)_20220624110430.png,http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本_20220624110430.png,http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f_20220624110430.png",
-  good_thumb_img:
-    "http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本 (2)_20220624110425.png",
-  good_info_img:
-    "http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本_20220624110434.png",
-  creater: "泮路萌",
-  createrid: "85",
-  cat_name: "休闲零食",
-  unit_name: "箱",
-  status: "0",
-  inv_cat_name: "",
-  inv_cat_code: "",
-  inv_tax: "",
-  inv_good_name: "",
-  addtime: "2022-06-24 11:04:49",
-  updatetime: "2022-06-24 11:05:35",
-  companyName: "北京万宇恒通国际科贸有限公司",
-  supplierName: "漳州佬食仁电子商务有限公司",
-  isZx: ""
-};
-
-const catDemo = {
-  id: 3840,
-  cat_name: "电化学式分析仪器",
-  cat_code: "109060501",
-  status: 1,
-  addtime: "2022-08-23 11:41:38",
-  tax: ["13%"],
-  addtax: "",
-  sumitem: "否",
-  desc: "包括极谱分析仪、电位式分析仪器、电解式分析仪器、电导式分析仪器、电量式分析仪器、滴定仪、湿化学分析仪、溶解氧测定仪、其他电化学式分析仪器",
-  short_name: "分析仪器",
-  merge_code: "1090605010000000000"
-};
-
-const goodDetailDemo = {
-  id: 2319,
-  spuCode: "SKU2206241104494972",
-  good_name: "青汁糯米团",
-  companyNo: "GS2203161855277894",
-  supplierNo: "QS2206080928329800",
-  is_stock: 0,
-  craft_desc: "",
-  after_sales: "请当配送员面进行货物验收，过后非质量原因无法为您办理退换服务。",
-  good_img:
-    "http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本 (2)_20220624110430.png,http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本_20220624110430.png,http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f_20220624110430.png",
-  good_thumb_img:
-    "http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本 (2)_20220624110425.png",
-  good_info_img:
-    "http://stock.api.wanyuhengtong.com/storage/topic/20220624/fb48a1a4cf4769c575f495fc459474f - 副本_20220624110434.png",
-  creater: "泮路萌",
-  createrid: 85,
-  cat_name: "休闲零食",
-  unit_name: "箱",
-  status: 0,
-  inv_cat_name: "分析仪器",
-  inv_cat_code: "1090605010000000000",
-  inv_tax: "13%",
-  inv_good_name: "电疗实",
-  isZx: 0,
-  addtime: "2022-06-24 11:04:49",
-  updatetime: "2022-08-24 16:30:18",
-  companyName: "北京万宇恒通国际科贸有限公司",
-  supplierName: ""
-};
-
-export type IGoodType = typeof goodTypeDemo;
-export type ICateType = typeof catDemo;
-export type IGoodDetail = typeof goodDetailDemo;

src/api/InvoiceSales/capitalClaim/index.ts

@@ -1,59 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-interface ResponseType extends Promise<any> {
-  data?: object;
-  code?: number;
-  msg?: string;
-}
-
-// 添加
-export const httpAdd = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderpayadd`, { data });
-};
-
-// 列表
-export const httpList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderpaylist`, { data });
-};
-//详情
-export const httpInfo = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}tradeinfo`, { data });
-};
-
-//上传execl
-export const httpUpload = (data: any): any => {
-  return http.request("post", `${yewuApi}importTrade`, { data });
-};
-
-//资金认领订单列表明细
-export const httpOrderList = (data: any): any => {
-  return http.request("post", `${yewuApi}tradeQuery`, { data });
-};
-
-//资金认领付款新建
-export const httpPayAdd = (data: any): any => {
-  return http.request("post", `${yewuApi}orderpayadd`, { data });
-};
-
-//销售订单列表
-export const httpSaleList = (data: any): any => {
-  return http.request("post", `${yewuApi}orderlist`, { data });
-};
-
-export const httpWithdraw = (data: any): any => {
-  return http.request("post", `${yewuApi}orderpaystatus`, {
-    data: {
-      status: "5",
-      ...data
-    }
-  });
-};
-//上传execl
-export const httpCapitalUpload = (data: any): any => {
-  return http.request("post", `${yewuApi}importTradeByBatchOrderCode`, {
-    data
-  });
-};

src/api/InvoiceSales/capitalPool/index.ts

@@ -1,23 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-interface ResponseType extends Promise<any> {
-  data?: object;
-  code?: number;
-  message?: string;
-}
-
-// 列表
-export const httpList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}tradeList`, { data });
-};
-// 详情
-export const httpDetail = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}tradeloginfo`, { data });
-};
-//审核状态
-export const httpStatus = (data: any): any => {
-  return http.request("post", `${yewuApi}orderpaystatus`, { data });
-};

src/api/InvoiceSales/invoiceApply/index.ts

@@ -1,60 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-interface ResponseType extends Promise<any> {
-  data?: object;
-  code?: number;
-  message?: string;
-}
-// 添加
-export const httpAdd = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderinvadd`, { data });
-};
-// 列表
-export const httpList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderinvlist`, { data });
-};
-// 详情
-export const httpDetail = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderinvinfo`, { data });
-};
-// 状态
-export const httpStatus = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderinvstatus`, { data });
-};
-// 订单列表
-export const httpOrderList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderlist`, { data });
-};
-
-export const httpBatchOrderList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderquery`, { data });
-};
-
-//设置物流
-export const httpSetPost = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}invsetpost`, { data });
-};
-
-//
-export const httpInvoiceList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}invoicelist`, { data });
-};
-
-export const httpCompanyList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}companylist`, { data });
-};
-
-export const httpUpload = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderinvimport`, { data });
-};
-
-export const httpBatchApproval = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderinvbatch`, { data });
-};
-
-export const httpBack = (data: object): any => {
-  return http.request("post", `${yewuApi}ticketedit`, { data });
-};

src/api/InvoiceSales/invoicePool/index.ts

@@ -1,30 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-interface ResponseType extends Promise<any> {
-  data?: object;
-  code?: number;
-  msg?: string;
-}
-// 添加
-export const httpAdd = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderpayadd`, { data });
-};
-
-// 列表
-export const httpList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderinvlist`, {
-    data: {
-      ...data,
-      status: "4",
-    }
-  });
-};
-
-export const httpInvList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderinvlist`, {
-    data
-  });
-};

src/api/InvoiceSales/redInk/index.ts

@@ -1,38 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-interface ResponseType extends Promise<any> {
-  data?: object;
-  code?: number;
-  message?: string;
-}
-
-// 列表
-export const httpList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}redlist`, {
-    data
-  });
-};
-
-//批量红冲
-export const httpBatchapplyred = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}batchapplyred`, {
-    data
-  });
-};
-
-//红冲
-export const httpApplyred = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}applyred`, {
-    data
-  });
-};
-
-//红冲后开票
-export const httpOpenInvoice = (data: Record<string, string>): ResponseType => {
-  return http.request("post", `${yewuApi}redopen`, {
-    data
-  });
-};

src/api/InvoiceSales/refund/index.ts

@@ -1,50 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-interface ResponseType extends Promise<any> {
-  data?: object;
-  code?: number;
-  msg?: string;
-}
-
-//退款单列表
-export const httpList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderreturnlist`, {
-    data
-  });
-};
-
-// 资金认领列表已通过审核的数据
-export const httpTradeList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}tradeList`, { data });
-};
-
-//资金认领详情
-export const httpTradeDetail = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}tradeloginfo`, {
-    data
-  });
-};
-
-//新建退款单
-export const httpAdd = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderpayreturn`, {
-    data
-  });
-};
-
-//退款单详情
-export const httpDetail = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}returnpayinfo`, {
-    data
-  });
-};
-
-//退款单审核
-export const httpStatus = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderreturnstatus`, {
-    data
-  });
-};

src/api/InvoiceSales/returnTicket/index.ts

@@ -1,34 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-import { ResponseType } from "../../types";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-
-//退票申请列表
-export const httpList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}invreturnlist`, {
-    data
-  });
-};
-
-//新增退票申请
-export const httpAdd = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}invreturnadd`, {
-    data
-  });
-};
-
-//退票详情
-export const httpDetail = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}returninvinfo`, {
-    data
-  });
-};
-
-//退票状态
-export const httpStatus = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}invreturnstatus`, {
-    data
-  });
-};

src/api/InvoiceSales/sheetOrderPool/index.ts

@@ -1,20 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-interface ResponseType extends Promise<any> {
-  data?: object;
-  code?: number;
-  msg?: string;
-}
-
-//销售订单列表
-export const httpList = (data: any): any => {
-  return http.request("post", `${yewuApi}orderlist`, { data });
-};
-
-//详情
-export const httpDetail = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}saleinfo`, { data });
-};

src/api/invoice/query/index.ts

@@ -1,20 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-interface ResponseType extends Promise<any> {
-  data?: object;
-  code?: number;
-  msg?: string;
-}
-
-// 销售接口
-export const httpXSList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderinvlist`, { data });
-};
-
-//采购接口
-export const httpCGList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}invlist`, { data });
-};

src/api/purchase/orderPay/index.ts

@@ -1,38 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-
-//对账付款申请列表
-export const httpList = (data: object): any => {
-  return http.request("post", `${yewuApi}paymentlist`, { data });
-};
-
-//对账付款详情
-export const httpInfo = (data: object): any => {
-  return http.request("post", `${yewuApi}dzinfo`, { data });
-};
-
-export const httpDetail = (data: object): any => {
-  return http.request("post", `${yewuApi}dzinfo`, { data });
-};
-
-//对账单申请付款添加
-export const httpAdd = (data: object): any => {
-  return http.request("post", `${yewuApi}stageadd`, { data });
-};
-
-//对账单申请删除
-export const httpDelete = (data: object): any => {
-  return http.request("post", `${yewuApi}stagedel`, { data });
-};
-
-//对账单申请付款审核状态
-export const httpStatus = (data: object): any => {
-  return http.request("post", `${yewuApi}stagestatus`, { data });
-};
-
-export const httpUpload = (data: object): any => {
-  return http.request("post", `${yewuApi}uploadimg`, { data });
-};

src/api/purchase/orderRecord/index.ts

@@ -1,47 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-
-export const httpList = (data: object): any => {
-  return http.request("post", `${yewuApi}paylist`, { data });
-};
-
-//对账单详情
-export const httpDetail = (data: object): any => {
-  return http.request("post", `${yewuApi}payinfo`, { data });
-};
-
-export const httpInfo = (data: object): any => {
-  return http.request("post", `${yewuApi}payinfo`, { data });
-};
-
-//采购单列表
-export const httpCgdList = (data: object = {}): any => {
-  return http.request("post", `${yewuApi}cgdlist`, { data });
-};
-
-//创建对账单
-export const httpAdd = (data: object = {}): any => {
-  return http.request("post", `${yewuApi}payadd`, { data });
-};
-
-//对账单编辑
-export const httpUpadte = (data: object = {}): any => {
-  return http.request("post", `${yewuApi}paysave`, { data });
-};
-
-//对账单审核
-export const httpStatus = (data: object): any => {
-  return http.request("post", `${yewuApi}paystatus`, { data });
-};
-
-//对账单删除
-export const httpDel = (data: object): any => {
-  return http.request("post", `${yewuApi}paydel`, { data });
-};
-
-export const httpBatch = (data: object): any => {
-  return http.request("post", `${yewuApi}cgdquery`, { data });
-};

src/api/purchase/orderRecordQuery/index.ts

@@ -1,14 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-
-export const httpList = (data: object): any => {
-  return http.request("post", `${yewuApi}paylist`, {
-    data: {
-      status: "3",
-      ...data
-    }
-  });
-};

src/api/purchase/porder/index.ts

@@ -1,13 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-
-export const httpList = (data: object): any => {
-  return http.request("post", `${yewuApi}cgdlist`, { data });
-};
-
-export const httpInfo = (data: object): any => {
-  return http.request("post", `${yewuApi}cgdinfo`, { data });
-};

src/api/purchase/purchPayRelive/index.ts

@@ -1,38 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-
-//对账付款申请列表
-export const httpList = (data: object): any => {
-  return http.request("post", `${yewuApi}stagereturnlist`, { data });
-};
-
-//对账付款解除详情
-export const httpInfo = (data: object): any => {
-  return http.request("post", `${yewuApi}stagereturninfo`, { data });
-};
-
-export const httpDetail = (data: object): any => {
-  return http.request("post", `${yewuApi}stagereturninfo`, { data });
-};
-
-//采购付款解除
-export const httpAdd = (data: object): any => {
-  return http.request("post", `${yewuApi}stagereturn`, { data });
-};
-
-//对账单申请删除
-export const httpDelete = (data: object): any => {
-  return http.request("post", `${yewuApi}stagedel`, { data });
-};
-
-//对账单申请付款审核状态
-export const httpStatus = (data: object): any => {
-  return http.request("post", `${yewuApi}stagereturnstatus`, { data });
-};
-
-export const httpUpload = (data: object): any => {
-  return http.request("post", `${yewuApi}uploadimg`, { data });
-};

src/api/purchase/ticketReturn/index.ts

@@ -1,44 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-
-//发票回票列表
-export const httpList = (data: object): any => {
-  return http.request("post", `${yewuApi}invlist`, { data });
-};
-
-//发票回票添加
-export const httpAdd = (data: object): any => {
-  return http.request("post", `${yewuApi}invadd`, { data });
-};
-
-//发票回票审核状态
-export const httpStatus = (data: object): any => {
-  return http.request("post", `${yewuApi}invstatus`, { data });
-};
-
-//发票回票详情
-export const httpInfo = (data: object): any => {
-  return http.request("post", `${yewuApi}hpinfo`, { data });
-};
-
-export const httpDetail = (data: object): any => {
-  return http.request("post", `${yewuApi}hpinfo`, { data });
-};
-
-//发票回票删除
-export const httpDelete = (data: object): any => {
-  return http.request("post", `${yewuApi}invdel`, { data });
-};
-
-//发票回票批量审核
-export const httpBatchimport = (data: object): any => {
-  return http.request("post", `${yewuApi}hpbatchimport`, { data });
-};
-
-//发票回票批量添加
-export const httpBatchAdd = (data: object): any => {
-  return http.request("post", `${yewuApi}invAddBatchByImport`, { data });
-};

src/api/purchase/ticketReturnRelive/index.ts

@@ -1,34 +0,0 @@
-import { http } from "/@/utils/http";
-import { loadEnv } from "@build/index";
-const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL } = loadEnv();
-const userAPi = VITE_PROXY_DOMAIN_REAL;
-const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
-
-//发票回票列表
-export const httpList = (data: object): any => {
-  return http.request("post", `${yewuApi}hpinvreturnlist`, { data });
-};
-
-//发票回票添加
-export const httpAdd = (data: object): any => {
-  return http.request("post", `${yewuApi}hpinvreturn`, { data });
-};
-
-//发票回票审核状态
-export const httpStatus = (data: object): any => {
-  return http.request("post", `${yewuApi}hpinvreturnstatus`, { data });
-};
-
-//发票回票详情
-export const httpInfo = (data: object): any => {
-  return http.request("post", `${yewuApi}hpinfo`, { data });
-};
-
-export const httpDetail = (data: object): any => {
-  return http.request("post", `${yewuApi}hpinvreturninfo`, { data });
-};
-
-//发票回票删除
-export const httpDelete = (data: object): any => {
-  return http.request("post", `${yewuApi}invdel`, { data });
-};

src/components/PageContent/src/page-content.tsx

@@ -275,7 +275,7 @@ const PageContent = defineComponent({
 
     function renderPureTable(size, checkList) {
       const { contentConfig } = props;
-      const { treeProps, rowKey, isTree,maxHeight } = contentConfig;
+      const { treeProps, rowKey, isTree,maxHeight,spanMethod } = contentConfig;
 
       return (
         <PureTable
@@ -292,6 +292,7 @@ const PageContent = defineComponent({
           treeProps={treeProps}
           data={dataList.value}
           checkList={checkList}
+          spanMethod={spanMethod ?  (data) => spanMethod(data, dataList.value) : undefined}
           maxHeight={ maxHeight ? maxHeight : '660px'}
           paginationSmall={
             size === "small" ? true : false

src/components/PageContent/src/types.ts

@@ -1,3 +1,4 @@
+import { TableColumnCtx } from "element-plus";
 import { PropType, ExtractPropTypes } from "vue";
 import PageContent from "./page-content";
 
@@ -49,6 +50,15 @@ export interface ContentConfig {
   showDelete?: (row: Record<string, string>) => boolean;
   showExpand?: (row: Record<string, string>) => boolean;
   showPayTagFn?: (row: Record<string, string>, permissions: any[]) => boolean;
+  spanMethod?:(data: {
+    row: any;
+    rowIndex: number;
+    column: TableColumnCtx<any>;
+    columnIndex: number;
+  }, tableData:any) => number[] | {
+    rowspan: number;
+    colspan: number;
+  }
 
   showReturnTagFn?: (
     row: Record<string, string>,

src/views/reportCollection/backBidCount/components/all.vue

@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import { shallowRef, ref } from "vue"
+import searchConfig from './config/search.config';
+import contentConfig from './config/content.config';
+
+import { PageContentInstance } from "/@/components/PageContent";
+import { usePageSearch, type PageHooks } from "/@/hooks/page";
+
+
+const pageContentRef = ref<PageContentInstance | null>(null)
+
+const hooks: PageHooks = {
+  pageSearchHook:() => usePageSearch(undefined, undefined, searchConfig)
+}
+</script>
+
+<template>
+  <PageContainer
+    :hooks="hooks"
+    :getContentRef="ref => pageContentRef = ref"
+    :content-config="contentConfig"
+    :search-config="searchConfig"
+   />
+</template>

src/views/reportCollection/backBidCount/components/business.vue

@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { shallowRef, ref } from "vue"
+import { ElMessage } from "element-plus"
+
+import sourceSearchConfig from './config/search.config'
+import sourceContentConfig from './config/content.config';
+
+import { usePageSearch, type PageHooks } from "/@/hooks/page";
+import { PageContentInstance } from "/@/components/PageContent";
+
+import { useBusinessSearch, useBusinessContent } from "./../../_hooks";
+import { createHttpRequset } from "./../../_http/createRequset";
+
+const lockKey = "relaComNo"
+const loading = shallowRef(false);
+const pageContentRef = ref<PageContentInstance | null>(null)
+
+const { searchConfig } = useBusinessSearch({ sourceConfig: sourceSearchConfig })
+
+const { contentConfig } = useBusinessContent({
+  sourceConfig: sourceContentConfig,
+  apis: { httpList: createHttpRequset("r_reportzixuntotal") },
+  insertBusinessField: {index: 1 }
+})
+
+const hooks: PageHooks = { pageSearchHook:() => usePageSearch(undefined, undefined, searchConfig, false , lockKey) }
+</script>
+
+<template>
+  <PageContainer
+    :hooks="hooks"
+    :getContentRef="ref => pageContentRef = ref"
+    :content-config="contentConfig"
+    :search-config="searchConfig"
+    lockKey="relaComNo"
+  />
+</template>

src/views/reportCollection/backBidCount/components/config/content.config.ts

@@ -0,0 +1,95 @@
+import { ContentConfig , BeforeRequestType} from "/@/components/PageContent";
+import { createHttpRequset } from "../../../_http/createRequset";
+import { ElMessage } from "element-plus";
+import { isBeyondTime } from "../../../_utils";
+
+const columns = [
+  {
+    prop: 'addtime',
+    label: '竞价时间',
+    minWidth: '155px'
+  },
+  {
+    prop: 'name',
+    label: '业务部门',
+    minWidth: '155px'
+  },
+  {
+    prop: 'total',
+    label: '竞价数量',
+    minWidth: '155px'
+  }
+]
+
+
+    //获取要合并的行数
+function getSpanNumber(data, prop) {
+    //data要处理的数组，prop要合并的属性，比如name
+    //数组的长度，有时候后台可能返回个null而不是[]
+    let length = Array.isArray(data) ? data.length : 0;
+    if (length > 0) {
+      //用于标识位置
+      let position = 0;
+      //用于对比的数据
+      let temp = data[0][prop];
+      //要返回的结果
+      let result = [1];
+      //假设数据是AABCC，我们的目标就是返回20120
+      for (let i = 1; i < length; i++) {
+        if (data[i][prop] == temp) {
+          //标识位置的数据加一
+          result[position] += 1;
+          //当前位置添0
+          result[i] = 0;
+        } else {
+          //不相同时，修改标识位置，该位置设为1，修改对比值
+          position = i;
+          result[i] = 1;
+          temp = data[i][prop];
+        }
+      }
+      //返回结果
+      return result;
+    } else {
+      return [0];
+    }
+}
+    
+const contentConfig: ContentConfig = {
+  columns,
+  root:true,
+  notPagination: true,
+  superUserNoAction: false,
+  notNeedCompanyFilter: true,
+  spanMethod({ rowIndex, columnIndex }, tableData) { 
+    if (columnIndex == 0) {
+      //合并相同的名字
+      let nameSpan = getSpanNumber(tableData, "addtime");
+      return {
+        rowspan: nameSpan[rowIndex],
+        colspan: 1,
+      };
+    }
+  },
+  beforeRequestList(params: Record<string, string>) {
+    const { start_date, end_date } = params
+    if (!start_date || !end_date) { 
+      ElMessage.warning("请选择一个时间区间 ")
+      return BeforeRequestType.EMPTY
+    }
+
+    const beyondTime = isBeyondTime({
+      message:"时间区间不能超过 30 天",
+      start: start_date,
+      end: end_date,
+      len:30
+    })
+
+    return beyondTime ? BeforeRequestType.EMPTY : BeforeRequestType.NEXT;
+  },
+  apis: {
+    httpList: createHttpRequset("reportzixuntotal")
+  }
+};
+
+export default contentConfig;

src/views/reportCollection/backBidCount/components/config/search.config.ts

@@ -0,0 +1,28 @@
+import { FormConfig } from "/@/components/PageSearch";
+import dayjs from "dayjs"
+
+
+const current = dayjs(new Date()) 
+const end = current.format("YYYY-MM-DD");
+const start = current.subtract(29, 'days').format('YYYY-MM-DD')
+
+const searchFormConfig: FormConfig = {
+  formItems: [
+    {
+      field: "date",
+      type: "date_picker",
+      trigger: "change",
+      defaultValue: [start, end],
+      otherOptions: {
+        type:'daterange',
+        startPlaceholder: "发起开始时间",
+        endPlaceholder: "发起结束时间",
+        valueFormat: "YYYY-MM-DD",
+        startProp: "start_date",
+        endProp: "end_date",
+      }
+    }
+  ]
+};
+
+export default searchFormConfig;

src/views/reportCollection/backBidCount/index.vue

@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import { shallowRef } from "vue";
+import All from "./components/all.vue"
+import Business from "./components/business.vue"
+const actived = shallowRef("1");
+</script>
+
+
+<template>
+  <div class="report-container">
+    <el-tabs v-model="actived" style="color:#fff">
+      <el-tab-pane label="查看全部" name="1">
+        <all v-if="actived === '1'" />
+      </el-tab-pane>
+
+      <el-tab-pane label="查看业务公司" name="2">
+        <business v-if="actived === '2'" />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+
+<style scoped lang="scss">
+.report-container {
+  height: calc(100vh - 48px);
+  :deep(.el-tabs__header){
+    background-color: #fff;
+    padding: 10px;
+    padding-bottom: 0px;
+  }
+}
+</style>

src/views/reportCollection/backPurchase/components/all.vue

@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import { shallowRef, ref } from "vue"
+import searchConfig from './config/search.config';
+import contentConfig from './config/content.config';
+
+import { PageContentInstance } from "/@/components/PageContent";
+import { usePageSearch, type PageHooks } from "/@/hooks/page";
+
+
+const pageContentRef = ref<PageContentInstance | null>(null)
+
+const hooks: PageHooks = {
+  pageSearchHook:() => usePageSearch(undefined, undefined, searchConfig)
+}
+</script>
+
+<template>
+  <PageContainer
+    :hooks="hooks"
+    :getContentRef="ref => pageContentRef = ref"
+    :content-config="contentConfig"
+    :search-config="searchConfig"
+   />
+</template>

src/views/reportCollection/backPurchase/components/business.vue

@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { shallowRef, ref } from "vue"
+import { ElMessage } from "element-plus"
+
+import sourceSearchConfig from './config/search.config'
+import sourceContentConfig from './config/content.config';
+
+import { usePageSearch, type PageHooks } from "/@/hooks/page";
+import { PageContentInstance } from "/@/components/PageContent";
+
+import { useBusinessSearch, useBusinessContent } from "./../../_hooks";
+import { createHttpRequset } from "./../../_http/createRequset";
+
+const lockKey = "relaComNo"
+const loading = shallowRef(false);
+const pageContentRef = ref<PageContentInstance | null>(null)
+
+const { searchConfig } = useBusinessSearch({ sourceConfig: sourceSearchConfig })
+
+const { contentConfig } = useBusinessContent({
+  sourceConfig: sourceContentConfig,
+  apis: { httpList: createHttpRequset("r_reportzixuntotal") },
+  insertBusinessField: {index: 1 }
+})
+
+const hooks: PageHooks = { pageSearchHook:() => usePageSearch(undefined, undefined, searchConfig, false , lockKey) }
+</script>
+
+<template>
+  <PageContainer
+    :hooks="hooks"
+    :getContentRef="ref => pageContentRef = ref"
+    :content-config="contentConfig"
+    :search-config="searchConfig"
+    lockKey="relaComNo"
+  />
+</template>

src/views/reportCollection/backPurchase/components/config/content.config.ts

@@ -0,0 +1,95 @@
+import { ContentConfig , BeforeRequestType} from "/@/components/PageContent";
+import { createHttpRequset } from "../../../_http/createRequset";
+import { ElMessage } from "element-plus";
+import { isBeyondTime } from "../../../_utils";
+
+const columns = [
+  {
+    prop: 'addtime',
+    label: '竞价时间',
+    minWidth: '155px'
+  },
+  {
+    prop: 'name',
+    label: '业务部门',
+    minWidth: '155px'
+  },
+  {
+    prop: 'total',
+    label: '竞价数量',
+    minWidth: '155px'
+  }
+]
+
+
+    //获取要合并的行数
+function getSpanNumber(data, prop) {
+    //data要处理的数组，prop要合并的属性，比如name
+    //数组的长度，有时候后台可能返回个null而不是[]
+    let length = Array.isArray(data) ? data.length : 0;
+    if (length > 0) {
+      //用于标识位置
+      let position = 0;
+      //用于对比的数据
+      let temp = data[0][prop];
+      //要返回的结果
+      let result = [1];
+      //假设数据是AABCC，我们的目标就是返回20120
+      for (let i = 1; i < length; i++) {
+        if (data[i][prop] == temp) {
+          //标识位置的数据加一
+          result[position] += 1;
+          //当前位置添0
+          result[i] = 0;
+        } else {
+          //不相同时，修改标识位置，该位置设为1，修改对比值
+          position = i;
+          result[i] = 1;
+          temp = data[i][prop];
+        }
+      }
+      //返回结果
+      return result;
+    } else {
+      return [0];
+    }
+}
+    
+const contentConfig: ContentConfig = {
+  columns,
+  root:true,
+  notPagination: true,
+  superUserNoAction: false,
+  notNeedCompanyFilter: true,
+  spanMethod({ rowIndex, columnIndex }, tableData) { 
+    if (columnIndex == 0) {
+      //合并相同的名字
+      let nameSpan = getSpanNumber(tableData, "addtime");
+      return {
+        rowspan: nameSpan[rowIndex],
+        colspan: 1,
+      };
+    }
+  },
+  beforeRequestList(params: Record<string, string>) {
+    const { start_date, end_date } = params
+    if (!start_date || !end_date) { 
+      ElMessage.warning("请选择一个时间区间 ")
+      return BeforeRequestType.EMPTY
+    }
+
+    const beyondTime = isBeyondTime({
+      message:"时间区间不能超过 30 天",
+      start: start_date,
+      end: end_date,
+      len:30
+    })
+
+    return beyondTime ? BeforeRequestType.EMPTY : BeforeRequestType.NEXT;
+  },
+  apis: {
+    httpList: createHttpRequset("reportzixuntotal")
+  }
+};
+
+export default contentConfig;

src/views/reportCollection/backPurchase/components/config/search.config.ts

@@ -0,0 +1,28 @@
+import { FormConfig } from "/@/components/PageSearch";
+import dayjs from "dayjs"
+
+
+const current = dayjs(new Date()) 
+const end = current.format("YYYY-MM-DD");
+const start = current.subtract(29, 'days').format('YYYY-MM-DD')
+
+const searchFormConfig: FormConfig = {
+  formItems: [
+    {
+      field: "date",
+      type: "date_picker",
+      trigger: "change",
+      defaultValue: [start, end],
+      otherOptions: {
+        type:'daterange',
+        startPlaceholder: "发起开始时间",
+        endPlaceholder: "发起结束时间",
+        valueFormat: "YYYY-MM-DD",
+        startProp: "start_date",
+        endProp: "end_date",
+      }
+    }
+  ]
+};
+
+export default searchFormConfig;

src/views/reportCollection/backPurchase/index.vue

@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import { shallowRef } from "vue";
+import All from "./components/all.vue"
+import Business from "./components/business.vue"
+const actived = shallowRef("1");
+</script>
+
+
+<template>
+  <div class="report-container">
+    <el-tabs v-model="actived" style="color:#fff">
+      <el-tab-pane label="查看全部" name="1">
+        <all v-if="actived === '1'" />
+      </el-tab-pane>
+
+      <el-tab-pane label="查看业务公司" name="2">
+        <business v-if="actived === '2'" />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+
+<style scoped lang="scss">
+.report-container {
+  height: calc(100vh - 48px);
+  :deep(.el-tabs__header){
+    background-color: #fff;
+    padding: 10px;
+    padding-bottom: 0px;
+  }
+}
+</style>

src/views/reportCollection/frontSupplierHead/components/config/search.config.ts

@@ -1,11 +1,9 @@
 import { FormConfig } from "/@/components/PageSearch";
 import dayjs from "dayjs"
 
-
 const current = dayjs(new Date()) 
 const end = current.format("YYYY-MM-DD");
 const start = current.subtract(29, 'days').format('YYYY-MM-DD')
-
 const searchFormConfig: FormConfig = {
   formItems: [
     {