a

src/api/stock.js

@@ -251,9 +251,9 @@ export function GetAllGoodInfo(params){
   })
 }
 
-export function postWarehouse(params,warehousing_time,warehousing_order){
+export function postWarehouse(params,warehousing_time,manufacturer_id,dealer_id,type){
   return request({
-    url:'/api/stock/warehouse/create?warehousing_time='+warehousing_time+"&warehousing_order="+warehousing_order,
+    url:'/api/warehouse/create?warehousing_time='+warehousing_time+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id+"&type="+type,
     method:'post',
     data:params
   })
@@ -262,7 +262,7 @@ export function postWarehouse(params,warehousing_time,warehousing_order){
 
 export function getWarehouseList(params){
   return request({
-    url:'/api/stock/warehouse/list',
+    url:'/api/warehouse/list',
     method:'get',
     params:params
   })
@@ -270,16 +270,16 @@ export function getWarehouseList(params){
 
 export function getWarehouseInfoList(params){
   return request({
-    url:'/api/stock/warehouseinfo/list',
+    url:'/api/warehouseinfo/list',
     method:'get',
     params:params
   })
 }
 
 
-export function postSalesReturn(params,salesReturnTime,salesReturnTotal,ids,orderNumber){
+export function postSalesReturn(params,salesReturnTime,salesReturnTotal,dealer_id,manufacturer_id,type){
   return request({
-    url:'/api/warehouse/return?time='+salesReturnTime+"&total="+salesReturnTotal+"&ids="+ids+"&order_number="+orderNumber,
+    url:'/api/salesreturn/create?time='+salesReturnTime+"&total="+salesReturnTotal+"&dealer_id="+dealer_id+"&manufacturer_id="+manufacturer_id+"&type="+type,
     method:'post',
     data:params
   })
@@ -297,7 +297,7 @@ export function getWarehouseInfo(params){
 
 export function getSalesReturnList(params){
   return request({
-    url:'/api/return/list',
+    url:'/api/salesreturn/list',
     method:'get',
     params:params
   })
@@ -324,15 +324,6 @@ export function getAllWarehouseInfo(params){
 
 
 
-
-export function getWarehouseOutList(params){
-  return request({
-    url:'/api/stock/out/list',
-    method:'get',
-    params:params
-  })
-}
-
 export function getWarehouseOutInfoList(params){
   return request({
     url:'/api/stock/out/info',
@@ -342,9 +333,9 @@ export function getWarehouseOutInfoList(params){
 }
 
 
-export function postWarehouseOut(params,warehousing_time,warehousing_out_order){
+export function postWarehouseOut(params,warehousing_time,dealer_id,manufacturer_id,type){
   return request({
-    url:'/api/stock/out/create?warehousing_out_time='+warehousing_time+"&warehousing_out_order="+warehousing_out_order,
+    url:'/api/warehouseout/create?warehousing_out_time='+warehousing_time+"&dealer_id="+dealer_id+"&manufacturer_id="+manufacturer_id+"&type="+type,
     method:'post',
     data:params
   })
@@ -367,130 +358,275 @@ export function getWarehouseInfoByGoodTypeId(params){
   })
 }
 
-export function getWarehouseOutInfo(params){
+
+
+
+export function getCancelStockInfoList(params){
   return request({
-    url:'/api/out/info',
+    url:'/api/cancel/info',
     method:'get',
     params:params
   })
 }
 
 
-export function postCancelStock(params,cancelStockTime,cancelStockTotal,ids,orderNumber){
+export function getAllStockOutList(params){
   return request({
-    url:'/api/stock/cancel?time='+cancelStockTime+"&total="+cancelStockTotal+"&ids="+ids+"&order_number="+orderNumber,
-    method:'post',
-    data:params
+    url:'/api/out/list',
+    method:'get',
+    params:params
   })
 }
 
 
 
-export function getCancelStockList(params){
+
+export function getAllStockQueryList(params){
   return request({
-    url:'/api/cancel/list',
+    url:'/api/stock/query',
     method:'get',
     params:params
   })
 }
 
-export function getCancelStockInfoList(params){
+
+export function getWarehouseInfoByOrdeNumber(params){
   return request({
-    url:'/api/cancel/info',
+    url:'/api/stock/warehouse/get',
     method:'get',
     params:params
   })
 }
 
 
-export function getAllStockOutList(params){
+export function modifyWarehouseInfo(params){
   return request({
-    url:'/api/out/list',
-    method:'get',
+    url:'/api/warehouse/edit',
+    method:'post',
     params:params
   })
 }
 
 
+export function deleteWarehouseInfo(params){
+  return request({
+    url:'/api/warehouse/delete',
+    method:'post',
+    params:params
+  })
+}
 
 
-export function getAllStockQueryList(params){
+export function getWarehouseOutInfoByOrdeNumber(params){
   return request({
-    url:'/api/stock/query',
+    url:'/api/stock/out/get',
     method:'get',
     params:params
   })
 }
 
+export function modifyWarehouseOutInfo(params){
+  return request({
+    url:'/api/stock/out/edit',
+    method:'post',
+    params:params
+  })
+}
+
 
-export function getWarehouseInfoByOrdeNumber(params){
+
+
+
+export function GetAllConfig(){
   return request({
-    url:'/api/stock/warehouse/get',
+    url:'/api/stock/config',
+    method:'get',
+  })
+}
+
+export function GetAllGoodInfoByID(params){
+  return request({
+    url:'/api/good/get',
     method:'get',
     params:params
+
   })
 }
 
 
-export function modifyWarehouseInfo(params){
+export function DeleteWarehouseInfoItem(params){
   return request({
-    url:'/api/stock/warehouse/edit',
+    url:'/api/warehouseinfo/delete',
     method:'post',
     params:params
+
   })
 }
 
 
-export function deleteWarehouseInfo(params){
+
+export function EditWarehouse(params,warehousing_time,id){
+  return request({
+    url:'/api/warehouse/edit?warehousing_time='+warehousing_time+'&id='+id,
+    method:'post',
+    data:params
+  })
+}
+
+
+export function getSalesReturnConfig(){
+  return request({
+    url:'/api/return/config',
+    method:'get',
+  })
+}
+
+export function deleteSalesReturn(params){
   return request({
-    url:'/api/stock/warehouse/delete',
+    url:'/api/salesreturn/delete',
     method:'post',
     params:params
   })
 }
 
 
-export function getWarehouseOutInfoByOrdeNumber(params){
+export function getSaleReturnInfoList(params){
   return request({
-    url:'/api/stock/out/get',
+    url:'/api/stock/salesReturn/list',
     method:'get',
     params:params
   })
 }
 
-export function modifyWarehouseOutInfo(params){
+
+export function getReturnList(params){
   return request({
-    url:'/api/stock/out/edit',
+    url:'/api/salesreturninfo/list',
+    method:'get',
+    params:params
+  })
+}
+export function deleteSalesReturnInfo(params){
+  return request({
+    url:'/api/salesreturninfo/delete',
     method:'post',
     params:params
   })
 }
 
 
+
+export function editSalesReturnInfo(params,return_time,id){
+  return request({
+    url:'/api/salesreturn/edit?return_time='+return_time+"&id="+id,
+    method:'post',
+    data:params
+  })
+}
+
+
+export function deleteWarehouseOut(params){
+  return request({
+    url:'/api/warehouseout/delete',
+    method:'post',
+    params:params
+  })
+}
+
 export function deleteWarehouseOutInfo(params){
   return request({
-    url:'/api/stock/out/delete',
+    url:'/api/warehouseoutinfo/delete',
     method:'post',
     params:params
   })
 }
 
 
-export function deleteStockInRecord(params){
+export function getWarehouseOutList(params){
   return request({
-    url:'/api/warehouse/delete',
+    url:'/api/warehouseout/list',
+    method:'get',
+    params:params
+  })
+}
+
+export function getWarehouseOutInfo(params){
+  return request({
+    url:'/api/warehouseout/info',
+    method:'get',
+    params:params
+  })
+}
+
+
+export function editWarehouseoutInfo(params,warehouse_out_time,id){
+  return request({
+    url:'/api/warehouseout/edit?warehouse_out_time='+warehouse_out_time+"&id="+id,
     method:'post',
+    data:params
+  })
+}
+
+
+
+
+export function getCancelStockList(params){
+  return request({
+    url:'/api/cancelstock/list',
+    method:'get',
     params:params
   })
 }
 
 
 
+export function editCancelStockInfo(params,cancel_stock_time,id){
+  return request({
+    url:'/api/cancelstockinfo/edit?cancel_time='+cancel_stock_time+"&id="+id,
+    method:'post',
+    data:params
+  })
+}
 
 
+export function getCancelStockInfo(params){
+  return request({
+    url:'/api/cancelstock/info',
+    method:'get',
+    params:params
+  })
+}
+
 
 
+export function deleteCancelStock(params){
+  return request({
+    url:'/api/cancelstock/delete',
+    method:'post',
+    params:params
+  })
+}
 
+export function deleteCancelStockInfo(params){
+  return request({
+    url:'/api/cancelstockinfo/delete',
+    method:'post',
+    params:params
+  })
+}
 
+export function postCancelStock(params,cancelStockTime,manufacturer_id,dealer_id,type){
+  return request({
+    url:'/api/cancelstock/create?time='+cancelStockTime+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id+"&type="+type,
+    method:'post',
+    data:params
+  })
+}
+export function getCancelStockConfig(){
+  return request({
+    url:'/api/cancelstockinfo/config',
+    method:'get',
+  })
+}
 
 

src/lang/zh.js

@@ -135,6 +135,15 @@ export default {
     RescueRecord: "抢救记录",
     special_permission_manage: "特殊权限管理",
     schedule_print: "排班打印",
+
+    stockInOrder:"入库单",
+    salesReturnOrder:"退货单",
+    stockOutOrder:"出库单",
+    cancelStockOrder:"出库退库单",
+    otherStockInOrder:"其他入库单",
+    otherSalesReturnOrder:"其他退货单",
+    otherStockOutOrder:"其他出库单",
+    otherCancelStockOrder:"其他出库退库单",
   },
   navbar: {
     logOut: '退出登录',