修改bug

src/api/kaihe-reportManagement/generalLedgerCr.js

@@ -7,9 +7,10 @@ export function getList(query) {
   })
 }
 
-export function getExcel() {
+export function getExcel(query) {
   return request({
     url: '/shipping/handle/export',
-    method:'get'
+    method:'get',
+    params: query
   })
 }

src/api/kaihe-reportManagement/generalLedgerDr.js

@@ -7,9 +7,10 @@ export function getList(query) {
   })
 }
 
-export function getExcel() {
+export function getExcel(query) {
   return request({
     url: '/shipping/receivable/export',
-    method:'get'
+    method:'get',
+    params: query
   })
 }

src/api/kaihe-reportManagement/profitGeneralLedger.js

@@ -7,9 +7,10 @@ export function getList(query) {
   })
 }
 
-export function getExcel() {
+export function getExcel(query) {
   return request({
     url: '/shipping/profit/export',
-    method:'get'
+    method:'get',
+    params: query
   })
 }

src/views/kaihe/domesticTrade/myOrder/index.vue

@@ -507,7 +507,7 @@ import {
   exportInventory,
   cancelAllocation,
   confirmAllocation,
-  exportItem
+  exportItem,
 } from "@/api/kaihe/domesticTrade/myOrder";
 import Cookies from "js-cookie";
 import { addSet, resetModule, select } from "@/api/system/set";
@@ -598,14 +598,7 @@ export default {
         {
           surface: "2",
           label: "fServiceitems",
-          name: "起运港运输条款",
-          checked: 0,
-          width: 140,
-        },
-        {
-          surface: "3",
-          label: "fDestportMode",
-          name: "目的港运输条款",
+          name: "运输条款",
           checked: 0,
           width: 140,
         },
@@ -970,6 +963,11 @@ export default {
     /** 查询客户详情列表 */
     getList() {
       listCorps(this.queryParams).then((response) => {
+        if (response.rows) {
+          response.rows.forEach((e) => {
+            e.fServiceitems = e.fServiceitems + "-" + e.fDestportMode;
+          });
+        }
         this.corpsList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1036,6 +1034,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      // exportInventory(this.queryParams).then((response) => {
+      //   this.download(response.msg);
+      // });
       const queryParams = this.queryParams;
       this.$confirm("是否选择船名航次?", "警告", {
         confirmButtonText: "确定",
@@ -1049,19 +1050,22 @@ export default {
           this.download(response.msg);
         });
     },
-    handleExportItem(){
-      const queryParams = this.queryParams;
-      this.$confirm("是否选择船名航次?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return exportItem(queryParams);
-        })
-        .then((response) => {
-          this.download(response.msg);
-        });
+    handleExportItem() {
+           exportItem(this.queryParams).then((response) => {
+        this.download(response.msg);
+      });
+      // const queryParams = this.queryParams;
+      // this.$confirm("是否选择船名航次?", "警告", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   type: "warning",
+      // })
+      //   .then(function () {
+      //     return exportItem(queryParams);
+      //   })
+      //   .then((response) => {
+      //     this.download(response.msg);
+      //   });
     },
     /** 搜索按钮操作 */
     handleQuery() {

src/views/reportManagement/kaihe-generalLedgerCr/index.vue

@@ -362,13 +362,14 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      let that=this
       this.$confirm("是否确认导出所有应付总账主数据项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(function () {
-          return getExcel();
+          return getExcel(that.form);
         })
         .then((response) => {
           this.download(response.msg);

src/views/reportManagement/kaihe-generalLedgerDr/index.vue

@@ -235,7 +235,7 @@
           </span>
           <span v-if="item.label == 'blNo'">
             <el-link :underline="false" type="primary"
-              ><div @click="handleUpdate(scope.row,1)">
+              ><div @click="handleUpdate(scope.row, 1)">
                 {{ scope.row.blNo }}
               </div></el-link
             >
@@ -351,9 +351,9 @@ export default {
     handleUpdate(row, num) {
       let res = {};
       res = {
-        fMblno:row.blNo,
+        fMblno: row.blNo,
         num: num,
-        type:'D'
+        type: "D",
       };
       this.$router.push({
         path: "/domesticTrade/orderInformation",
@@ -362,13 +362,14 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      let that=this
       this.$confirm("是否确认导出所有应收总账主数据项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(function () {
-          return getExcel();
+          return getExcel(that.form);
         })
         .then((response) => {
           this.download(response.msg);

src/views/reportManagement/kaihe-profitGeneralLedger/index.vue

@@ -270,13 +270,14 @@ export default {
   methods: {
     /** 导出按钮操作 */
     handleExport() {
+       let that=this
       this.$confirm("是否确认导出所有利润总账主数据项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(function () {
-          return getExcel();
+          return getExcel(that.form);
         })
         .then((response) => {
           this.download(response.msg);