diff --git a/src/api/inout/order.js b/src/api/inout/order.js index 4751eb2..0bfda0d 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -33,7 +33,6 @@ export function codeList(query) { } - export function findAllByOrderId(query) { return axios({ url: "/admin/warehouse/inout/findAllByOrderId", @@ -117,7 +116,6 @@ export function uploadOrder(query) { } - export function orderDetail(query) { return axios( { @@ -129,7 +127,6 @@ export function orderDetail(query) { } - export function orderGetUdi(query) { return axios({ url: "/udiwms/inout/order/getUdi", @@ -163,7 +160,6 @@ export function orderListError(query) { } - export function addOrderWeb(query) { return axios({ url: "/warehouse/inout/addOrderWeb", @@ -181,8 +177,6 @@ export function postOrdersWeb(query) { } - - export function selectNew(query) { return axios({ url: "/admin/warehouse/inout/order/selectNew", @@ -206,6 +200,7 @@ export function selectStatus(query) { params: query }); } + export function selectDownload(query) { return axios({ url: "/sale/inout/order/selectDownload", @@ -231,9 +226,6 @@ export function selectSubOrders(query) { } - - - export function backStock(query) { return axios( { @@ -254,6 +246,7 @@ export function moveStock(query) { } ) } + export function updateBind(query) { return axios( { @@ -264,3 +257,55 @@ export function updateBind(query) { ) } +export function revokeOredr(query) { + return axios({ + url: "/spms/inout/order/revoke", + method: "get", + params: query + }); +} + +export function exportJson(query) { + return axios({ + url: "/warehouse/inout/order/exportXml", + method: "post", + data: query, + headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, + responseType: 'arraybuffer', //一定要设置响应类型,否则页面会是空白pdf + }); +} + + +export function saveOrderWeb(query) { + return axios({ + url: "/warehouse/inout/saveOrderWeb", + method: "post", + data: query + }); +} + + +export function addCommitOrder(query) { + return axios({ + url: "/warehouse/inout/addCommit", + method: "post", + data: query + }); +} + + +export function updateBindSup(query) { + return axios( + { + url: "/udiwms/erpOrder/updateBindSup", + method: "post", + data: query + } + ) +} + + + + + + diff --git a/src/views/inout/DialogSelectErpOrder.vue b/src/views/inout/DialogSelectErpOrder.vue index d506dea..de9cca7 100644 --- a/src/views/inout/DialogSelectErpOrder.vue +++ b/src/views/inout/DialogSelectErpOrder.vue @@ -258,7 +258,7 @@ export default { }, getList() { this.loading = true; - stockListDetail(this.filterQuery) + getCloudErp(this.filterQuery) .then((response) => { this.loading = false; if (response.code == 20000) { diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue index 48e5645..8375338 100644 --- a/src/views/inout/IOCheckErrorOrder.vue +++ b/src/views/inout/IOCheckErrorOrder.vue @@ -942,54 +942,6 @@ export default { } }, - exportDialog(value) { - var mOrder = value; - if (mOrder.exportStatus === "已上传") { - this.$confirm("该订单已修改, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } else if (mOrder.contrastStatus === 0) { - this.$confirm("该订单校验异常, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } else if (mOrder.contrastStatus === null) { - this.$confirm("该订单未校验, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } else { - this.$confirm("是否确定修改ERP订单?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } - }, getActionName(action) { for (let i = 0; i < this.busTypes.length; i++) { if (this.busTypes[i].action === action) { diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue index f4242c4..0b33cc8 100644 --- a/src/views/inout/IOCheckWaitOrder.vue +++ b/src/views/inout/IOCheckWaitOrder.vue @@ -409,7 +409,7 @@ import { } from "../../api/itextpdf/itextpdf"; import draggable from "vuedraggable"; import {saveAs} from "file-saver"; -import codeDetail from "./IONewCode"; +import codeDetail from "./IOFinishCode"; import store from "../../store"; import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf"; import selectErpOrder from "./DialogSelectErpOrder"; @@ -805,56 +805,6 @@ export default { } }, - exportDialog(value) { - var mOrder = value; - if (mOrder.exportStatus === "已上传") { - this.$confirm("该订单已修改, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } else if (mOrder.contrastStatus === 0) { - this.$confirm("该订单校验异常, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } else if (mOrder.contrastStatus === null) { - this.$confirm("该订单未校验, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } else { - this.$confirm("是否确定修改ERP订单?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } - }, - - uploadOrderDialog(value) { console.log(value.id + "---" + value.orderid); this.uploadQuery = { diff --git a/src/views/inventory/invUdiTraceOrder.vue b/src/views/inventory/invUdiTraceOrder.vue index 08c55ac..6ad1053 100644 --- a/src/views/inventory/invUdiTraceOrder.vue +++ b/src/views/inventory/invUdiTraceOrder.vue @@ -615,55 +615,6 @@ export default { } }, - exportDialog(value) { - var mOrder = value; - if (mOrder.exportStatus === "已上传") { - this.$confirm("该订单已修改, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } else if (mOrder.contrastStatus === 0) { - this.$confirm("该订单校验异常, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } else if (mOrder.contrastStatus === null) { - this.$confirm("该订单未校验, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } else { - this.$confirm("是否确定修改ERP订单?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.uploadOrderDialog(mOrder); - }) - .catch(() => { - }); - } - }, - exportXml(poistion) { this.loading = true; var mOrder = this.list[poistion];