diff --git a/src/api/login.js b/src/api/login.js index 6c74f3c..3e66aa8 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -12,7 +12,6 @@ const getRefineryByCustomerId = (phone) => { `/oil-user/oilCustomerRefineryRelation/getRefineryByCustomerId/${phone}` ); }; - //路由 const getCustomerRouters = () => { return request.get( diff --git a/src/api/order.js b/src/api/order.js new file mode 100644 index 0000000..5c9f211 --- /dev/null +++ b/src/api/order.js @@ -0,0 +1,48 @@ +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.putJson("/oil-refinery/xoilRefineryDelivery/update", params); +}; +//查看订单信息 +const findByOrderId = (id) => { + return request.get(`/oil-refinery/xoilRefineryDelivery/findByOrderId/${id}`); +}; +//修改提货单 +const deleteBill = (params) => { + return request.putJson("/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); +}; + + + + + +export default { + getByPage, + findDeliveryByOrderId, + billSave, + findByOrderId, + update, + deleteBill, + orderSuccess, + orderLock +}; diff --git a/src/api/product.js b/src/api/product.js index 5ebdfc4..1a0dc11 100644 --- a/src/api/product.js +++ b/src/api/product.js @@ -7,7 +7,7 @@ const getByPage = (params) => { ); }; //炼厂list -const findByEntity = (params = {}) => { +const findByEntity = (params) => { return request.postJson( "/oil-refinery/xoilRefineryInfo/findByEntity", params @@ -17,8 +17,29 @@ const findByEntity = (params = {}) => { const update = (params) => { return request.postJson("/oil-refinery/oilRefineryProduct/update", params); }; +// 下单 +const orderSave = (params) => { + return request.postJson( + "/oil-refinery/xoilRefineryOrder/save", + params + ); +}; +//查看企业产品 +const getRefineryProductList = (params) => { + return request.postJson( + "/oil-refinery/oilRefineryProduct/getRefineryProductList", + params + ); +}; + // 搜索客户 + const getRefineryCompanyList = (params) => { + return request.postJson("/oil-user/oilCompanyInfo/getLikeByCompanyType", params); +}; export default { getByPage, findByEntity, + orderSave, + getRefineryProductList, + getRefineryCompanyList }; diff --git a/src/api/refineryInfo.js b/src/api/refineryInfo.js new file mode 100644 index 0000000..0bd5767 --- /dev/null +++ b/src/api/refineryInfo.js @@ -0,0 +1,31 @@ +import request from "utils/axios.js"; +// table +const getByPage = (params) => { + return request.postJson("/oil-refinery/xoilRefineryInfo/getByPage", params); +}; +// 新增 +const save = (params) => { + return request.postJson("/oil-refinery/xoilRefineryInfo/save", params); +}; +// 修改 +const update = (params) => { + return request.postJson("/oil-refinery/xoilRefineryInfo/update", params); +}; +// 删除 +const deleteRow = (params) => { + return request.postJson("/oil-refinery/xoilRefineryInfo/delete", params); +}; +//炼厂list +const findByEntity = (params = {}) => { + return request.postJson( + "/oil-refinery/xoilRefineryInfo/findByEntity", + params + ); +}; +export default { + getByPage, + save, + update, + deleteRow, + findByEntity, +}; diff --git a/src/store/getters.js b/src/store/getters.js index 86733ce..b8a541f 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -7,6 +7,7 @@ const getters = { auth: (state) => state.user.auth, company_type: (state) => state.user.companyType, company_id: (state) => state.user.companyId, + company_name: (state) => state.user.userCompanyName, permission_routes: (state) => state.permission.routes, }; export default getters; diff --git a/src/store/modules/user.js b/src/store/modules/user.js index bbffa38..2771b5a 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -5,6 +5,7 @@ const getDefaultState = () => { auth: null, companyType: 0, companyId: "", + userCompanyName:'' }; }; @@ -21,6 +22,7 @@ const mutations = { //chainParentMark 1：总公司 0：分公司 state.companyType = data.chainParentMark; state.companyId = data.userCompany; + state.userCompanyName = data.userCompanyName; }, }; diff --git a/src/utils/axios.js b/src/utils/axios.js index b35ad86..3642e91 100644 --- a/src/utils/axios.js +++ b/src/utils/axios.js @@ -24,6 +24,13 @@ export default { data: data, }); }, + putJson(url, data) { + return axios({ + url: url, + method: "put", + data: data, + }); + }, postFromData(url, data) { return axios({ url: url, diff --git a/src/utils/index.js b/src/utils/index.js index 09d2e74..d33d6ac 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -51,3 +51,8 @@ export function isLicensePlate(no) { ); return instance.test(no); } + +export function typeJudgment(object) { + let res = {}.__proto__.toString.call(object); + return res ? res : ""; +} diff --git a/src/views/login/index.vue b/src/views/login/index.vue index c217cf1..9ea2be5 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -154,7 +154,7 @@ export default { }); return; } - + console.log() localStorage.setItem("customerToken", res.data.accessToken); this.$router.replace("/"); }) diff --git a/src/views/order/components/billOfLading.vue b/src/views/order/components/billOfLading.vue new file mode 100644 index 0000000..2837988 --- /dev/null +++ b/src/views/order/components/billOfLading.vue @@ -0,0 +1,449 @@ + + + + + diff --git a/src/views/order/index.vue b/src/views/order/index.vue new file mode 100644 index 0000000..3873730 --- /dev/null +++ b/src/views/order/index.vue @@ -0,0 +1,473 @@ + + + + + diff --git a/src/views/product/components/create.vue b/src/views/product/components/create.vue index 7ffd8c9..0963af9 100644 --- a/src/views/product/components/create.vue +++ b/src/views/product/components/create.vue @@ -1,33 +1,38 @@