Merge branch 'master' of http://159.75.207.46:3000/denghong/plant_manage_mobile into master

pages/massif/add_farming.vue

@@ -219,6 +219,7 @@ export default {
 			fields:{
 				principal:{label:"操作人",styleType:"parallel", disabled:true},
 				farmingTime:{label:"操作日期",styleType:"parallel",type:"calendar"},
+				userNum:{label:"人工投入(个)"},
 				farmingPlanId:{label:"种植计划",type:"select",columns:[],value:[]},
 				images:{label:"农事图片",type:"upImg",num:3},
 				farmingRemarks:{label:"备注",type:"textarea"},
@@ -237,6 +238,7 @@ export default {
 				plantBaseInfoId: this.$store.state.baseInfo.id,
 			},
 			rules:{
+				userNum:{required:true,message:"人工投入必填！",trigger:'blur'},
 				farmingTime:{required:true,message:"操作日期必填！",trigger:'blur'},
 				farmingPlanId:{required:true,message:"种植计划必选！",trigger:'blur'},
 			},

pages/massif/info.vue

@@ -43,6 +43,7 @@ import request from '@/common/request'
 				},
 				formData:{
 					plantBaseInfoId:"",
+					plantBaseName:"",
 					plotNumber:"",
 					plotName:"",
 					drawArea:'',
@@ -175,4 +176,4 @@ import request from '@/common/request'
 			}
 		},
 	}
-</script>
+</script>

pages/massif/plant_plan.vue

@@ -36,6 +36,7 @@ export default {
 				varietyName:{label:"品种名称"},
 				plantType:{label:"作物类型",type:"select",columns:[[]],value:[]},
 				plantArea:{label:"种植面积(亩)",type:"digit"},
+				estimateOutput:{label:"预估产量(kg)",type:"digit"},
 				startTime:{label:"种植开始日期",type:"calendar"},
 				harvestTime:{label:"预估采收日期",type:"calendar"},
 				images:{label:"产品图片",type:"upImg",num:3,value:''},
@@ -68,6 +69,7 @@ export default {
 				varietyName: {required:true, message:"品种名称必填！", trigger:"blur"},
 				plantType: {required:true, message:"作物类型必选！", trigger:"blur"},
 				plantArea: {required:true, type:"number", message:"种植面积必填！", trigger:"blur"},
+				estimateOutput: {required:true, type:"number", message:"预估产量必填！", trigger:"blur"},
 				startTime: {required:true, message:"种植开始日期必选！", trigger:"blur"},
 				harvestTime: {required:true, message:"预估采收日期必选！", trigger:"blur"},
 				images: {required:true, message:"产品图片必选！", trigger:"blur"},