From 54953851f64138b7d36ecfe6deff2db8e39506c8 Mon Sep 17 00:00:00 2001
From: 905166056 <905166056@qq.com>
Date: Tue, 21 Mar 2023 08:48:06 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=89=B9=E6=AC=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view-resource-store-info.vue              | 43 ++++++++++++++++++-
 pages/addItemOutStep/addItemOutStep.vue       |  9 +++-
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/components/view-resource-store-info/view-resource-store-info.vue b/components/view-resource-store-info/view-resource-store-info.vue
index ce284a0..772f48f 100644
--- a/components/view-resource-store-info/view-resource-store-info.vue
+++ b/components/view-resource-store-info/view-resource-store-info.vue
@@ -7,15 +7,21 @@
 		</view>
 		<view class="margin-top">
 			<view class="cu-list menu-avatar " v-for="(item,index) in resourceList" :key="index">
-				<view class="cu-item" style="height: 220rpx;">
+				<view class="cu-item" style="height: 300rpx;">
 					<view class="content content-left" style="width: 100%;">
 						<view class="text-grey flex-around">
 							<text class="ellip text-df">{{item.resName}}({{item.parentRstName}}>{{item.rstName}})</text>
 							<text class="item-remove bg-red text-df" @click="_removeItem(index, item.resId)">移除</text>
 						</view>
+						<view class="text-gray flex-around">
+							<label class="text-df">价格:</label>
+							<picker :range="item.times" :range-key="'price'" @change="timesChange($event, index)">
+								<view>{{item.times[item.selectedTimesIndex].price}}</view>
+							</picker>
+						</view>
 						<view class="text-gray flex-around">
 							<label class="text-df">库存:</label>
-							<text class="text-df">{{item.stock}}{{item.unitCodeName}}</text>
+							<text class="text-df">{{_getTimesStock(item)}}{{item.unitCodeName}}</text>
 						</view>
 						<view class="text-gray flex-around">
 							<label class="text-df">数量:</label>
@@ -104,6 +110,10 @@
 			_getResourceInfo: function(list){
 				this.resourceList = list;
 				this.resourceList.forEach((item)=>{
+					item.timesId = '';
+					item.selectedTimesIndex = 0;
+					item.selectedTimesStock = 0;
+					item.times.unshift({timesId: '', price: '请选择'})
 					this.suppliersList.push(0);
 				})
 			},
@@ -116,6 +126,35 @@
 				this.resourceList.splice(index, 1);
 				// 通知子组件 取消选中checkbox
 				this.$refs.selectresource.removeSelectedItem(resId);
+			},
+			
+			timesChange: function(e, index){
+				let timeIndex = e.target.value;
+				this.resourceList[index].selectedTimesIndex = timeIndex;
+				if(timeIndex == 0){
+					this.resourceList[index].timesId = '';
+					this.resourceList[index].selectedTimesStock = 0;
+				}else{
+					this.resourceList[index].timesId = this.resourceList[index].times[timeIndex].timesId;
+					this.resourceList[index].selectedTimesStock = this.resourceList[index].times[timeIndex].stock;
+				}
+				this.$forceUpdate();
+			},
+			
+			_getTimesStock: function(_resourceStore) {
+				if (!_resourceStore.timesId) {
+					return "-";
+				}
+				let _stock = 0;
+				_resourceStore.times.forEach(_item => {
+					if (_item.timesId == _resourceStore.timesId) {
+						_stock = _item.stock;
+					}
+				});
+				if (!_resourceStore.quantity) {
+					_resourceStore.quantity = '';
+				}
+				return _stock;
 			}
 		}
 	}
diff --git a/pages/addItemOutStep/addItemOutStep.vue b/pages/addItemOutStep/addItemOutStep.vue
index baf9132..49f47bc 100644
--- a/pages/addItemOutStep/addItemOutStep.vue
+++ b/pages/addItemOutStep/addItemOutStep.vue
@@ -85,7 +85,12 @@
 							return;
 						}
 						item.quantity = parseInt(item.quantity);
-						if (this.resOrderType == '20000' && (item.quantity > parseInt(item.stock))) {
+						if (this.resOrderType == '20000' && !item.timesId) {
+							msg = item.resName + ",未选择价格";
+							_that.onoff = true;
+							return;
+						}
+						if (this.resOrderType == '20000' && (item.quantity > parseInt(item.selectedTimesStock))) {
 							msg = item.resName + ",库存不足";
 							_that.onoff = true;
 							return;
@@ -125,8 +130,8 @@
 					};
 					saveItemOutApply(this, _data)
 					.then(function(res) {
+						_that.onoff = true;
 						if (res.code == 0) {
-							_that.onoff = true;
 							uni.navigateBack({
 								delta:1
 							})