From c807a390325eda5054b362a45cf3c08026c15002 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 12 Oct 2024 18:10:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9=E4=B8=8E=E9=87=87=E8=B4=AD=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=8A=A5=E4=BB=B7=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将环境变量从生产环境切换到本地环境
- 更新本地环境的BASE_URL地址
- 在采购产品报价页面添加确认已采购的时间显示
- 优化出库价输入框，增加选择器和动态显示文本
- 修复picker确认后pickerShow未重置的问题
---
 config/app.js                              |  6 ++---
 pageQuota/purchase_product_offer/index.vue | 31 +++++++++++++---------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/config/app.js b/config/app.js
index 313fd1e..dea5d28 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.7:8545';
+		BASE_URL = 'http://192.168.1.22: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 d669db7..d9023f0 100644
--- a/pageQuota/purchase_product_offer/index.vue
+++ b/pageQuota/purchase_product_offer/index.vue
@@ -37,7 +37,7 @@
 							<up-button size="small" type="primary" shape="circle" @click="cancleOrder(item)"
 								v-if="item.buyer_confirm==0">确认已采购</up-button>
 							<up-button size="small" type="success" shape="circle" v-else
-								disabled>{{item.buyer_confirm_name}}</up-button>
+								disabled>{{item.buyer_confirm_name}}/{{item.update_time}}</up-button>
 						</view>
 						<up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line>
 					</view>
@@ -60,11 +60,16 @@
 						<up-input v-model="formData.total_price"></up-input>
 					</up-form-item>
 					<up-form-item label="出库价">
-						<up-input @click="pickerShow=true" v-model="formData.outbound_price"></up-input>
+						<up-input @click="pickerShow=true" v-model="formData.outbound_price">
+							<template #suffix>
+									<span>{{pickerText}}</span>
+							</template>
+						</up-input>
 					</up-form-item>
 				</up-form>
 			</up-modal>
-					<up-picker :show="pickerShow" :columns="columns" keyName="name" @confirm="pickerConfirm" @cancel="pickerShow=false"></up-picker>
+			<up-picker :show="pickerShow" :columns="columns" keyName="name" @confirm="pickerConfirm"
+				@cancel="pickerShow=false"></up-picker>
 
 		</view>
 	</view>
@@ -90,7 +95,8 @@
 		})
 	}
 	const show = ref(false)
-	const pickerShow=ref(false)
+	const pickerText = ref('')
+	const pickerShow = ref(false)
 	const formData = ref({
 		"id": '',
 		"store_name": '',
@@ -98,7 +104,7 @@
 		'nums': '',
 		'price': '',
 		'total_price': '',
-		'outbound_price':''
+		'outbound_price': ''
 	})
 	// tabsindex
 	const tabIndex = ref(1)
@@ -149,14 +155,15 @@
 		getGoodsList()
 	}
 	const columns = ref([]);
-	const pickerConfirm=(e)=>{
-		pickerShow.value=false
-		let outbound_price=(formData.value.price*e.value[0].value)
-		formData.value.outbound_price=(parseInt(formData.value.price)+outbound_price).toFixed(2)
+	const pickerConfirm = (e) => {
+		pickerShow.value = false
+		let outbound_price = (formData.value.price * e.value[0].value)
+		pickerText.value=e.value[0].name
+		formData.value.outbound_price = (parseInt(formData.value.price) + outbound_price).toFixed(2)
 	}
-	const OutboundFloatingLv=()=>{
-		purchaseProductOfferOutboundFloatingLv().then(res=>{
-			columns.value=res.data
+	const OutboundFloatingLv = () => {
+		purchaseProductOfferOutboundFloatingLv().then(res => {
+			columns.value = res.data
 		})
 	}
 	getGoodsList()