Ver código fonte

修改车队对账 导出excel 接口

阿伏兔 4 anos atrás
pai
commit
22a1be9bee
2 arquivos alterados com 36 adições e 7 exclusões
  1. 17 3
      src/api/finance/contrast.js
  2. 19 4
      src/views/finance/contrast/index.vue

+ 17 - 3
src/api/finance/contrast.js

@@ -16,7 +16,21 @@ export function listFleet(query) {
     params: query
   })
 }
-
+// 车队导出excel
+export function contrastExport(query) {
+  return request({
+    url: '/finances/contrast/export',
+    method: 'get',
+    params: query
+  })
+}
+// 车队导出明细excel
+export function exporItems(fId) {
+  return request({
+    url: '/finances/contrast/exportItems/'+fId,
+    method: 'get'
+  })
+}
 // 查询财务数据主详细
 export function getFee(fId) {
   return request({
@@ -145,7 +159,7 @@ export function exportWarehousebillsitems(fId) {
   })
 }
 
-//车队导入搜索 
+//车队导入搜索
 export function importFleet(params) {
   return request({
     url: '/finances/contrast/contrastList',
@@ -169,4 +183,4 @@ export function listCorps(query) {
     method: 'get',
     params: query
   })
-}
+}

+ 19 - 4
src/views/finance/contrast/index.vue

@@ -1690,7 +1690,6 @@ import {
   updateFee,
   exportFee,
   importFee,
-  exportWarehousebillsitems,
   importFleet,
   addFleet,
   listFleet,
@@ -1699,6 +1698,9 @@ import {
   detailFleet,
   confirmFleet,
   listCorps,
+  exporItems,
+  contrastExport,
+  exportWarehousebillsitems
 } from "@/api/finance/contrast";
 // import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
@@ -3258,7 +3260,12 @@ export default {
     },
     //导出
     handleExportItems() {
-      const fIds = this.queryParams.fId;
+      let fIds = 0;
+      if (Cookies.get("sysType") == 2) {
+        fIds = this.queryParams.id;
+      } else {
+        fIds = this.queryParams.fId;
+      }
       if (fIds !== null) {
         this.$confirm("是否确认导出所有计费物资明细数据?", "警告", {
           confirmButtonText: "确定",
@@ -3266,7 +3273,11 @@ export default {
           type: "warning",
         })
           .then(function () {
-            return exportWarehousebillsitems(fIds);
+            if (Cookies.get("sysType") == 2) {
+              return exporItems(fIds);
+            } else {
+              return exportWarehousebillsitems(fIds);
+            }
           })
           .then((response) => {
             this.download(response.msg);
@@ -4658,7 +4669,11 @@ export default {
         type: "warning",
       })
         .then(function () {
-          return exportFee(queryParams);
+          if (Cookies.get("sysType") == 2) {
+            return contrastExport(queryParams);
+          } else {
+            return exportFee(queryParams);
+          }
         })
         .then((response) => {
           this.download(response.msg);