From d82625bb8f63ea0f1bb57581801ada8acb5210a3 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 12 Oct 2022 09:45:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=88=E5=B9=B6=E9=83=A8=E5=88=86js?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9=EF=BC=8C=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=AD=98=E6=94=BE=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95=202.?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=203.=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth/authAdmin.js | 27 ---- src/api/{warehouse => auth}/company.js | 8 ++ src/api/auth/register.js | 1 - src/api/{warehouse => auth}/unit.js | 0 src/api/basic/basicUnitMaintain.js | 10 -- src/api/basic/busLocalType.js | 8 -- src/api/basic/udiInfo.js | 39 +++++ src/api/basic/udiRelevance.js | 15 -- src/api/erp/udiRelevance.js | 100 ------------- src/api/inventory/InvPreProducts.js | 36 ----- src/api/inventory/InvProducts.js | 10 ++ src/api/itextpdf/itextpdf.js | 53 ------- src/api/param/systemPDFTemplate.js | 3 - src/api/param/systemParamConfig.js | 11 -- src/api/receipts/bussinessType.js | 32 ----- src/api/receipts/productInfo.js | 28 ---- src/api/receipts/unitMaintain.js | 18 --- src/api/thrsys/thrCorps.js | 33 ----- src/api/thrsys/thrInvWarehouse.js | 33 ----- src/api/udidl/udid.js | 107 -------------- src/api/warehouse/BusRole.js | 18 --- src/api/warehouse/order.js | 136 ------------------ src/api/warehouse/stockOrder.js | 81 ----------- src/api/warehouse/stockQRCode.js | 13 -- src/api/warehouse/udiTrace.js | 8 -- src/views/basic/UdiInfoManage.vue | 2 +- src/views/home/index.vue | 2 +- ...oductsDetail.vue => InvProductsDetail.vue} | 2 +- src/views/product/udiRelevance.vue | 3 +- src/views/userManage/forgetPasswd.vue | 9 +- .../userManage/param/systemPDFTemplate.vue | 2 +- src/views/userManage/register.vue | 14 +- src/views/userManage/registerApp.vue | 12 +- src/views/userManage/registerManage.vue | 2 +- src/views/warehouse/DialogChangeNewOrder.vue | 2 +- src/views/warehouse/DialogSelectRl.vue | 2 - src/views/warehouse/DialogSelectUnit.vue | 5 +- src/views/warehouse/InvProducts.vue | 2 +- src/views/warehouse/company.vue | 2 +- src/views/warehouse/ioErrorOrder.vue | 2 +- src/views/warehouse/ioFinishOrder.vue | 2 +- src/views/warehouse/ioNewOrder.vue | 7 +- src/views/warehouse/ioNewScanOrder.vue | 1 + src/views/warehouse/ioUdiTrace.vue | 15 +- .../warehouse/stockOrderDistribution.vue | 4 - .../warehouse/stockOrderEditDistribution.vue | 16 +-- .../warehouse/stockOrderQRCodeDetail.vue | 13 +- src/views/warehouse/stockQRCodeExport.vue | 22 ++- 48 files changed, 97 insertions(+), 874 deletions(-) rename src/api/{warehouse => auth}/company.js (89%) rename src/api/{warehouse => auth}/unit.js (100%) delete mode 100644 src/api/erp/udiRelevance.js delete mode 100644 src/api/inventory/InvPreProducts.js create mode 100644 src/api/inventory/InvProducts.js delete mode 100644 src/api/udidl/udid.js rename src/views/inventory/{InvPreProductsDetail.vue => InvProductsDetail.vue} (99%) diff --git a/src/api/auth/authAdmin.js b/src/api/auth/authAdmin.js index fcfda19..965ff4b 100644 --- a/src/api/auth/authAdmin.js +++ b/src/api/auth/authAdmin.js @@ -9,24 +9,6 @@ export function authAdminList(query) { }); } -// 获取角色列表 -export function authAdminRoleList(query) { - return axios({ - url: "/admin/auth/admin/roleList", - method: "get", - params: query - }); -} - -//根据当前角色，获取是否为客户角色 -export function roleCustomers(query) { - return axios({ - url: "/admin/auth/admin/roleCustomers", - method: "get", - params: query - }); -} - // 获取客户角色列表 export function authCustomerRoles(query) { return axios({ @@ -58,15 +40,6 @@ export function authAdminDelete(data) { }); } -//查询可分配角色 -export function getAssignableRoles(query) { - return axios({ - url: "/auth/admin/admin/getAssignableRoles", - method: "get", - params: query - }); -} - //查询后台管理用户角色 export function getAdminRoles(query) { return axios({ diff --git a/src/api/warehouse/company.js b/src/api/auth/company.js similarity index 89% rename from src/api/warehouse/company.js rename to src/api/auth/company.js index 1912e32..a78be3b 100644 --- a/src/api/warehouse/company.js +++ b/src/api/auth/company.js @@ -1,5 +1,13 @@ import axios from "../../utils/axios"; +export function getCandidateCompanyName(query) { + return axios({ + url: "/udims/enterprise/filterCandidateCompanyName", + method: "get", + params: query + }); +} + export function getCompany(query) { return axios( { diff --git a/src/api/auth/register.js b/src/api/auth/register.js index ad0f047..89d70fc 100644 --- a/src/api/auth/register.js +++ b/src/api/auth/register.js @@ -16,7 +16,6 @@ export function register(data) { }); } - export function checkPass(data) { return axios({ url: "/udiwarehouse/register/check", diff --git a/src/api/warehouse/unit.js b/src/api/auth/unit.js similarity index 100% rename from src/api/warehouse/unit.js rename to src/api/auth/unit.js diff --git a/src/api/basic/basicUnitMaintain.js b/src/api/basic/basicUnitMaintain.js index 9dbe025..95c71ef 100644 --- a/src/api/basic/basicUnitMaintain.js +++ b/src/api/basic/basicUnitMaintain.js @@ -23,13 +23,3 @@ export function combine(query) { data: query }); } - -export function combineAll(query) { - return axios({ - url: "/udiwms/basic/unit/maintain/combineAll", - method: "get", - params: query - }); -} - - diff --git a/src/api/basic/busLocalType.js b/src/api/basic/busLocalType.js index 981bf62..58bbfdc 100644 --- a/src/api/basic/busLocalType.js +++ b/src/api/basic/busLocalType.js @@ -1,13 +1,5 @@ import axios from "../../utils/axios"; -export function getLocalBusType(query) { - return axios({ - url: "/udiwms/localBusType/filter", - method: "get", - params: query - }); -} - export function getLocalJoinBusType(query) { return axios({ url: "/udiwms/localBusType/filterJoin", diff --git a/src/api/basic/udiInfo.js b/src/api/basic/udiInfo.js index 4d5c171..031a1d8 100644 --- a/src/api/basic/udiInfo.js +++ b/src/api/basic/udiInfo.js @@ -23,4 +23,43 @@ export function filterByUuid(query) { }); } +export function combineUdi(query) { + return axios({ + url: "/udi/udirel/revleance", + method: "post", + data: query + }); +} + +export function combineAllUdi(query) { + return axios({ + url: "/udi/udirel/combineAll", + method: "get", + params: query + }); +} + +export function updatetUdiInfos(query) { + return axios({ + url: "/udi/udirel/update", + method: "post", + data: query + }); +} + +export function deletetUdiInfos(query) { + return axios({ + url: "/udi/udirel/deleteById", + method: "post", + data: query + }); +} + +export function disableUdi(query) { + return axios({ + url: "/udi/udirel/disable", + method: "post", + data: query + }); +} diff --git a/src/api/basic/udiRelevance.js b/src/api/basic/udiRelevance.js index 7b04714..ff41ac9 100644 --- a/src/api/basic/udiRelevance.js +++ b/src/api/basic/udiRelevance.js @@ -1,20 +1,5 @@ import axios from "../../utils/axios"; -export function getUdiInfos(query) { - return axios({ - url: "/udi/udirel/filterUdi", - method: "get", - params: query - }); -} - -export function getAllUdiInfos(query) { - return axios({ - url: "/udi/udirel/download", - method: "get", - params: query - }); -} export function getMutiUdiInfos(query) { return axios({ url: "/udi/udirel/mutil/download", diff --git a/src/api/erp/udiRelevance.js b/src/api/erp/udiRelevance.js deleted file mode 100644 index 39ca44e..0000000 --- a/src/api/erp/udiRelevance.js +++ /dev/null @@ -1,100 +0,0 @@ -import axios from "../../utils/axios"; - -//--------------获取ERP数据------------------- -export function getErpProduct(query) { - return axios({ - url: "/warehouse/getErpGoods", - method: "get", - params: query - }); -} - -export function getErpUnit(query) { - return axios({ - url: "/warehouse/getErpUnit", - method: "get", - params: query - }); -} -export function getInvbasdoc(query) { - return axios({ - url: "/warehouse/ucloud/invbasdoc", - method: "get", - params: query - }); -} - - -//-------------end--------------------------------- - -export function combineProduct(query) { - return axios({ - url: "/warehouse/productInfo/combine", - method: "post", - data: query - }); -} - -export function combineDrugProduct(query) { - return axios({ - url: "/warehouse/productInfo/combineDrug", - method: "post", - data: query - }); -} - -export function getUdiInfos(query) { - return axios({ - url: "/udims/udiinfo/filterUdi", - method: "get", - params: query - }); -} - -export function combineUdi(query) { - return axios({ - url: "/udi/udirel/revleance", - method: "post", - data: query - }); -} - -export function combineAllUdi(query) { - return axios({ - url: "/udi/udirel/combineAll", - method: "get", - params: query - }); -} - -export function filterByUuid(query) { - return axios({ - url: "/udims/udiinfo/local/filterByUuid", - method: "get", - params: query - }); -} - -export function updatetUdiInfos(query) { - return axios({ - url: "/udi/udirel/update", - method: "post", - data: query - }); -} - -export function deletetUdiInfos(query) { - return axios({ - url: "/udi/udirel/deleteById", - method: "post", - data: query - }); -} - -export function disableUdi(query) { - return axios({ - url: "/udi/udirel/disable", - method: "post", - data: query - }); -} diff --git a/src/api/inventory/InvPreProducts.js b/src/api/inventory/InvPreProducts.js deleted file mode 100644 index d559c7b..0000000 --- a/src/api/inventory/InvPreProducts.js +++ /dev/null @@ -1,36 +0,0 @@ -import axios from "../../utils/axios"; - - -export function filterProducts(query) { - return axios({ - url: "/spms/pre/inv/products/filter", - method: "get", - params: query - }); -} - -export function filterDetailProducts(query) { - return axios({ - url: "/spms/pre/inv/products/filterDetail", - method: "get", - params: query - }); -} - -export function deleteProducts(query) { - return axios( - { - url: "/spms/pre/inv/products/delete", - method: "post", - data: query - } - ) -} -export function statDetailProducts(query) { - return axios({ - url: "/spms/pre/inv/products/stat", - method: "get", - params: query - }); -} - diff --git a/src/api/inventory/InvProducts.js b/src/api/inventory/InvProducts.js new file mode 100644 index 0000000..9e7f000 --- /dev/null +++ b/src/api/inventory/InvProducts.js @@ -0,0 +1,10 @@ +import axios from "../../utils/axios"; + +export function statDetailProducts(query) { + return axios({ + url: "/spms/pre/inv/products/stat", + method: "get", + params: query + }); +} + diff --git a/src/api/itextpdf/itextpdf.js b/src/api/itextpdf/itextpdf.js index 7a9697f..24e1e88 100644 --- a/src/api/itextpdf/itextpdf.js +++ b/src/api/itextpdf/itextpdf.js @@ -1,58 +1,5 @@ import axios from "../../utils/axios"; -export function codeList(query) { - return axios({ - url: "/admin/warehouse/inout/findByOrderId", - method: "get", - params: query - }); -} - -export function downloadInoutOrderSuccessPDF(query) { - return axios({ - url: "/udiwms/pdf/download/inout/order/success", - method: "post", - data: query, - headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, - responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf - }); -} - -export function orderDetailPDFFromTemplateCode(query) { - return axios({ - url: "/udiwms/pdf/template/order/detail/code", - method: "post", - data: query, - headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, - responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf - }); -} - -export function orderDetailPDFFromTemplateFile(query) { - return axios({ - url: "/udiwms/pdf/template/order/detail/file", - method: "post", - data: query, - headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, - responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf - }); -} - -export function inspectionOrderDetailPDFFromTemplateCode(query) { - return axios({ - url: "/udiwms/pdf/template/inspection/order/detail/code", - method: "post", - data: query, - }); -} - -export function inspectionOrderDetailPDFFromTemplateFile(query) { - return axios({ - url: "/udiwms/pdf/template/inspection/order/detail/file", - method: "post", - data: query, - }); -} //---------打印码 export function inspectionStockQRCodeTextPDFFromTemplateFile(query) { diff --git a/src/api/param/systemPDFTemplate.js b/src/api/param/systemPDFTemplate.js index caa27dc..2753d69 100644 --- a/src/api/param/systemPDFTemplate.js +++ b/src/api/param/systemPDFTemplate.js @@ -1,6 +1,3 @@ -/** - * Created by lk on 17/6/4. - */ import axios from "../../utils/axios"; // 获取列表 diff --git a/src/api/param/systemParamConfig.js b/src/api/param/systemParamConfig.js index 40c14bd..046f020 100644 --- a/src/api/param/systemParamConfig.js +++ b/src/api/param/systemParamConfig.js @@ -1,6 +1,3 @@ -/** - * Created by lk on 17/6/4. - */ import axios from "../../utils/axios"; // 获取列表 @@ -32,14 +29,6 @@ export function selectSysParamByKey(query) { }); } -export function selectIp(query) { - return axios({ - url: "/udiwms/basic/thirdsys/selectIp", - method: "get", - params: query - }); -} - //查询可添加自定义参数 export function getCustomizeParams(query) { return axios({ diff --git a/src/api/receipts/bussinessType.js b/src/api/receipts/bussinessType.js index 3c010c5..3c50ceb 100644 --- a/src/api/receipts/bussinessType.js +++ b/src/api/receipts/bussinessType.js @@ -1,37 +1,5 @@ import axios from "../../utils/axios"; -export function getBussinessType(query) { - return axios({ - url: "/warehouse/bussinessType/filter", - method: "get", - params: query - }); -} - -export function deleteBussinessType(query) { - return axios({ - url: "/warehouse/bussinessType/delete", - method: "post", - data: query - }); -} - -export function updateBussinessType(query) { - return axios({ - url: "/warehouse/bussinessType/update", - method: "post", - data: query - }); -} - -export function insertBussinessType(query) { - return axios({ - url: "/warehouse/bussinessType/insert", - method: "post", - data: query - }); -} - export function getCandidateBussinessType(query) { return axios({ url: "/warehouse/bussinessType/candidateBussinessType", diff --git a/src/api/receipts/productInfo.js b/src/api/receipts/productInfo.js index 02aa750..29e6144 100644 --- a/src/api/receipts/productInfo.js +++ b/src/api/receipts/productInfo.js @@ -7,31 +7,3 @@ export function getProductInfos(query) { params: query }); } - -export function deleteProductInfos(query) { - return axios({ - url: "/warehouse/productInfo/delete", - method: "post", - data: query - }); -} - -export function updateProductInfos(query) { - return axios({ - url: "/warehouse/productInfo/update", - method: "post", - data: query - }); -} - -export function addByCode(query) { - return axios({ - url: "/salewarehouse/productInfo/addByCode", - method: "post", - data: query - }); -} - - - - diff --git a/src/api/receipts/unitMaintain.js b/src/api/receipts/unitMaintain.js index f844653..953339c 100644 --- a/src/api/receipts/unitMaintain.js +++ b/src/api/receipts/unitMaintain.js @@ -8,14 +8,6 @@ export function getUnitMaintain(query) { }); } -export function getUnbindUnitMaintain(query) { - return axios({ - url: "/warehouse/unitMaintain/getUnbindUnitMaintain", - method: "get", - params: query - }); -} - export function combine(query) { return axios({ url: "/udiwms/basic/unit/maintain/combine", @@ -32,16 +24,6 @@ export function deleteUnitMaintain(query) { }); } - -export function cusUnitSave(query) { - return axios({ - url: "/salewarehouse/unit/save", - method: "post", - data: query - - }); -} - export function addUnit(query) { return axios({ url: "/warehouse/unitMaintain/add", diff --git a/src/api/thrsys/thrCorps.js b/src/api/thrsys/thrCorps.js index af9da34..115c457 100644 --- a/src/api/thrsys/thrCorps.js +++ b/src/api/thrsys/thrCorps.js @@ -7,36 +7,3 @@ export function getCorps(query) { params: query }); } - -export function delCorps(query) { - return axios({ - url: "/udiwms/thrsys/delCorps", - method: "post", - data: query - }); -} - -export function delAll(query) { - return axios({ - url: "/udiwms/thrsys/corp/delAll", - method: "get", - params: query - }); -} -export function downloadAll(query) { - return axios({ - url: "/udiwms/thrsys/corp/downloadAll", - method: "get", - params: query - }); -} - -export function corpsDlAll(query) { - return axios({ - url: "/udiwms/thrsys/corp/corpsDlAll", - method: "post", - data: query - }); -} - - diff --git a/src/api/thrsys/thrInvWarehouse.js b/src/api/thrsys/thrInvWarehouse.js index e007b2a..9e23d78 100644 --- a/src/api/thrsys/thrInvWarehouse.js +++ b/src/api/thrsys/thrInvWarehouse.js @@ -1,7 +1,5 @@ import axios from "../../utils/axios"; -// 权限管理 - // 获取列表 export function filterThrList(query) { return axios({ @@ -10,34 +8,3 @@ export function filterThrList(query) { params: query }); } - -export function filterThrAll(query) { - return axios({ - url: "/spms/thrsys/warehouse/filterAll", - method: "get", - params: query - }); -} - - -// 保存 -export function saveThrWarehouse(data, formName, method = "post") { - let url = - formName !== "edit" - ? "/spms/thrsys/warehouse/save" - : "/spms/thrsys/warehouse/edit"; - return axios({ - url: url, - method: method, - data: data - }); -} - -// 删除 -export function deleteThrWarehouse(data) { - return axios({ - url: "/spms/thrsys/warehouse/delete", - method: "post", - data: data - }); -} diff --git a/src/api/udidl/udid.js b/src/api/udidl/udid.js deleted file mode 100644 index 43963d6..0000000 --- a/src/api/udidl/udid.js +++ /dev/null @@ -1,107 +0,0 @@ -import axios from "../../utils/axios"; - - -export function udidList(query) { - return axios({ - url: "/warehouse/device/list", - method: "get", - params: query - }); -} - - -export function loadsingle(query) { - return axios({ - url: "/warehouse/device/loadsingle", - method: "post", - data: query - }); -} - -export function loadHistory(query) { - return axios({ - url: "/warehouse/device/downLoadHisory", - method: "post", - data: query - }); -} -export function downloadUdids(query) { - return axios({ - url: "/warehouse/device/loadudid", - method: "post", - data: query - }); -} - -export function getProgress(query) { - return axios({ - url: "/warehouse/device/progress", - method: "get", - params: query - }); -} - -export function searchBykey(query){ - return axios({ - url: "/warehouse/device/search", - method: "get", - params: query - }); -} - -export function searchByDi(query){ - return axios({ - url: "/warehouse/device/searchbydi", - method: "get", - params: query - }); -} - - - -export function verifyUdi(query){ - return axios( - { - url: "/warehouse/product/verify", - method: "post", - data: query - } - ); -} -export function unionSearch(query){ - return axios({ - url: "/warehouse/device/unionSearch", - method: "get", - params: query - }); -} - -export function combineSearch(query){ - return axios({ - url: "/warehouse/device/combineSearch", - method: "get", - params: query - }); -} - - -export function stopDown(query){ - return axios({ - url: "/warehouse/device/stop", - method: "get", - params: query - }); -} - -export function getCandidateCompanyName(query) { - return axios({ - url: "/udims/enterprise/filterCandidateCompanyName", - method: "get", - params: query - }); -} - - - - - diff --git a/src/api/warehouse/BusRole.js b/src/api/warehouse/BusRole.js index b645465..eac33ee 100644 --- a/src/api/warehouse/BusRole.js +++ b/src/api/warehouse/BusRole.js @@ -8,24 +8,6 @@ export function getBusType(query) { }); } -export function getAllBusType(query) { - return axios({ - url: "/udiwms/busRl/filterAll", - method: "get", - params: query - }); -} - -export function updateBusRole(query) { - return axios( - { - url: "/udiwms/busRl/update", - method: "post", - data: query - } - ); -} - //查询用户的单据类型 export function getBusTypeByUser(query) { return axios({ diff --git a/src/api/warehouse/order.js b/src/api/warehouse/order.js index da5461b..9e82f59 100644 --- a/src/api/warehouse/order.js +++ b/src/api/warehouse/order.js @@ -1,14 +1,5 @@ import axios from "../../utils/axios"; - -export function orderList(query) { - return axios({ - url: "/admin/warehouse/inout/order/list", - method: "get", - params: query - }); -} - export function deleteCodesTempById(query) { return axios({ url: "/warehouse/inout/deleteCodesTempById", @@ -25,7 +16,6 @@ export function submitOrderWeb(query) { }); } - export function saveOrderWeb(query) { return axios({ url: "/warehouse/inout/saveOrderWeb", @@ -34,7 +24,6 @@ export function saveOrderWeb(query) { }); } - export function orderListError(query) { return axios({ url: "/admin/warehouse/inout/order/listerror", @@ -43,14 +32,6 @@ export function orderListError(query) { }); } -export function orderListRepeat(query) { - return axios({ - url: "/admin/warehouse/inout/order/listRepeat", - method: "get", - params: query - }); -} - export function codeList(query) { return axios({ url: "/admin/warehouse/inout/findByOrderId", @@ -67,14 +48,6 @@ export function addOrderWeb(query) { }); } -export function postOrdersWeb(query) { - return axios({ - url: "/warehouse/inout/postOrdersWeb", - method: "post", - data: query - }); -} - export function mergeOrder(query) { return axios({ url: "/warehouse/inout/order/mergeOrder", @@ -99,55 +72,6 @@ export function filterOrder(query) { }); } -export function selectNew(query) { - return axios({ - url: "/admin/warehouse/inout/order/selectNew", - method: "get", - params: query - }); -} - -export function selectWait(query) { - return axios({ - url: "/sale/inout/order/selectWait", - method: "get", - params: query - }); -} - -export function selectStatus(query) { - return axios({ - url: "/sale/inout/order/selectStatus", - method: "get", - params: query - }); -} - -export function selectDownload(query) { - return axios({ - url: "/sale/inout/order/selectDownload", - method: "get", - params: query - }); -} - -export function selectFinish(query) { - return axios({ - url: "/sale/inout/order/selectFinish", - method: "get", - params: query - }); -} - -export function selectSubOrders(query) { - return axios({ - url: "/sale/inout/order/selectSubOrders", - method: "get", - params: query - }); -} - - export function errorCodeList(query) { return axios({ url: "/admin/warehouse/inout/findErrorByOrderId", @@ -188,7 +112,6 @@ export function addCommitOrder(query) { }); } - export function updateExportStatus(query) { return axios( { @@ -219,27 +142,6 @@ export function updateBind(query) { ); } -export function updateBindSup(query) { - return axios( - { - url: "/udiwms/erpOrder/updateBindSup", - method: "post", - data: query - } - ); -} - - -export function backStock(query) { - return axios( - { - url: "/sale/inout/order/backStock", - method: "get", - params: query - } - ); -} - export function uploadOrder(query) { return axios( { @@ -250,17 +152,6 @@ export function uploadOrder(query) { ); } -export function moveStock(query) { - return axios( - { - url: "/sale/inout/order/moveStock", - method: "post", - data: query - } - ); -} - - export function findAllByOrderId(query) { return axios({ url: "/admin/warehouse/inout/findAllByOrderId", @@ -269,24 +160,6 @@ export function findAllByOrderId(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 updateSpms(query) { return axios( { @@ -297,15 +170,6 @@ export function updateSpms(query) { ); } -//查询补单数据 -export function getSupplementOrder(query) { - return axios({ - url: "warehouse/inout/order/filterSupplementOrder", - method: "get", - params: query - }); -} - //查询补录单据数据 export function additionalOrderList(query) { return axios({ diff --git a/src/api/warehouse/stockOrder.js b/src/api/warehouse/stockOrder.js index 9a06adb..0659b70 100644 --- a/src/api/warehouse/stockOrder.js +++ b/src/api/warehouse/stockOrder.js @@ -9,16 +9,6 @@ export function stockOrderList(query) { }); } - -// 获取列表 -export function stockListDetail(query) { - return axios({ - url: "/udiwms/stock/order/filterDetail", - method: "get", - params: query - }); -} - export function stockOrderDetail(query) { return axios( { @@ -29,27 +19,6 @@ export function stockOrderDetail(query) { ) } -export function stockOrderDetail2(query) { - return axios( - { - url: "/udiwms/stock/order/detail/filter2", - method: "get", - params: query - } - ) -} - -export function stockOrderDetailTemp(query) { - return axios( - { - url: "/udiwms/stock/order/detail/temp/filter", - method: "get", - params: query - } - ) -} - - export function insertStockOrderWeb(query) { return axios({ url: "/udiwms/stock/order/insertWeb", @@ -67,14 +36,6 @@ export function deleteStockOrderById(query) { }); } -export function deleteErrorStockOrderById(query) { - return axios({ - url: "/udiwms/stock/order/error/delete", - method: "post", - data: query - }); -} - export function deleteStockOrderDetailById(query) { return axios({ url: "/udiwms/stock/order/detail/delete", @@ -83,14 +44,6 @@ export function deleteStockOrderDetailById(query) { }); } -export function deleteStockOrderDetailTempById(query) { - return axios({ - url: "/udiwms/stock/order/detail/temp/delete", - method: "post", - data: query - }); -} - export function submitStockOrder(query) { return axios({ @@ -100,39 +53,6 @@ export function submitStockOrder(query) { }); } -export function updateStockOrder(query) { - return axios({ - url: "/udiwms/stock/order/update", - method: "post", - data: query - }); -} - - -export function submitNewStockOrder(query) { - return axios({ - url: "/udiwms/stock/order/new/submit", - method: "get", - params: query - }); -} - -export function repealSubmitNewStockOrder(query) { - return axios({ - url: "/udiwms/stock/order/new/repealSubmit", - method: "get", - params: query - }); -} - -export function submitStockOrderError(query) { - return axios({ - url: "/udiwms/stock/order/error/submit", - method: "get", - params: query - }); -} - export function uploadStockOrderDetailCount(query) { return axios( { @@ -213,7 +133,6 @@ export function copyStockOrderDetail(query) { ) } - export function generateStockOrderQRCodeText(query) { return axios({ url: "/udiwms/stock/order/qrcode/generate/text", diff --git a/src/api/warehouse/stockQRCode.js b/src/api/warehouse/stockQRCode.js index 7dc644f..5607663 100644 --- a/src/api/warehouse/stockQRCode.js +++ b/src/api/warehouse/stockQRCode.js @@ -1,19 +1,6 @@ -/** - * Created by lk on 17/6/4. - */ import axios from "../../utils/axios"; // 获取列表 -export function stockQRCodeText(query) { - return axios( - { - url: "/udiwms/stock/qrcode/text/filter", - method: "get", - params: query - } - ) -} - export function filterPrint(query) { return axios( { diff --git a/src/api/warehouse/udiTrace.js b/src/api/warehouse/udiTrace.js index c3066c5..999c444 100644 --- a/src/api/warehouse/udiTrace.js +++ b/src/api/warehouse/udiTrace.js @@ -1,13 +1,5 @@ import axios from "../../utils/axios"; -export function getTrace(query) { - return axios({ - url: "/udiwarehouse/trace/filter", - method: "get", - params: query - }); -} - export function getUdiTrace(query) { return axios({ url: "/udims/trace/filter", diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index ecbce8b..981926d 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -730,7 +730,7 @@ import { updatetUdiInfos, deletetUdiInfos, disableUdi -} from "../../api/erp/udiRelevance"; +} from "../../api/basic/udiInfo"; import selectUdi from "../product/udiRelevance"; export default { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 63d3ac9..79734b0 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -175,7 +175,7 @@ import {mapGetters} from "vuex"; import SidebarItem from "./SidebarItem.vue"; import {password} from "../../api/auth/login"; import {getAdminId} from "../../utils/auth"; -import {getCompany, verifyConnection, setIgnoreVerify} from "../../api/warehouse/company"; +import {getCompany, verifyConnection, setIgnoreVerify} from "../../api/auth/company"; import vTags from "../components/Tags"; import bus from "./bus"; import store from "../../store/index"; diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue similarity index 99% rename from src/views/inventory/InvPreProductsDetail.vue rename to src/views/inventory/InvProductsDetail.vue index 7a18e5a..9018df8 100644 --- a/src/views/inventory/InvPreProductsDetail.vue +++ b/src/views/inventory/InvProductsDetail.vue @@ -118,7 +118,7 @@