From 879439a61880e915740e86b6466b4f5ede3773cc Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Tue, 14 Feb 2023 11:41:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E8=B5=84=E5=85=A5=E5=BA=93=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E4=B8=8B=E6=8B=89=E9=80=89?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/massif/plant_info.vue  |  2 +-
 pages/stock/agrWarehouse.vue | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pages/massif/plant_info.vue b/pages/massif/plant_info.vue
index 9946d5a..404400d 100644
--- a/pages/massif/plant_info.vue
+++ b/pages/massif/plant_info.vue
@@ -11,7 +11,7 @@
 			<button slot="right" class="cu-btn round" @click="submit">提交</button>
 		</d-navbar>
 
-		<u-form class="card inline" :model="formData" :rules="rules" ref="form" labelWidth="auto">
+		<u-form class="card inline" errorType="toast" :model="formData" :rules="rules" ref="form" labelWidth="auto">
 			<d-form
 				v-for="(v,k) in fields"
 				:key="k"
diff --git a/pages/stock/agrWarehouse.vue b/pages/stock/agrWarehouse.vue
index 06173fa..239171f 100644
--- a/pages/stock/agrWarehouse.vue
+++ b/pages/stock/agrWarehouse.vue
@@ -93,7 +93,7 @@ import request from '@/common/request'
 			return{
 				fields:{
 					specName:{label:"规格", disabled:true, agr:true},
-					warning:{label:"预计值",type:"digit",suffix:"",agr:true},
+					warning:{label:"预警值",type:"digit",suffix:"",agr:true},
 					number:{label:"入库数量", type:"digit",suffix:"", tip:""},
 					inOutBatchNo:{label:"入库批次号",agr:true, btnText:"生成", btnFun:()=>this.formData.inOutBatchNo=`RK${new Date().format('yyyyMMdd')}${new Date().getTime()}`},
 					warehouseId:{label:"选择仓库", type:"select",columns:[],value:[],agr:true},
@@ -171,11 +171,14 @@ import request from '@/common/request'
 					})
 				}
 				//仓库下拉选项
-				var res=await request("/api/WarehouseManageApi/queryWarehouseByBaseId",{
-					params:{baseId: this.$store.state.plantBaseInfoId}
+				var res=await request("/api/plantHarvest/getWarehouse",{
+					params:{
+						plantBaseId:this.$store.state.plantBaseInfoId,
+						type:1,//1 农资，2 农产品
+					}
 				})
 				if(res.statu){
-					this.fields.warehouseId.columns=[res.data]
+					this.fields.warehouseId.columns=[res.data.map(v=>({label:v.warehouseName,value:v.id}))]
 				}else{
 					uni.showModal({
 						title:"提示",