diff --git a/public/config.json b/public/config.json index dc76ca6..7ca6b5f 100644 --- a/public/config.json +++ b/public/config.json @@ -1,6 +1,6 @@ { - "UDI_SYNC_SERVER_IP": "http://127.0.0.1:9995/", - "BASE_URL":"http://127.0.0.1:9991/", - "SERVER_IP": "http://127.0.0.1:9991/", - "WEBSOCKET_URL": "ws://127.0.0.1:9991/UDI_WMS_MC/api/websocket/" + "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", + "BASE_URL":"http://192.168.0.109:9991/", + "SERVER_IP": "http://192.168.0.109:9991/", + "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/" } diff --git a/src/views/basic/CorpExport.vue b/src/views/basic/CorpExport.vue index 15f182d..d370ed5 100644 --- a/src/views/basic/CorpExport.vue +++ b/src/views/basic/CorpExport.vue @@ -98,6 +98,7 @@ import {filterLog, deleteLog} from "../../api/basic/corpExport"; import corpSelect from "./CorpSelect"; import axios from "axios"; + import {formatDate} from "@/utils/date"; export default { data() { return { @@ -182,15 +183,13 @@ "?genKey=" + row.genKey; console.log("href = " + href); let a = document.createElement("a"); + var timestamp = formatDate(new Date(), "yyyyMMddhhmmss") fetch(href) .then((res) => res.blob()) .then((blob) => { a.href = URL.createObjectURL(blob); console.log(a.href); - a.download = - row.filePath.split("/")[ - row.filePath.split("/").length - 1 - ]; // // 下载文件的名字 + a.download = "BaseCorp_" + timestamp + ".UpperIn"; document.body.appendChild(a); a.click(); this.getList(); diff --git a/src/views/basic/UdiinfoExport.vue b/src/views/basic/UdiinfoExport.vue index 4548b87..2a081b6 100644 --- a/src/views/basic/UdiinfoExport.vue +++ b/src/views/basic/UdiinfoExport.vue @@ -96,200 +96,199 @@ diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 2205be2..11b11ab 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -937,8 +937,8 @@ export default { ); this.loading = false; const eleLink = document.createElement('a'); - var timestamp = formatDate(new Date(), "yyyy-MM-dd_hh:mm") - eleLink.download = "仓库信息导出" + timestamp + ".udi"; + var timestamp = formatDate(new Date(), "yyyyMMddhhmmss") + eleLink.download = "BaseWarehouse_" + timestamp + ".UpperIn"; eleLink.style.display = 'none'; eleLink.href = url; document.body.appendChild(eleLink) diff --git a/src/views/thrsys/ThrCorpsExport.vue b/src/views/thrsys/ThrCorpsExport.vue index c316ceb..f48ce2b 100644 --- a/src/views/thrsys/ThrCorpsExport.vue +++ b/src/views/thrsys/ThrCorpsExport.vue @@ -1,293 +1,292 @@ diff --git a/src/views/thrsys/ThrOrderExport.vue b/src/views/thrsys/ThrOrderExport.vue index 112b618..1209f02 100644 --- a/src/views/thrsys/ThrOrderExport.vue +++ b/src/views/thrsys/ThrOrderExport.vue @@ -98,6 +98,7 @@ import {filterLog, deleteLog} from "../../api/thrsys/thrOrderExport"; import thrOrderSelect from "./ThrOrderSelect"; import axios from "axios"; + import {formatDate} from "@/utils/date"; export default { data() { @@ -185,15 +186,13 @@ let baseUrl = res.data.BASE_URL; let href = baseUrl + "/udiwms/thrOrder/exportLog/download" + "?genKey=" + row.genKey; let a = document.createElement("a"); + var timestamp = formatDate(new Date(), "yyyyMMddhhmmss") fetch(href) .then((res) => res.blob()) .then((blob) => { a.href = URL.createObjectURL(blob); console.log(a.href); - a.download = - row.filePath.split("/")[ - row.filePath.split("/").length - 1 - ]; // // 下载文件的名字 + a.download = "ThirdOrder_" + timestamp + ".UpperIn"; document.body.appendChild(a); a.click(); this.getList(); diff --git a/src/views/thrsys/ThrProductsExport.vue b/src/views/thrsys/ThrProductsExport.vue index 5c5ca78..69ea73b 100644 --- a/src/views/thrsys/ThrProductsExport.vue +++ b/src/views/thrsys/ThrProductsExport.vue @@ -98,6 +98,7 @@ import {filterLog, deleteLog} from "../../api/thrsys/thrProductsExport.js"; import thrProductsSelect from "./ThrProductsSelect"; import axios from "axios"; + import {formatDate} from "@/utils/date"; export default { data() { return { @@ -182,15 +183,13 @@ let baseUrl = res.data.BASE_URL; let href = baseUrl + "/udiwms/thrProducts/exportLog/download" + "?genKey=" + row.genKey; let a = document.createElement("a"); + var timestamp = formatDate(new Date(), "yyyyMMddhhmmss") fetch(href) .then((res) => res.blob()) .then((blob) => { a.href = URL.createObjectURL(blob); console.log(a.href); - a.download = - row.filePath.split("/")[ - row.filePath.split("/").length - 1 - ]; + a.download = "ThirdProduct_" + timestamp + ".UpperIn"; document.body.appendChild(a); a.click(); this.getList();