Merge branch 'master' of http://192.168.1.160:3000/zhaohanlin/rtk-web-wms-cloud

src/api/wms/output/inrequest.js

@@ -52,6 +52,12 @@ export function deleteInRequest(id) {
 
 // 获得入库申请主
 export function getInRequest(id) {
+  return request({
+    url: "/rtkwms/inout-request/get?id=" + id,
+    method: "get",
+  });
+} // 获得入库申请主
+export function getRequest(id) {
   return request({
     url: "/rtkwms/in-request/get?id=" + id,
     method: "get",

src/views/rtkwms/inrequest/InRequestForm.vue

@@ -503,7 +503,7 @@ export default {
       if (id) {
         this.formLoading = true;
         try {
-          const res = await InRequestApi.getInRequest(id);
+          const res = await InRequestApi.getRequest(id);
           res.data.businessType = res.data.businessType
             ? res.data.businessType.toString()
             : "0";