From 0309a287199da2c0bd8f9f58e45a3d4b1e930aea Mon Sep 17 00:00:00 2001 From: majingfu <1344267175@qq.com> Date: Fri, 24 Feb 2023 18:05:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9F=BA=E5=9C=B0?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/massif/info.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pages/massif/info.vue b/pages/massif/info.vue index 5b90469..feafc34 100644 --- a/pages/massif/info.vue +++ b/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' } }, } - \ No newline at end of file + From 77a3dfe651c07a5fce9f32a4a0dee77098be3096 Mon Sep 17 00:00:00 2001 From: sjz-mxj <1375998991@qq.com> Date: Sat, 25 Feb 2023 17:42:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?type:refactor=20commit:=E5=86=9C=E4=BA=8B?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=B7=A5=E6=8A=95?= =?UTF-8?q?=E5=85=A5=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/massif/add_farming.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/massif/add_farming.vue b/pages/massif/add_farming.vue index a2a026e..ceeb925 100644 --- a/pages/massif/add_farming.vue +++ b/pages/massif/add_farming.vue @@ -204,6 +204,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"}, @@ -221,6 +222,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'}, }, From 12b95706a9ded13f47803d39e658517cba7d8181 Mon Sep 17 00:00:00 2001 From: sjz-mxj <1375998991@qq.com> Date: Sat, 25 Feb 2023 18:35:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?type:refactor=20commit=EF=BC=9A=E7=A7=8D?= =?UTF-8?q?=E6=A4=8D=E8=AE=A1=E5=88=92=E5=A2=9E=E5=8A=A0=E9=A2=84=E4=BC=B0?= =?UTF-8?q?=E4=BA=A7=E9=87=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/massif/plant_plan.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/massif/plant_plan.vue b/pages/massif/plant_plan.vue index 5aece1e..4ab4c36 100644 --- a/pages/massif/plant_plan.vue +++ b/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"},