From af7ef4eae9c22a7d4baedcf797407475223cb76a Mon Sep 17 00:00:00 2001 From: lixuan Date: Mon, 20 Feb 2023 09:43:26 +0800 Subject: [PATCH 1/8] xiugai --- src/api/product.js | 29 ++ src/views/order/index.vue | 378 +++++++++++++++++++++++- src/views/product/components/create.vue | 70 ++++- 3 files changed, 459 insertions(+), 18 deletions(-) diff --git a/src/api/product.js b/src/api/product.js index 59a448c..843b606 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/index.vue b/src/views/order/index.vue index 60265f6..70cbb99 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -1,7 +1,379 @@ - + - + diff --git a/src/views/product/components/create.vue b/src/views/product/components/create.vue index 08bfa40..f7679a2 100644 --- a/src/views/product/components/create.vue +++ b/src/views/product/components/create.vue @@ -10,14 +10,22 @@
- + + + - + - + - + - + 元/吨 - + 吨 + + +
@@ -78,6 +93,7 @@ export default { }, data() { return { + customList:[], form: {}, refineryList: [], productTypeList: [ @@ -115,9 +131,33 @@ export default { }; }, created() { - this.findByEntity(); + // this.findByEntity(); }, methods: { + //搜索炼厂 + refineryData(value){ + if (value) { + serve.findByEntity({refineryName:value}).then((res) => { + this.refineryList = res.data; + }); + } + }, + //搜索产品 + productData(value){ + if (value) { + serve.getRefineryProductList({productType:value}).then((res) => { + this.customList = res.data; + }); + } + }, + //搜索客户 + customData(value){ + if (value) { + serve.getRefineryCompanyList({name:value}).then((res) => { + this.customList = res.data; + }); + } + }, openDrawer() {}, submit() { this.$refs["form"].validate((valid) => { @@ -137,11 +177,11 @@ export default { else return serve.save(form); }, //炼厂list - findByEntity() { - refineryServe.findByEntity().then((res) => { - this.refineryList = res.data; - }); - }, + // findByEntity() { + // refineryServe.findByEntity().then((res) => { + // this.refineryList = res.data; + // }); + // }, closeWindow() { this.$emit("closeWindow"); this.form = {}; From 608f5cdb9800015a92a9dd4df96cee53c57b49bc Mon Sep 17 00:00:00 2001 From: lixuan Date: Mon, 20 Feb 2023 11:18:26 +0800 Subject: [PATCH 2/8] xiugai --- src/api/product.js | 2 +- src/views/product/components/create.vue | 59 ++++++++++++++++++++----- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/src/api/product.js b/src/api/product.js index 843b606..a6ca27c 100644 --- a/src/api/product.js +++ b/src/api/product.js @@ -39,7 +39,7 @@ const getRefineryCompanyList = (params) => { // 下单 const orderSave = (params) => { return request.postJson( - "/oil_refinery/xoilRefineryOrder/save", + "/oil-refinery/xoilRefineryOrder/save", params ); }; diff --git a/src/views/product/components/create.vue b/src/views/product/components/create.vue index 56e6e9f..dda986e 100644 --- a/src/views/product/components/create.vue +++ b/src/views/product/components/create.vue @@ -37,7 +37,7 @@ - + - + + + { if (this.form.refineryId) callback(); @@ -105,7 +129,10 @@ export default { }; return { customList:[], - form: {}, + form: { + actAmount:0 + }, + productNameList:[], refineryList: [], configAutocomplete: { serveTarget: refineryInfoServe.findByEntity, @@ -149,21 +176,28 @@ export default { }; }, methods: { + productChange(){ + this.productData() + }, //搜索炼厂 refineryData(value){ if (value) { serve.findByEntity({refineryName:value}).then((res) => { this.refineryList = res.data; }); + this.productData() } }, //搜索产品 - productData(value){ - if (value) { - serve.getRefineryProductList({productType:value}).then((res) => { - this.customList = res.data; - }); + productData(){ + let data = { + refineryId:this.form.refineryId, + productType:this.form.productType, + enableMark:'ENABLE' } + serve.getRefineryProductList(data).then((res) => { + this.productNameList = res.data; + }) }, //搜索客户 customData(value){ @@ -187,9 +221,10 @@ export default { }); }, judgeInterface(form) { - let { id } = this.controlWindows.addInfo; - if (id) return serve.update(form); - else return serve.save(form); + // let { id } = this.controlWindows.addInfo; + // if (id) return serve.update(form); + // else + return serve.orderSave(form); }, //炼厂list // findByEntity() { From b3502c348d05946aac3541ffbd04ac41bf5a8f1a Mon Sep 17 00:00:00 2001 From: lixuan Date: Wed, 22 Feb 2023 10:14:10 +0800 Subject: [PATCH 3/8] xiugai --- src/api/order.js | 43 ++ src/utils/axios.js | 7 + src/views/order/components/billOfLading.vue | 449 ++++++++++++++++++++ src/views/order/index.vue | 157 ++++--- src/views/product/components/create.vue | 53 ++- src/views/product/index.vue | 12 +- 6 files changed, 650 insertions(+), 71 deletions(-) create mode 100644 src/api/order.js create mode 100644 src/views/order/components/billOfLading.vue diff --git a/src/api/order.js b/src/api/order.js new file mode 100644 index 0000000..fc830fe --- /dev/null +++ b/src/api/order.js @@ -0,0 +1,43 @@ +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); +}; + + + + + +export default { + getByPage, + findDeliveryByOrderId, + billSave, + findByOrderId, + update, + deleteBill, + orderSuccess +}; 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/views/order/components/billOfLading.vue b/src/views/order/components/billOfLading.vue new file mode 100644 index 0000000..8bbd416 --- /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 index 70cbb99..74ead96 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -46,70 +46,80 @@ :data="tableData" style="width: 100%" > - - - + + + - + - + + - + + + + - + + + + + - + - +