From 69e9fb5e3bf5ec1a629060eb3023355786ac77df Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 20 Oct 2023 15:57:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=95=8C=E9=9D=A2=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inventory/invCountCodes.js | 10 +- src/api/inventory/invCountOrder.js | 114 ++++++++---------- src/api/inventory/invCountSetting.js | 25 ++++ .../inventory/{ => count}/InvCountCodes.vue | 0 .../{ => count}/InvCountOrderAudit.vue | 2 +- .../{ => count}/InvCountOrderCompleted.vue | 2 +- .../{ => count}/InvCountOrderModify.vue | 2 +- .../{ => count}/InvCountOrderNew.vue | 2 +- 8 files changed, 87 insertions(+), 70 deletions(-) create mode 100644 src/api/inventory/invCountSetting.js rename src/views/inventory/{ => count}/InvCountCodes.vue (100%) rename src/views/inventory/{ => count}/InvCountOrderAudit.vue (99%) rename src/views/inventory/{ => count}/InvCountOrderCompleted.vue (99%) rename src/views/inventory/{ => count}/InvCountOrderModify.vue (99%) rename src/views/inventory/{ => count}/InvCountOrderNew.vue (99%) diff --git a/src/api/inventory/invCountCodes.js b/src/api/inventory/invCountCodes.js index 880f8ff5..c9138084 100644 --- a/src/api/inventory/invCountCodes.js +++ b/src/api/inventory/invCountCodes.js @@ -1,8 +1,8 @@ -import axios from "../../utils/request"; +import axios from '@/utils/request' export function getCountCodesList(params) { return axios({ - url: "/inv/count/codes/filter", + url: "/invCount/codes/filter", method: "get", params: params }); @@ -10,7 +10,7 @@ export function getCountCodesList(params) { export function deleteCode(data) { return axios({ - url: "/inv/count/codes/deleteCode", + url: "/invCount/codes/deleteCode", method: "post", data: data }); @@ -18,7 +18,7 @@ export function deleteCode(data) { export function addCode(data) { return axios({ - url: "/inv/count/codes/addCode", + url: "/invCount/codes/addCode", method: "post", data: data }); @@ -26,7 +26,7 @@ export function addCode(data) { export function getCodesNum(params) { return axios({ - url: "/inv/count/codes/getCountOrderCodesNum", + url: "/invCount/codes/getCountOrderCodesNum", method: "get", params: params }); diff --git a/src/api/inventory/invCountOrder.js b/src/api/inventory/invCountOrder.js index 86db43dc..2d410bf0 100644 --- a/src/api/inventory/invCountOrder.js +++ b/src/api/inventory/invCountOrder.js @@ -1,91 +1,83 @@ -import axios from "../../utils/request"; +import axios from '@/utils/request' export function getCountOrderList(params) { - return axios({ - url: "/inv/count/order/filter", - method: "get", - params: params - }); + return axios({ + url: "/invCount/order/filter", + method: "get", + params: params + }); } export function deleteCountOrder(data) { - return axios({ - url: "/inv/count/order/delete", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/delete", + method: "post", + data: data + }); } export function getCountOrderDetailList(params) { - return axios({ - url: "/inv/count/order/detail/filter", - method: "get", - params: params - }); + return axios({ + url: "/invCount/order/detail/filter", + method: "get", + params: params + }); } export function saveCountOrder(data) { - return axios({ - url: "/inv/count/order/saveCountOrder", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/saveCountOrder", + method: "post", + data: data + }); } export function submitAudit(params) { - return axios({ - url: "/inv/count/order/submitAudit", - method: "get", - params: params - }); + return axios({ + url: "/invCount/order/submitAudit", + method: "get", + params: params + }); } export function deleteCountOrderDetail(data) { - return axios({ - url: "/inv/count/order/detail/deleteOrderDetail", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/detail/deleteOrderDetail", + method: "post", + data: data + }); } export function addCountOrderDetail(data) { - return axios({ - url: "/inv/count/order/detail/addCountOrderDetail", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/detail/addCountOrderDetail", + method: "post", + data: data + }); } export function updateCountOrderStatus(data) { - return axios({ - url: "/inv/count/order/updateCountOrderStatus", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/updateCountOrderStatus", + method: "post", + data: data + }); } export function verifyTemplateFile(data) { - return axios({ - url: "/inv/count/order/verifyTemplateFile", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/verifyTemplateFile", + method: "post", + data: data + }); } export function printOrder(data) { - return axios({ - url: "/inv/count/order/printOrder", - method: "post", - data: data, - headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, - responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf - }); -} - -export function batchAddDetail(data) { - return axios({ - url: "/inv/count/order/detail/batchAddDetail", - method: "post", - data: data - }); + return axios({ + url: "/invCount/order/printOrder", + method: "post", + data: data, + headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, + responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf + }); } diff --git a/src/api/inventory/invCountSetting.js b/src/api/inventory/invCountSetting.js new file mode 100644 index 00000000..5dcb8e34 --- /dev/null +++ b/src/api/inventory/invCountSetting.js @@ -0,0 +1,25 @@ +import axios from '@/utils/request' + +export function getSettingList(params) { + return axios({ + url: "/invCount/setting/filterList", + method: "get", + params: params + }); +} + +export function saveCountSetting(data, formName) { + return axios({ + url: formName === 'add' ? "/invCount/setting/add" : "/invCount/setting/update", + method: "post", + data: data + }); +} + +export function verifyAdd() { + return axios({ + url: "/invCount/setting/verifyAdd", + method: "get", + params: null + }); +} diff --git a/src/views/inventory/InvCountCodes.vue b/src/views/inventory/count/InvCountCodes.vue similarity index 100% rename from src/views/inventory/InvCountCodes.vue rename to src/views/inventory/count/InvCountCodes.vue diff --git a/src/views/inventory/InvCountOrderAudit.vue b/src/views/inventory/count/InvCountOrderAudit.vue similarity index 99% rename from src/views/inventory/InvCountOrderAudit.vue rename to src/views/inventory/count/InvCountOrderAudit.vue index 41de2169..9a6ddc94 100644 --- a/src/views/inventory/InvCountOrderAudit.vue +++ b/src/views/inventory/count/InvCountOrderAudit.vue @@ -153,7 +153,7 @@ import { deleteCountOrder, updateCountOrderStatus, getCountOrderDetailList } from "@/api/inventory/invCountOrder"; -import invCountCodes from "@/views/inventory/InvCountCodes.vue"; +import invCountCodes from "@/views/inventory/count/InvCountCodes.vue"; export default { name: "InvCountOrderAudit", diff --git a/src/views/inventory/InvCountOrderCompleted.vue b/src/views/inventory/count/InvCountOrderCompleted.vue similarity index 99% rename from src/views/inventory/InvCountOrderCompleted.vue rename to src/views/inventory/count/InvCountOrderCompleted.vue index e9fbd1cc..12b0a7bd 100644 --- a/src/views/inventory/InvCountOrderCompleted.vue +++ b/src/views/inventory/count/InvCountOrderCompleted.vue @@ -134,7 +134,7 @@ import { getCountOrderList, getCountOrderDetailList } from "@/api/inventory/invCountOrder"; -import invCountCodes from "@/views/inventory/InvCountCodes.vue"; +import invCountCodes from "@/views/inventory/count/InvCountCodes.vue"; export default { name: "InvCountOrderCompleted", diff --git a/src/views/inventory/InvCountOrderModify.vue b/src/views/inventory/count/InvCountOrderModify.vue similarity index 99% rename from src/views/inventory/InvCountOrderModify.vue rename to src/views/inventory/count/InvCountOrderModify.vue index 7aa2aa8f..e29c22ee 100644 --- a/src/views/inventory/InvCountOrderModify.vue +++ b/src/views/inventory/count/InvCountOrderModify.vue @@ -242,7 +242,7 @@ import {addCode} from "@/api/inventory/invCountCodes"; import {getCountInvProductProduct} from "@/api/inventory/invPorduct"; import {isBlank} from "@/utils/strUtil"; import {getInvListByUser} from "@/api/system/invWarehouse"; -import invCountCodes from "@/views/inventory/InvCountCodes.vue"; +import invCountCodes from "@/views/inventory/count/InvCountCodes.vue"; export default { props: { diff --git a/src/views/inventory/InvCountOrderNew.vue b/src/views/inventory/count/InvCountOrderNew.vue similarity index 99% rename from src/views/inventory/InvCountOrderNew.vue rename to src/views/inventory/count/InvCountOrderNew.vue index 69b171b1..1229d019 100644 --- a/src/views/inventory/InvCountOrderNew.vue +++ b/src/views/inventory/count/InvCountOrderNew.vue @@ -138,7 +138,7 @@ import { verifyTemplateFile, printOrder } from "@/api/inventory/invCountOrder"; -import invCountOrderModify from "@/views/inventory/InvCountOrderModify.vue"; +import invCountOrderModify from "@/views/inventory/count/InvCountOrderModify.vue"; export default { name: "InvCountOrderNew",