diff --git a/src/api/order.js b/src/api/order.js new file mode 100644 index 0000000..e7a78fd --- /dev/null +++ b/src/api/order.js @@ -0,0 +1,69 @@ +import request from "utils/axios.js"; +// table +const getByPage = (params) => { + return request.postJson("/oil-refinery/xoilRefineryOrder/getByPage", params); +}; +//查看提货单信息 +const findDeliveryByOrderId = (id) => { + return request.get(`/oil-refinery/xoilRefineryDelivery/findDeliveryByOrderId/${id}`); +}; +//创建提货单 +const billSave = (params) => { + return request.postJson("/oil-refinery/xoilRefineryDelivery/save", params); +}; +//修改提货单 +const update = (params) => { + return request.postPut("/oil-refinery/xoilRefineryDelivery/update", params); +}; +//修改提货单 +const orderUpdate = (params) => { + return request.postPut("/oil-refinery/xoilRefineryOrder/update", params); +}; +//查看订单信息 +const findByOrderId = (id) => { + return request.get(`/oil-refinery/xoilRefineryDelivery/findByOrderId/${id}`); +}; +//修改提货单 +const deleteBill = (params) => { + return request.postPut("/oil-refinery/xoilRefineryDelivery/delete", params); +}; +//下单 +const orderSuccess = (params) => { + return request.postJson("/oil-refinery/xoilRefineryOrder/orderSuccess", params); +}; +//订单锁定 +const orderLock = (params) => { + return request.postJson("/oil-refinery/xoilRefineryOrder/orderLock", params); +}; +//确认下单 +const orderComplete = (params) => { + return request.postJson("/oil-refinery/xoilRefineryOrder/orderComplete", params); +}; +//订单退款 +const orderRefund = (params) => { + return request.postJson("/oil-refinery/xoilRefineryOrder/orderRefund", params); +}; +//油批中心信息 +const getlnfoByld = (params) => { + return request.postJson("/oil-refinery/xoilRefineryCenterAccount/getInfoById", params); +}; +//油批中心列表 +const getRecordsByActld = (params) => { + return request.postJson("/oil-refinery/xoilRefineryCenterAccount/getRecordsByActId", params); +}; + +export default { + getByPage, + findDeliveryByOrderId, + billSave, + findByOrderId, + update, + deleteBill, + orderSuccess, + orderLock, + orderComplete, + orderRefund, + orderUpdate, + getlnfoByld, + getRecordsByActld +}; diff --git a/src/api/product.js b/src/api/product.js index 59a448c..a6ca27c 100644 --- a/src/api/product.js +++ b/src/api/product.js @@ -32,6 +32,31 @@ const modifyPrice = (params) => { params ); }; +// 搜索客户 +const getRefineryCompanyList = (params) => { + return request.postJson("/oil-user/oilCompanyInfo/getLikeByCompanyType", params); +}; +// 下单 +const orderSave = (params) => { + return request.postJson( + "/oil-refinery/xoilRefineryOrder/save", + params + ); +}; +//查看企业产品 +const getRefineryProductList = (params) => { + return request.postJson( + "/oil-refinery/oilRefineryProduct/getRefineryProductList", + params + ); +}; +//查看炼厂信息 +const findByEntity = (params) => { + return request.postJson( + "/oil-refinery/xoilRefineryInfo/findByEntity", + params + ); +}; export default { getByPage, @@ -40,4 +65,8 @@ export default { getByPageRecord, updateBatchEnable, modifyPrice, + getRefineryCompanyList, + orderSave, + getRefineryProductList, + findByEntity }; diff --git a/src/views/order/components/billOfLading.vue b/src/views/order/components/billOfLading.vue new file mode 100644 index 0000000..dd36e1e --- /dev/null +++ b/src/views/order/components/billOfLading.vue @@ -0,0 +1,458 @@ + + + + + diff --git a/src/views/order/index.vue b/src/views/order/index.vue index 60265f6..9a465a6 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -1,7 +1,500 @@ - + - + diff --git a/src/views/product/components/create.vue b/src/views/product/components/create.vue index c4b9e3a..76e91ad 100644 --- a/src/views/product/components/create.vue +++ b/src/views/product/components/create.vue @@ -1,20 +1,28 @@