From 659d89522cf2fb18081119febb64e0d42102da00 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 11 Oct 2024 22:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E5=BA=93=E4=BB=B7?=
=?UTF-8?q?=E6=A0=BC=E8=AE=A1=E7=AE=97=E5=8A=9F=E8=83=BD=E5=92=8C=E7=8E=AF?=
=?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 添加计算出库价格的功能,通过选择不同的价格级别来计算出库价
- 新增接口调用来获取出库价格浮动等级
- 更新环境配置,将本地URL从192.168.1.22更改为192.168.1.7
- 修复一些UI问题,如出库价格输入框的显示和交互
---
api/purchase_product_offer.js | 3 ++
config/app.js | 6 ++--
pageQuota/purchase_product_offer/index.vue | 33 ++++++++++------------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/api/purchase_product_offer.js b/api/purchase_product_offer.js
index 2add0e6..cdbb500 100644
--- a/api/purchase_product_offer.js
+++ b/api/purchase_product_offer.js
@@ -6,4 +6,7 @@ export const purchaseProductOfferLists = (data) => {
//报价单提交
export const purchaseProductOfferUpdate = (data) => {
return request.post('/purchase_product_offer/purchaseproductoffer/offer_update', data);
+}
+export const purchaseProductOfferOutboundFloatingLv = (data) => {
+ return request.get('/purchase_product_offer/purchaseproductoffer/outbound_floating_lv', data);
}
\ No newline at end of file
diff --git a/config/app.js b/config/app.js
index dea5d28..313fd1e 100644
--- a/config/app.js
+++ b/config/app.js
@@ -3,9 +3,9 @@ let WSS_URL
import store from "@/store/user.js"
// 环境
// let env = "dev"
-// let env = "prod"
+let env = "prod"
// let env = "release";
-let env = "local";
+// let env = "local";
switch (env) {
case 'dev':
@@ -17,7 +17,7 @@ switch (env) {
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
break;
case 'local':
- BASE_URL = 'http://192.168.1.22:8545';
+ BASE_URL = 'http://192.168.1.7:8545';
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
break;
default:
diff --git a/pageQuota/purchase_product_offer/index.vue b/pageQuota/purchase_product_offer/index.vue
index 7dc85fe..d669db7 100644
--- a/pageQuota/purchase_product_offer/index.vue
+++ b/pageQuota/purchase_product_offer/index.vue
@@ -60,11 +60,11 @@
-
+
-
+
@@ -78,7 +78,8 @@
} from "vue"
import {
purchaseProductOfferLists,
- purchaseProductOfferUpdate
+ purchaseProductOfferUpdate,
+ purchaseProductOfferOutboundFloatingLv
} from "@/api/purchase_product_offer.js"
const menu_list = ref(['未采购', '已采购']);
@@ -96,7 +97,8 @@
'product_id': '',
'nums': '',
'price': '',
- 'total_price': ''
+ 'total_price': '',
+ 'outbound_price':''
})
// tabsindex
const tabIndex = ref(1)
@@ -146,24 +148,19 @@
where.value.buyer_confirm = index
getGoodsList()
}
- const columns = reactive([
- [{
- label: '雪月夜',
- // 其他属性值
- id: 2021
- // ...
- },
- {
- label: '冷夜雨',
- id: 804
- }
- ]
- ]);
+ const columns = ref([]);
const pickerConfirm=(e)=>{
pickerShow.value=false
- console.log(e.value[0])
+ let outbound_price=(formData.value.price*e.value[0].value)
+ formData.value.outbound_price=(parseInt(formData.value.price)+outbound_price).toFixed(2)
+ }
+ const OutboundFloatingLv=()=>{
+ purchaseProductOfferOutboundFloatingLv().then(res=>{
+ columns.value=res.data
+ })
}
getGoodsList()
+ OutboundFloatingLv()