Browse Source

添加完善改动仓储导出接口

nzf 3 years ago
parent
commit
7d8713fcd6

+ 7 - 0
src/api/kaihe/basicdata/container.js

@@ -63,6 +63,13 @@ export function exportCorps(query) {
     params: query
   })
 }
+export function exportCorpsNew(query) {
+  return request({
+    url: '/shipping/cntr/export',
+    method: 'get',
+    params: query
+  })
+}
 
 //查询港口名称
 export function getyard(query) {

+ 8 - 0
src/api/warehouseBusiness/shipping.js

@@ -70,3 +70,11 @@ export function shippingCompany() {
         }
     })
 }
+// 导出海运报价
+export function exportSeaprice(data) {
+  return request({
+    url: '/warehouse/seaprice/export',
+    method: 'get',
+    params: data
+  })
+}

+ 8 - 0
src/api/warehouseBusiness/warehouseInStock.js

@@ -215,3 +215,11 @@ export function getCrawler(data) {
     method: 'get',
   })
 }
+
+// 下载模板
+export function downloadTemplate(data){
+  return request({
+    url: '/warehouseBusiness/inStock/longRageDownloadTemplate',
+    method: 'get',
+  })
+}

+ 10 - 1
src/views/Warehousing/cargoClearance/index.vue

@@ -996,7 +996,16 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.$message.warning('功能开发中')
+      this.$confirm('是否确认导出所有货物通关数据项?', '警告', {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        exportStockTransfer(this.queryParams).then(res => {
+          this.download(res.msg);
+        })
+      })
+      //this.$message.warning('功能开发中')
       // require.ensure([], () => {
       //   const { export_json_to_excel } = require("../../../excel/Export2Excel");
       //   const tHeader = ["客户名称", "制单日期"];

+ 13 - 3
src/views/Warehousing/goodsTransfer/index.vue

@@ -488,8 +488,8 @@ import {
   warehouseSubmission,
   delGoodsTransfer,
   delgoodsTransfer_s,
-  exportgoodsTransfer,
-} from "@/api/warehouseBusiness/goodsTransfer";
+  exportgoodsTransfer, exportGoodsTransfer
+} from '@/api/warehouseBusiness/goodsTransfer'
 import { listCorps } from "@/api/basicdata/corps";
 import { listWarehousesss } from "@/api/basicdata/warehouse";
 import { listGoods } from "@/api/basicdata/goods";
@@ -498,6 +498,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Cookies from "js-cookie";
 import { addSet, select, resetModule } from "@/api/system/set";
 import draggable from "vuedraggable";
+import { exportWarehousebills } from '@/api/warehouseBusiness/warehouseInAndOutStock'
 export default {
   name: "plans",
   data() {
@@ -1017,7 +1018,16 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.$message.warning('功能开发中')
+      this.$confirm('是否确认导出所有转货数据项?', '警告', {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        exportGoodsTransfer(this.queryParams).then(res => {
+          this.download(res.msg);
+        })
+      })
+      // this.$message.warning('功能开发中')
       // require.ensure([], () => {
       //   const { export_json_to_excel } = require("../../../excel/Export2Excel");
       //   const tHeader = ["客户名称", "制单日期"];

+ 10 - 1
src/views/Warehousing/inAndOutStock/index.vue

@@ -967,7 +967,16 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.$message.warning('功能开发中')
+      this.$confirm('是否确认导出所有场地直装数据项?', '警告', {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        exportWarehousebills(this.queryParams).then(res => {
+          this.download(res.msg);
+        })
+      })
+      // this.$message.warning('功能开发中')
       // require.ensure([], () => {
       //   const { export_json_to_excel } = require("../../../excel/Export2Excel");
       //   const tHeader = ["客户名称", "制单日期"];

+ 6 - 3
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -6310,8 +6310,8 @@ import {
   checkCode,
   queryClerkRoleList,
   pleaseCheck,
-  feesCheck
-} from "@/api/warehouseBusiness/warehouseInStock";
+  feesCheck, downloadTemplate
+} from '@/api/warehouseBusiness/warehouseInStock'
 import {operationAgreement} from "@/api/agreement/agreement";
 import {listCorps, getCorps} from "@/api/basicdata/corps";
 import {listFees, getFees} from "@/api/basicdata/fees";
@@ -9354,7 +9354,10 @@ export default {
       this.detailList.push(...rows);
     },
     downloadExcel() {
-      window.location.href = "http://121.36.212.131:8080/file/入库模板.xlsx";
+      downloadTemplate().then(res => {
+        this.download(res.msg);
+      });
+      //window.location.href = "http://121.36.212.131:8080/file/入库模板.xlsx";
     },
     // 付款信息请核
     checkRow(index, rows) {

+ 3 - 0
src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -4750,6 +4750,9 @@ export default {
         if (data.code === 200) {
           this.browseStatus = false;
           this.msgSuccess("撤销成功");
+          if (status) {
+            this.$set(this.form, "warehouseStatus", 2);
+          }
         }
       });
     },

