diff --git a/pages/baseMana/formReacord.vue b/pages/baseMana/formReacord.vue
index d6d12ed..631545d 100644
--- a/pages/baseMana/formReacord.vue
+++ b/pages/baseMana/formReacord.vue
@@ -96,7 +96,7 @@
 					<text>负责人：{{v.principal}}</text> <text>记录时间：{{v.time}}</text>
 				</view>
 			</view>
-			<u-empty v-if="list.length==0" width="70%" icon="/static/noData.png"/>
+			<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</scroll-view>
 	</view>
 </template>
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 7409286..b9e2efe 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -356,7 +356,7 @@
 					<text>投入品</text> <text class="over">{{v.userName}}{{new Date(v.time).format('yyyy-MM-dd')}}日完成了{{v.plotName}}{{v.farmWorkName}}任务</text>
 				</view>
 			</template>
-			<u-empty v-if="isEmpty" width="70%" icon="/static/noData.png"/>
+			<u-empty v-if="isEmpty" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</view>
 
 		<u-picker v-if="isAdmin" :show="show" :columns="plantBase" keyName="baseName" closeOnClickOverlay @close="show=false" @confirm="$store.commit('setBaseId', $event.value[0].id);show=false" @cancel="show=false"/>
diff --git a/pages/massif/index.vue b/pages/massif/index.vue
index 4ffd106..82c9d12 100644
--- a/pages/massif/index.vue
+++ b/pages/massif/index.vue
@@ -103,7 +103,7 @@
 					</view>
 				</view>
 			</view>
-			<u-empty v-if="list.length==0" width="70%" icon="/static/noData.png"/>
+			<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</scroll-view>
 	</view>
 </template>
