1.合并部分js文件内容，统一存放接口方法

2.删除未使用的接口
3.调整部分文件命名

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({

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(
         {

src/api/auth/register.js

@@ -16,7 +16,6 @@ export function register(data) {
     });
 }
 
-
 export function checkPass(data) {
     return axios({
         url: "/udiwarehouse/register/check",

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
-    });
-}
-
-

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",

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
+    });
+}
 

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",

src/api/erp/udiRelevance.js

@@ -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
-    });
-}

src/api/inventory/InvPreProducts.js

@@ -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
-    });
-}
-

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
+    });
+}
+

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) {

src/api/param/systemPDFTemplate.js

@@ -1,6 +1,3 @@
-/**
- * Created by lk on 17/6/4.
- */
 import axios from "../../utils/axios";
 
 // 获取列表

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({

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",

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
-    });
-}
-
-
-
-

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",

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
-    });
-}
-
-

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
-    });
-}

src/api/udidl/udid.js

@@ -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
-    });
-}
-
-
-
-
-

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({

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({

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",

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(
         {

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",

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 {

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";

src/views/inventory/InvProductsDetail.vue

@@ -118,7 +118,7 @@
 <script>
 import {
     statDetailProducts
-} from "../../api/inventory/InvPreProducts";
+} from "../../api/inventory/InvProducts";
 import {filterDetailProducts} from "../../api/warehouse/InvProducts";
 import store from "../../store";
 import draggable from "vuedraggable";

src/views/product/udiRelevance.vue

@@ -182,8 +182,7 @@
 </template>
 
 <script>
-import {filterCompany} from "../../api/basic/udiInfo";
+import {filterCompany, getUdiInfos, combineUdi, combineAllUdi} from "../../api/basic/udiInfo";
-import {getUdiInfos, combineUdi, combineAllUdi} from "../../api/erp/udiRelevance";
 import selectDIDetail from "./SelectDIDetailDialog";
 
 export default {

src/views/userManage/forgetPasswd.vue

@@ -145,14 +145,11 @@
 </template>
 
 <script>
-import {getCheckcode, register, resetPasswd} from "../../api/auth/register";
+import {getCheckcode, resetPasswd} from "../../api/auth/register";
+import {getCompany} from "@/api/auth/company";
 import {
-    provinceAndCityData,
-    regionData,
-    provinceAndCityDataPlus,
     regionDataPlus,
-    CodeToText,
+    CodeToText
-    TextToCode,
 } from "element-china-area-data";
 
 export default {

src/views/userManage/param/systemPDFTemplate.vue

@@ -347,7 +347,7 @@ import {BASE_URL} from "../../../config/app";
 import {saveAs} from 'file-saver';
 import {demoPrint} from "@/api/itextpdf/itextpdf";
 import {isBlank} from "@/utils/strUtil";
-import {getCompanyList} from "@/api/warehouse/company";
+import {getCompanyList} from "@/api/auth/company";
 import {getBussinessType} from "@/api/basic/bussinessType";
 
 const formJson = {

src/views/userManage/register.vue

@@ -421,23 +421,17 @@
 
 <script>
 import {
-    getCompany,
+    getCompany,getRegisterConfig
-    modifyCompany,
+} from "../../api/auth/company";
-    getRefid, checkCompany, getRegisterConfig
-} from "../../api/warehouse/company";
 import {getCheckcode, register} from "../../api/auth/register";
 import {
-    provinceAndCityData,
-    regionData,
-    provinceAndCityDataPlus,
     regionDataPlus,
-    CodeToText,
+    CodeToText
-    TextToCode
 } from "element-china-area-data";
 import Clipboard from "clipboard";
 import {BASE_URL} from "../../config/app";
 import {getCorps} from "@/api/thrsys/thrCorps";
-import {getCandidateCompanyName} from "../../api/udidl/udid";
+import {getCandidateCompanyName} from "../../api/auth/company";
 
 
 export default {

src/views/userManage/registerApp.vue

@@ -232,19 +232,11 @@
 </template>
 
 <script>
-import {
+import { getCompany, getRefid} from "../../api/auth/company";
-    getCompany,
-    modifyCompany,
-    getRefid,
-} from "../../api/warehouse/company";
 import {getCheckcode, register} from "../../api/auth/register";
 import {
-    provinceAndCityData,
-    regionData,
-    provinceAndCityDataPlus,
     regionDataPlus,
-    CodeToText,
+    CodeToText
-    TextToCode,
 } from "element-china-area-data";
 
 export default {

src/views/userManage/registerManage.vue

@@ -294,7 +294,7 @@
 import {getRegisters, checkPass, deleteRe} from "../../api/auth/register";
 import {authCustomerRoles} from "../../api/auth/authAdmin";
 import {getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain";
-import {getRegisterConfig} from "../../api/warehouse/company";
+import {getRegisterConfig} from "../../api/auth/company";
 import {BASE_URL} from "../../config/app";
 import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
 

src/views/warehouse/DialogChangeNewOrder.vue

@@ -185,7 +185,7 @@ import {filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
 import {parseTime} from "@/filtres";
 import {stockOrderChange, stockOrderDetail} from "@/api/warehouse/stockOrder";
 import {getBusTypeByUser} from "@/api/warehouse/BusRole";
-import {unitListBykey} from "@/api/warehouse/unit";
+import {unitListBykey} from "@/api/auth/unit";
 import {isBlank} from "@/utils/strUtil";
 
 export default {

src/views/warehouse/DialogSelectRl.vue

@@ -503,7 +503,6 @@
 
 <script>
 import {
-    getUdiInfos, getAllUdiInfos,
     deletetUdiInfos,
     thirdSysDetail,
     removeRl, sysFilter, getMutiUdiInfos
@@ -511,7 +510,6 @@ import {
 import {selectSysParamByKey} from "../../api/param/systemParamConfig";
 import {filterByUuid} from "../../api/basic/udiInfo";
 import {updateBind} from "../../api/warehouse/order"
-
 import selectUdi from "../basic/UdiInfoRelevance.vue";
 import selectErp from "../basic/UdiInfoselectErpUdi";
 import selectLocalUdi from "@/views/product/selectLocalUdi";

src/views/warehouse/DialogSelectUnit.vue

@@ -72,8 +72,7 @@
 </template>
 
 <script>
-import {updateUnit} from "@/api/warehouse/order";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
-import {getBasicUnitMaintains, getCorpFilter} from "@/api/basic/basicUnitMaintain";
 import {getUnitMaintain} from "@/api/receipts/unitMaintain";
 
 export default {
@@ -115,7 +114,7 @@ export default {
             let query = {
                 udiRlIdFk: row.relId
             };
-            getCorpFilter(query)
+            getBasicUnitMaintains(query)
                 .then((response) => {
                     this.loading = false;
                     if (response.code == 20000) {

src/views/warehouse/InvProducts.vue

@@ -106,7 +106,7 @@
 <script>
 import {filterProducts, deleteProducts} from "../../api/warehouse/InvProducts";
 import draggable from "vuedraggable";
-import codeDetail from "../inventory/InvPreProductsDetail";
+import codeDetail from "../inventory/InvProductsDetail";
 import store from "../../store";
 import {getBusType} from "../../api/warehouse/BusRole";
 import {filterAllByUser} from "@/api/basic/invWarehouse";

src/views/warehouse/company.vue

@@ -217,7 +217,7 @@ import {
     modifyCompany,
     getRefid,
     testConnection
-} from "../../api/warehouse/company";
+} from "../../api/auth/company";
 import store from "../../store/index";
 
 export default {

src/views/warehouse/ioErrorOrder.vue

@@ -228,7 +228,7 @@ import {
     commitOrder,
     updateUnit
 } from "../../api/warehouse/order";
-import {unitListBykey} from "../../api/warehouse/unit";
+import {unitListBykey} from "../../api/auth/unit";
 import draggable from "vuedraggable";
 import codeDetail from "./errorCode";
 import {getBusTypeByUser} from "../../api/warehouse/BusRole";

src/views/warehouse/ioFinishOrder.vue

@@ -333,7 +333,7 @@ import {
     mergeOrder,
     orderDetail,
 } from "../../api/warehouse/order";
-import {unitListBykey} from "../../api/warehouse/unit";
+import {unitListBykey} from "../../api/auth/unit";
 import draggable from "vuedraggable";
 import {saveAs} from "file-saver";
 import codeDetail from "./code";

src/views/warehouse/ioNewOrder.vue

@@ -170,11 +170,6 @@
                     prop="addr"
                     show-overflow-tooltip
                 ></el-table-column>
-                <!--<el-table-column label="状态" prop="status">
-                    <template slot-scope="scope">
-                        <span>{{ orderStatus[scope.row.status] }}</span>
-                    </template>
-                </el-table-column>-->
                 <el-table-column label="类型" prop="corpType">
                     <template slot-scope="scope">
                         <span>{{ corpTypeMap[scope.row.corpType] }}</span>
@@ -214,7 +209,7 @@ import {
     updateUnit
 } from "../../api/warehouse/order";
 import {getBusTypeByUser} from "../../api/warehouse/BusRole";
-import {unitListBykey} from "../../api/warehouse/unit";
+import {unitListBykey} from "../../api/auth/unit";
 import draggable from "vuedraggable";
 import codeDetail from "./errorCode";
 import {getCorpType} from "@/api/basic/bussinessType";

src/views/warehouse/ioNewScanOrder.vue

@@ -236,6 +236,7 @@ export default {
             this.getList();
         },
         getList() {
+
         },
         cancelDialog() {
         },

src/views/warehouse/ioUdiTrace.vue

@@ -173,7 +173,6 @@
 
 <script>
 import {
-    filterCode,
     findAllByOrderId,
     updateUnit,
     deleteByOrderId,
@@ -184,7 +183,7 @@ import {
 } from "../../api/warehouse/order";
 import {getBusTypeByUser} from "../../api/warehouse/BusRole";
 import {getUdiTrace} from "../../api/warehouse/udiTrace";
-import {unitListBykey} from "../../api/warehouse/unit";
+import {unitListBykey} from "../../api/auth/unit";
 import draggable from "vuedraggable";
 import {saveAs} from "file-saver";
 import codeDetail from "./code";
@@ -481,18 +480,6 @@ export default {
                     this.detailList = [];
                 });
         },
-        keyup_submit(event) {
-            filterCode(this.codeQuery).then((response) => {
-                this.loading = false;
-                this.list = response.data.list || [];
-                this.detailList = [];
-                this.total = response.data.total || 0;
-            })
-                .catch(() => {
-                    this.loading = false;
-                });
-            event.target.select();
-        },
         handleUnitClick(row) {
             this.curIndex = row.id;
             this.curOrderId = row.orderId;

src/views/warehouse/stockOrderDistribution.vue

@@ -179,13 +179,9 @@
 import {
     stockOrderDetail,
     submitStockOrder,
-    submitStockOrderError,
     uploadStockOrderDetailCount
 } from "../../api/warehouse/stockOrder";
 import draggable from "vuedraggable";
-import {saveAs} from "file-saver";
-import {parseTime} from "../../filtres/index";
-import store from "../../store";
 import {getLocalJoinBusType} from "../../api/basic/busLocalType";
 
 export default {

src/views/warehouse/stockOrderEditDistribution.vue

@@ -438,29 +438,21 @@
 import {
     stockOrderDetail,
     submitStockOrder,
-    submitStockOrderError,
-    uploadStockOrderDetailCount,
     stockOrderGenerateBillNo,
     getStockOrderDetailInstrument,
-    deleteStockOrderById,
     insertStockOrderWeb,
-    stockOrderDetailTemp,
     deleteStockOrderDetailById,
     addStockOrderDetailFromCode,
     uploadStockOrderDetail,
-    copyStockOrderDetail,
     stockOrderDetailQueryProduct,
-    getStockOrderDetailInstrumentById, stockOrderDetail2
+    getStockOrderDetailInstrumentById
 } from "../../api/warehouse/stockOrder";
 import draggable from "vuedraggable";
-import {saveAs} from "file-saver";
-import {parseTime} from "../../filtres/index";
 import store from "../../store";
 import stockOrderNewSelectProduct from "./stockOrderNewSelectProduct";
-import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain";
+import {getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain";
-import {getBussinessType} from "../../api/basic/bussinessType";
+import {getLocalJoinBusType} from "../../api/basic/busLocalType";
-import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType";
+import {filterAllByUser} from "@/api/basic/invWarehouse";
-import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
 
 export default {
     name: "idQuery",

src/views/warehouse/stockOrderQRCodeDetail.vue

@@ -141,22 +141,15 @@
 <script>
 import {
     generateStockOrderQRCodeText,
-    stockOrderDetail,
+    submitStockOrder
-    submitStockOrder,
-    submitStockOrderError,
-    uploadStockOrderDetailCount
 } from "../../api/warehouse/stockOrder";
-import {stockQRCodeText, filterPrint} from "../../api/warehouse/stockQRCode";
+import {filterPrint} from "../../api/warehouse/stockQRCode";
 import {getLocalJoinBusType} from "../../api/basic/busLocalType";
 
 import draggable from "vuedraggable";
-import {saveAs} from "file-saver";
-import {parseTime} from "../../filtres/index";
-import store from "../../store";
 import {
-    inspectionOrderDetailPDFFromTemplateFile,
     inspectionStockQRCodeTextPDFFromTemplateFile,
-    orderDetailPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFile
+    stockQRCodeTextPDFFromTemplateFile
 } from "../../api/itextpdf/itextpdf";
 
 export default {

src/views/warehouse/stockQRCodeExport.vue

@@ -54,7 +54,8 @@
                 </el-col>
                 <el-col :span="7">
                     <el-form-item prop="billType">
-                        <el-select v-model="formData.billType" placeholder="请选择业务类型" clearable="true" disabled="true">
+                        <el-select v-model="formData.billType" placeholder="请选择业务类型" clearable="true"
+                                   disabled="true">
                             <el-option
                                 v-for="item in busTypes"
                                 :key="item.localName"
@@ -97,7 +98,8 @@
                 </el-table-column>
                 <el-table-column label="标签数量">
                     <template slot-scope="scope">
-                        <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
+                        <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量"
+                                  style="width: 50%"
                                   oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         <!--                            <span>{{ scope.row.reCount }}</span>-->
                     </template>
@@ -188,21 +190,13 @@
 </template>
 
 <script>
-import {
+import {submitStockOrder} from "../../api/warehouse/stockOrder";
-    stockOrderDetail,
+import {filterPrint} from "../../api/warehouse/stockQRCode";
-    submitStockOrder,
-    submitStockOrderError,
-    uploadStockOrderDetailCount,
-} from "../../api/warehouse/stockOrder";
-import {stockQRCodeText, filterPrint} from "../../api/warehouse/stockQRCode";
 import draggable from "vuedraggable";
-import {saveAs} from "file-saver";
-import {parseTime} from "../../filtres/index";
-import store from "../../store";
 import {
-    inspectionOrderDetailPDFFromTemplateFile, filterTemp,
+    filterTemp,
     inspectionStockQRCodeTextPDFFromTemplateFile,
-    orderDetailPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax
+    stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax
 } from "../../api/itextpdf/itextpdf";
 import {getLocalJoinBusType} from "../../api/basic/busLocalType";
 import {BASE_URL} from "@/config/app";