From d885fb521dee6ecc37ed6c085a092adf5199bfc2 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Wed, 6 Nov 2024 11:01:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E5=8F=B7=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageConsumables/outbound.vue       | 21 ++++++++++++++++-
 pageConsumables/warehouseEntry.vue | 38 +++++++++++++++++++-----------
 pageLineUp/index.vue               |  3 ++-
 3 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/pageConsumables/outbound.vue b/pageConsumables/outbound.vue
index f1782b6..d6c9426 100644
--- a/pageConsumables/outbound.vue
+++ b/pageConsumables/outbound.vue
@@ -33,6 +33,18 @@
 					<input type="text" placeholder="请输入单价(元)" v-model="datas.form.list.price" name="" id="">
 				</view>
 			</view>
+			<view style="justify-content: space-between;">
+				<view>
+					单位
+				</view>
+				<picker @change="changeNowStatusIndexs"   :range="datas.unitList">
+					<view class="color-333" style="height: 84rpx;line-height: 84rpx;">
+						{{datas.form.list.unit}}
+						</view>
+				</picker>
+				<!-- defaultUnit -->
+				<uni-icons type="bottom" size="16"></uni-icons>
+			</view>
 			<view>
 				<view>
 					应付金额
@@ -117,6 +129,7 @@
 		list: [],
 		// 供应商渲染数组
 		status: [],
+		unitList:[],
 		form: {
 			shopId: uni.getStorageSync("shopId"),
 			type: "out",
@@ -135,6 +148,10 @@
 	})
 	onMounted(() => {
 		datas.item = JSON.parse(props.item)
+		datas.form = Object.assign(datas.form, datas.item)
+		// 单位列表
+		datas.unitList = [ datas.form.conUnit,datas.form.conUnitTwo]
+		datas.form.list.unit=datas.form.defaultUnit
 	})
 onShow(() => {
 		getList()
@@ -165,7 +182,9 @@ onShow(() => {
 		nowStatusIndex.value = i.detail.value
 		showStatus.value = false
 	}
-
+	function changeNowStatusIndexs(i) {
+		datas.form.list.unit = datas.unitList[i.detail.value]
+	}
 	function sumbit() {
 
 		if (!datas.form.list.stockNumber) {
diff --git a/pageConsumables/warehouseEntry.vue b/pageConsumables/warehouseEntry.vue
index cdca5c5..da08283 100644
--- a/pageConsumables/warehouseEntry.vue
+++ b/pageConsumables/warehouseEntry.vue
@@ -25,15 +25,6 @@
 					<input type="number" placeholder="请输入数量" v-model="datas.form.list.stockNumber" name="" id="">
 				</view>
 			</view>
-			<!-- 	<view style="justify-content: space-between;">
-				<view>
-					单位
-				</view>
-				<view style="width: 54%;" @tap="showStatusToggle">
-					{{datas.status[nowStatusIndex]}}
-				</view>
-				<uni-icons type="bottom" size="16"></uni-icons>
-			</view> -->
 			<view>
 				<view>
 					<text style="color: red;">*</text>单价
@@ -42,6 +33,18 @@
 					<input type="number" placeholder="请输入单价(元)" v-model="datas.form.list.price" name="" id="">
 				</view>
 			</view>
+			<view style="justify-content: space-between;">
+				<view>
+					单位
+				</view>
+				<picker @change="changeNowStatusIndexs"   :range="datas.unitList">
+					<view class="color-333" style="height: 84rpx;line-height: 84rpx;">
+						{{datas.form.list.unit}}
+					</view>
+				</picker>
+				<!-- defaultUnit -->
+				<uni-icons type="bottom" size="16"></uni-icons>
+			</view>
 			<view>
 				<view>
 					应付金额
@@ -71,14 +74,13 @@
 					供应商
 				</view>
 				<picker @change="changeNowStatusIndex" :value="nowStatusIndex" :range="datas.status">
-						<view class="color-333" style="height: 84rpx;line-height: 84rpx;">{{datas.status[nowStatusIndex]}}</view>
+					<view class="color-333" style="height: 84rpx;line-height: 84rpx;">{{datas.status[nowStatusIndex]}}
+					</view>
 				</picker>
 				<uni-icons type="bottom" size="16"></uni-icons>
 				<view style="color: #318AFE;width: 80rpx;text-align: center;" @tap="toggle">
 					新增
 				</view>
-				<!-- 	<up-button type="text" style="color: #318AFE;"   @tap="toggle" :plain="true"
-					text="新增"></up-button> -->
 			</view>
 		</view>
 
@@ -120,6 +122,8 @@
 		list: [],
 		// 供应商渲染数组
 		status: [],
+		// 单位列表
+		unitList: [],
 		form: {
 			shopId: uni.getStorageSync("shopId"),
 			type: "in",
@@ -138,7 +142,10 @@
 	})
 	onMounted(() => {
 		datas.item = JSON.parse(props.item)
-		datas.form = assign(datas.form, ...datas.item)
+		datas.form = Object.assign(datas.form, datas.item)
+		// 单位列表
+		datas.unitList = [ datas.form.conUnit,datas.form.conUnitTwo]
+		datas.form.list.unit=datas.form.defaultUnit
 	})
 	onShow(() => {
 		getList()
@@ -159,7 +166,6 @@
 			res.content.forEach(ele => {
 				datas.status.push(ele.purveyorName)
 			})
-			console.log(datas.status, '调试121')
 		})
 	}
 
@@ -173,6 +179,10 @@
 		showStatus.value = false
 	}
 
+	function changeNowStatusIndexs(i) {
+		datas.form.list.unit = datas.unitList[i.detail.value]
+	}
+
 	function sumbit() {
 		if (!datas.form.list.stockNumber) {
 			refs.ctx.$refs.uToastRef.show({
diff --git a/pageLineUp/index.vue b/pageLineUp/index.vue
index f76e29e..b784d08 100644
--- a/pageLineUp/index.vue
+++ b/pageLineUp/index.vue
@@ -267,6 +267,7 @@
 	.pageLineUpTop {
 		.df;
 		justify-content: space-around;
+		flex-wrap: wrap;
 		margin: 36rpx 0;
 
 		>view {
@@ -275,7 +276,7 @@
 			background: #FFFFFF;
 			border-radius: 8rpx 8rpx 8rpx 8rpx;
 			border: 2rpx solid #E5E5E5;
-
+			margin-top: 20rpx;
 			>view {
 				text-align: center;
 			}