diff --git a/pages/massif/info.vue b/pages/massif/info.vue
index 10a56b3..fdf2a18 100644
--- a/pages/massif/info.vue
+++ b/pages/massif/info.vue
@@ -31,7 +31,7 @@ import request from '@/common/request'
 		data(){
 			return{
 				fields:{
-					plantBaseInfoId:{label:"基地名称",type:"select",columns:[[]],value:[]},
+					plantBaseInfoId:{label:"基地名称",type:"select",columns:[[]],value:[],disabled:this.$store.getters['userInfo'].roleCode=="baseAdmin"},
 					plotNumber:{label:"地块编号"},
 					plotName:{label:"地块名称"},
 					drawArea:{label:"地块面积(亩)",type:'digit'},
@@ -73,9 +73,17 @@ import request from '@/common/request'
 				eventChannel:null,
 			}
 		},
-		onLoad(options){
-			this.init()
-			if(options.id)this.getDetail(options.id);
+		async onLoad(options){
+			await this.init()
+			if(options.id){
+				this.getDetail(options.id)
+			}else if(this.$store.getters['userInfo'].roleCode=="baseAdmin"){
+				var baseVal=this.fields.plantBaseInfoId.columns[0].find(v=>v.value==this.$store.state.plantBaseInfoId)
+				if(baseVal){
+					this.formData.plantBaseInfoId=baseVal.value
+					this.fields.plantBaseInfoId.value=[baseVal.value]
+				}
+			}
 			this.eventChannel=this.getOpenerEventChannel()
 		},
 		methods:{
diff --git a/pages/massif/mana/plantPlan.vue b/pages/massif/mana/plantPlan.vue
index ef7f8a4..538706a 100644
--- a/pages/massif/mana/plantPlan.vue
+++ b/pages/massif/mana/plantPlan.vue
@@ -132,7 +132,7 @@
 					<text v-if="v.status==2" class="over">已结束</text>
 				</view>
 			</view>
-			<u-empty v-if="list.length==0" width="70%" icon="/static/noData.png"/>
+			<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</scroll-view>
 
 		<button class="cu-btn round bg-green shadow submit" @click="addPlant">+新增种植计划</button>
diff --git a/pages/massif/mana/recovery.vue b/pages/massif/mana/recovery.vue
index f3bfe5c..ae05e10 100644
--- a/pages/massif/mana/recovery.vue
+++ b/pages/massif/mana/recovery.vue
@@ -108,7 +108,7 @@
 					</view>
 				</view>
 			</view>
-			<u-empty v-if="list.length==0" width="70%" icon="/static/noData.png"/>
+			<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</scroll-view>
 
 		<u-datetime-picker
diff --git a/pages/massif/plant_plan.vue b/pages/massif/plant_plan.vue
index 41aa3c8..0b2bf64 100644
--- a/pages/massif/plant_plan.vue
+++ b/pages/massif/plant_plan.vue
@@ -93,7 +93,10 @@ export default {
 	},
 	methods:{
 		async init(){
-			var res=await request("/api/plantPlan/getType")
+			var res=await request("/common/api/dict/categoryValue",{
+				method:"post",
+				params:{code:"B06"}
+			})
 			if(res.statu){
 				this.fields.plantType.columns=[res.data]
 			}else{
diff --git a/pages/purchase/agrProdList.vue b/pages/purchase/agrProdList.vue
index 9c6855a..a9a9c6c 100644
--- a/pages/purchase/agrProdList.vue
+++ b/pages/purchase/agrProdList.vue
@@ -67,7 +67,7 @@
 					<text>{{v.detailedType}}</text> <text class="over">{{v.supplier}}</text>
 				</view>
 			</view>
-			<u-empty v-if="list.length==0" width="70%" icon="/static/noData.png"/>
+			<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</scroll-view>
 	</view>
 </template>
diff --git a/pages/purchase/detail.vue b/pages/purchase/detail.vue
index c219a8f..4cef750 100644
--- a/pages/purchase/detail.vue
+++ b/pages/purchase/detail.vue
@@ -73,7 +73,7 @@
 					<text>{{v.detailedType}}</text> <text class="over">{{v.supplier}}</text> <text :data-total="v.heft">{{v.packing}}</text>
 				</view>
 			</view>
-			<u-empty v-if="list.length==0" width="70%" icon="/static/noData.png"/>
+			<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</view>
 	</view>
 </template>
diff --git a/pages/stock/already.vue b/pages/stock/already.vue
index 116c2da..b1b16db 100644
--- a/pages/stock/already.vue
+++ b/pages/stock/already.vue
@@ -87,7 +87,7 @@
 					<text>领用时间：{{new Date(v.collectingTime).format("yyyy-MM-dd")}}</text> <text :data-unit="`共${v.total}kg`">{{v.num}}{{(v.specDescribe.match(/\/(.+)/)||['',''])[1]}}</text>
 				</view>
 			</view>
-			<u-empty v-if="list.length==0" width="70%" icon="/static/noData.png"/>
+			<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</scroll-view>
 	</view>
 </template>
diff --git a/pages/stock/list.vue b/pages/stock/list.vue
index f8af516..ded161c 100644
--- a/pages/stock/list.vue
+++ b/pages/stock/list.vue
@@ -217,21 +217,8 @@
 			</u-form>
 		</view>
 
-		<button class="cu-btn round bg-green shadow submit">确定</button>
+		<button class="cu-btn round bg-green shadow submit" @click="submit">确定</button>
 
-		<!-- <d-picker ref="dPicker" :list="stockList">
-			<view slot-scope="{row}" class="stock-picker">
-				<view class="info">
-					<text>{{row.agriculturalGoods}}</text>
-					<text :data-unit="row.specDescribe">{{row.substanceName}}</text>
-					<text>补货量≥{{row.replenishment||0}}kg</text>
-				</view>
-				<view class="company">
-					<text style="--c:#FBA83C;margin-right:14rpx;">{{row.detailType}}</text>
-					<text style="--c:#999;" class="over">{{row.supplierName}}</text>
-				</view>
-			</view>
-		</d-picker> -->
 	</view>
 </template>
 <script>
@@ -255,7 +242,8 @@ export default{
 				goodsId:"",
 				inOutBatchNo:"",
 				inOutVoucher:[],
-				number:""
+				number:"",
+				substanceType:"",
 			},
 			rules:{
 				inOutType:{required:true},
@@ -277,6 +265,7 @@ export default{
 			this.fields.number.suffix=(e.specDescribe.match(/\/(.+)/)||['',''])[1]
 			this.formData.goodsId=e.id
 		})
+		this.formData.substanceType = ({nz:1, ncp:2})[options.type],
 		this.mode=options.mode
 		uni.setNavigationBarTitle({
 			title:({out:"出库",in:"入库列表"})[this.mode]
@@ -299,6 +288,31 @@ export default{
 				})
 			}
 		},
+		submit(){
+			this.$refs.form.validate().then(async valid=>{
+				if(valid){
+					var res=await request("/api/OutInManageApi/outInList",{
+						method:"post",
+						body:{
+							...this.formData,
+							...this.detail,
+							supplier: this.detail.supplierName,
+							inOutVoucher:this.fields.inOutVoucher.value,
+							type: ({in:2, out:1})[this.mode],
+						}
+					})
+					if(res.statu){
+						uni.navigateBack()
+					}else{
+						uni.showModal({
+							title:"提示",
+							content:res.msg||"保存失败！",
+							showCancel:false,
+						})
+					}
+				}
+			})
+		},
 	},
 }
 </script>
\ No newline at end of file
diff --git a/pages/stock/mana.vue b/pages/stock/mana.vue
index 550498c..5af2748 100644
--- a/pages/stock/mana.vue
+++ b/pages/stock/mana.vue
@@ -147,7 +147,7 @@
 					</view>
 				</view>
 			</view>
-			<u-empty v-if="list.length<=0" width="70%" icon="/static/noData.png"/>
+			<u-empty v-if="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</scroll-view>
 		<button class="cu-btn round bg-green shadow submit" @click="$u.route({url:'/pages/stock/agrWarehouse'})">+农资入库</button>
 	</view>
diff --git a/pages/stock/record.vue b/pages/stock/record.vue
index 60b7383..d63471e 100644
--- a/pages/stock/record.vue
+++ b/pages/stock/record.vue
@@ -75,7 +75,7 @@
 				<text>{{v.supplierName}}</text> <text>{{v.number}}袋(共{{v.equivalentAmount}}{{v.unit}})</text>
 			</view>
 		</view>
-		<u-empty v-if="list.length<=0" width="70%" icon="/static/noData.png"/>
+		<u-empty v-if="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 	</view>
 </template>
 <script>
diff --git a/pages/warehouse/info.vue b/pages/warehouse/info.vue
index 201f1cb..c333a15 100644
--- a/pages/warehouse/info.vue
+++ b/pages/warehouse/info.vue
@@ -28,7 +28,7 @@ import request from '@/common/request.js'
 			return{
 				fields:{
 					warehouseName:{label:"仓库名称"},
-					warehouseAddress:{label:"仓库位置"},
+					warehouseAddress:{label:"仓库位置",type:"textarea"},
 					warehouseVolume:{label:"仓库容量(㎡)", type:"digit",placeholder:"请输入仓库容量"},
 					warehouseType:{label:"仓库类型",type:"select",columns:[[{label:"标签1",value:1},{label:"标签2",value:2}]],value:[]},
 					contactPeople:{label:"基地管理员"},
@@ -36,12 +36,12 @@ import request from '@/common/request.js'
 					warehousePic:{label:"仓库图片",type:"upImg",num:3},
 				},
 				formData:{
-					warehouseName:"5号仓库",
-					warehouseAddress:"昆明五华区",
-					warehouseVolume:"32",
+					warehouseName:"",
+					warehouseAddress:"",
+					warehouseVolume:"",
 					warehouseType:"",
-					contactPeople:"小明",
-					contactNumber:"13752000000",
+					contactPeople:"",
+					contactNumber:"",
 					warehousePic:[],
 					baseId: this.$store.state.plantBaseInfoId,
 				},
@@ -73,9 +73,12 @@ import request from '@/common/request.js'
 		},
 		methods:{
 			async init(){
-				var res=await request("/api/WarehouseManageApi/queryWarehouseType")
+				var res=await request("/common/api/dict/queryDictItemByDictCode",{
+					method:"post",
+					params:{dictCode: "warehouse_type"}
+				})
 				if(res.statu){
-					this.fields.warehouseType.columns=[res.data.map(v=>({label:v,value:v}))]
+					this.fields.warehouseType.columns=[res.data]
 				}else{
 					uni.showModal({
 						title:"提示",
diff --git a/pages/warehouse/mana.vue b/pages/warehouse/mana.vue
index fbe6171..e9e761f 100644
--- a/pages/warehouse/mana.vue
+++ b/pages/warehouse/mana.vue
@@ -92,7 +92,7 @@
 					</view>
 				</view>
 			</view>
-			<u-empty v-if="list.length==0" width="70%" icon="/static/noData.png"/>
+			<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</scroll-view>
 	</view>
 </template>
diff --git a/uni_modules/d-form/components/d-form/d-form.vue b/uni_modules/d-form/components/d-form/d-form.vue
index 49c4e0d..925510e 100644
--- a/uni_modules/d-form/components/d-form/d-form.vue
+++ b/uni_modules/d-form/components/d-form/d-form.vue
@@ -245,7 +245,7 @@
 		</u-form-item>
 		
 		<u-picker
-			v-if="type=='select'"
+			v-if="type=='select' && !disabled"
 			:columns="columns"
 			:show="show"
 			keyName="label"