+ 13 - 3
src/views/Warehousing/stockTransfer/index.vue

@@ -494,8 +494,8 @@ import {
   updateStockTransfer,
   exportStockTransfer,
   delstockTransfer_s,
-  serialNumber,
-} from "@/api/warehouseBusiness/stockTransfer";
+  serialNumber, exportStockTransferNew
+} from '@/api/warehouseBusiness/stockTransfer'
 import { listCorps } from "@/api/basicdata/corps";
 import { listWarehousesss } from "@/api/basicdata/warehouse";
 import { listGoods } from "@/api/basicdata/goods";
@@ -504,6 +504,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Cookies from "js-cookie";
 import { addSet, select, resetModule } from "@/api/system/set";
 import draggable from "vuedraggable";
+import { exportWarehousebills } from '@/api/warehouseBusiness/warehouseInStock'
 export default {
   name: "plans",
   data() {
@@ -1038,7 +1039,16 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.$message.warning('功能开发中')
+      this.$confirm('是否确认导出所有调拨数据项?', '警告', {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        exportStockTransfer(this.queryParams).then(res => {
+          this.download(res.msg)
+        });
+      })
+      //this.$message.warning('功能开发中')
       // require.ensure([], () => {
       //   const { export_json_to_excel } = require("../../../excel/Export2Excel");
       //   const tHeader = ["客户名称", "制单日期"];

+ 12 - 2
src/views/kaihe/basicdata/container/index.vue

@@ -477,7 +477,17 @@
 </template>
 
 <script>
-  import { listCorps, getCorps, delCorps, addcontainer, getNo, getName, changeCorpsStatus,exportCorps } from "@/api/kaihe/basicdata/container";
+import {
+  listCorps,
+  getCorps,
+  delCorps,
+  addcontainer,
+  getNo,
+  getName,
+  changeCorpsStatus,
+  exportCorps,
+  exportCorpsNew
+} from '@/api/kaihe/basicdata/container'
   import Vue from 'vue'
   import draggable from "vuedraggable";
   import Cookies from 'js-cookie'
@@ -1019,7 +1029,7 @@
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          return exportCorps(queryParams);
+          return exportCorpsNew(queryParams);
         }).then(response => {
           this.download(response.msg);
         })

+ 11 - 1
src/views/warehouse/Shipping/index.vue

@@ -445,7 +445,7 @@
 
 <script>
 import AddOrUpdate from "./AddOrUpdate.vue";
-import {listCorpsList, query, shippingCompany,listRoute} from "@/api/warehouseBusiness/shipping";
+import { listCorpsList, query, shippingCompany, listRoute, exportSeaprice } from '@/api/warehouseBusiness/shipping'
 import { listCorps } from "@/api/basicdata/corps";
 import { listWarehousesss } from "@/api/basicdata/warehouse";
 import { listGoods } from "@/api/basicdata/goods";
@@ -454,6 +454,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Cookies from "js-cookie";
 import { addSet, select, resetModule } from "@/api/system/set";
 import draggable from "vuedraggable";
+import { exportList } from '@/api/finance/query'
 export default {
   name: "plans",
   data() {
@@ -830,6 +831,15 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      this.$confirm("是否确认导出所有运价数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        return exportSeaprice(this.queryParams)
+      }).then(res => {
+        this.download(res.msg)
+      })
       // require.ensure([], () => {
       //   const { export_json_to_excel } = require("../../../excel/Export2Excel");
       //   const tHeader = ["客户名称", "制单日期"];