From 9a2178dbadc4107d0bd3a2ac952bee875db14337 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Mon, 16 Jan 2023 17:45:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=96=B0=E5=A2=9E=E9=87=87?=
 =?UTF-8?q?=E6=94=B6=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/massif/info.vue           |  2 +-
 pages/massif/mana/plantPlan.vue | 25 +++++++++++++++----
 pages/massif/plant_info.vue     | 44 +++++++++++++++++++++++++--------
 pages/massif/plant_plan.vue     |  6 +++--
 4 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/pages/massif/info.vue b/pages/massif/info.vue
index b9248d2..2eeda79 100644
--- a/pages/massif/info.vue
+++ b/pages/massif/info.vue
@@ -17,7 +17,7 @@
 				:value="(/^dateRange$|^select$/.test(v.type)?fields[k].value:formData[k])"
 				@input="formData[k]=$event"
 				@selectRDate="selectDate"
-				@select="fields[k].value=[$event];formData[k]=fields[k].columns[0][$event].value"
+				@select="fields[k].value=$event;formData[k]=fields[k].columns[0][$event[0]].value"
 				@imgs="fields[k].value=$event"/>
 		</u-form>
 		<button class="cu-btn round bg-green shadow submit" @click="sumbit">保存</button>
diff --git a/pages/massif/mana/plantPlan.vue b/pages/massif/mana/plantPlan.vue
index 15faf99..6b88d3a 100644
--- a/pages/massif/mana/plantPlan.vue
+++ b/pages/massif/mana/plantPlan.vue
@@ -89,12 +89,12 @@
 </style>
 <template>
 	<view class="plant_plan">
-		<view class="card" v-for="(v,k) in list" :key="k" @click="reDetail(v.id)">
-			<view class="info">
+		<view class="card" v-for="(v,k) in list" :key="k">
+			<view class="info" @click="reDetail(v.id)">
 				<image :src="`${host}/${v.images}`" :data-type="v.plantType"/>
 				<view class="detail">
 					<view class="name">
-						<text>{{v.plantStandard}}</text> <text>{{v.varietyName}}</text> <text class="plant-youbian"/>
+						<text>{{v.plantStandard}}</text> <text class="over">{{v.varietyName}}</text> <text class="plant-youbian"/>
 					</view>
 					<view class="batch" style="--c:#999;">种植批次号：{{v.plantBatch}}</view>
 					<view class="recovery" style="--c:#FFC760;">已采收：{{v.harvested}}kg</view>
@@ -103,8 +103,8 @@
 			</view>
 			<view class="date">
 				<text>本次预估采收时间：{{v.harvestTime}}</text>
-				<button class="cu-btn" style="--c:255, 196, 87;">结束种植</button>
-				<button class="cu-btn" style="--c:153, 153, 153;" @click.stop="$u.route({url:'pages/massif/plant_info'})">采收</button>
+				<button class="cu-btn" style="--c:255, 196, 87;" @click.stop="finishPlant(v.id)">结束种植</button>
+				<button class="cu-btn" style="--c:153, 153, 153;" @click.stop="$u.route({url:'pages/massif/plant_info',params:{plantId:v.id,plotId:id}})">采收</button>
 			</view>
 		</view>
 		<u-empty v-if="list.length==0" icon="http://cdn.uviewui.com/uview/empty/data.png"/>
@@ -173,6 +173,21 @@ export default {
 				event:{update:()=> {this.clean();this.search()} }
 			})
 		},
+		//结束种植
+		async finishPlant(plantPlanId){
+			var res=await request("/api/plantPlan/finishPlant",{
+				params:{plantPlanId}
+			})
+			if(res.statu){
+
+			}else{
+				uni.showModal({
+					title:"提示",
+					content:res.msg||"结束种植失败！",
+					showCancel:false,
+				})
+			}
+		},
 	}
 }
 </script>
\ No newline at end of file
diff --git a/pages/massif/plant_info.vue b/pages/massif/plant_info.vue
index 5cf4285..52fec26 100644
--- a/pages/massif/plant_info.vue
+++ b/pages/massif/plant_info.vue
@@ -1,5 +1,9 @@
 <style lang="scss">
 	.container{
+		min-height:100%;
+		background:#f6f6f6;
+		padding:30rpx 0;
+
 		.cu-navbar{
 			.action>button{
 				background:rgba(255, 255, 255, 0.1);
@@ -17,7 +21,7 @@
 <template>
 	<view class="container">
 		<cu-navbar text="采收信息" style="--bg:#10C176;--c:#fff;" isBack>
-			<button slot="right" class="cu-btn round">提交</button>
+			<button slot="right" class="cu-btn round" @click="submit">提交</button>
 		</cu-navbar>
 
 		<u-form class="card inline" :model="formData" :rules="rules" ref="form" labelWidth="auto">
@@ -26,28 +30,48 @@
 				:key="k"
 				v-bind="v"
 				:field="k"
-				:required="!!rules[k]"/>
+				:required="!!rules[k]"
+				:value="/^select$/.test(v.type)?fields[k].value:formData[k]"/>
 		</u-form>
 	</view>
 </template>
 <script>
+import request from '@/common/request'
 export default {
 	data(){
 		return{
 			fields:{
-				num:{label:"采收数量",suffix:'kg'},
-				batch:{label:"收获批次号",btnText:"生成", btnFun(){console.log('asdfafd')}},
-				director:{label:"负责人",type:"select"},
-				recoveryDate:{label:"采收时间",type:"calendar"},
-				recoveryType:{label:"采收状态",type:"select"},
+				harvestNum:{label:"采收数量",suffix:'kg'},
+				harvestBatch:{label:"收获批次号",btnText:"生成", btnFun:()=>this.formData.harvestBatch=`CS${new Date().format('yyyyMMdd')}${new Date().getTime()}`},
+				principal:{label:"负责人",type:"select"},
+				harvestTime:{label:"采收时间",type:"calendar"},
+				status:{label:"采收状态",type:"select",columns:[[{label:"本次采收完后续还会采收",value:"1"},{label:"已全部采收完",value:"2"}]],value:[null]},
 			},
 			formData:{
-				name:"",
+				harvestNum:"",
+				harvestBatch:"",
+				principal:"",
+				harvestTime:"",
+				status:"",
+				plantSchedulId:"",//种植计划id
+				plotId:"",
 			},
 			rules:{
-
+				harvestNum: {required:true, message:"必填！", trigger:"blur"},
+				harvestBatch:{required:true, message:"必填！", trigger:"blur"},
+				principal:{required:true, message:"必填！", trigger:"blur"},
+				harvestTime:{required:true, message:"必填！", trigger:"blur"},
+				status:{required:true, message:"必填！", trigger:"blur"},
+				plantSchedulId:{required:true, message:"必填！", trigger:"blur"},
 			}
 		}
-	}
+	},
+	onLoad(options){
+		this.formData.plantSchedulId=options.plantId
+		this.formData.plotId=options.plotId
+	},
+	methods:{
+		submit(){},
+	},
 }
 </script>
\ No newline at end of file
diff --git a/pages/massif/plant_plan.vue b/pages/massif/plant_plan.vue
index 86aaed6..5dffc64 100644
--- a/pages/massif/plant_plan.vue
+++ b/pages/massif/plant_plan.vue
@@ -81,9 +81,9 @@ export default {
 			eventChannel:null,
 		}
 	},
-	onLoad(options){
+	async onLoad(options){
 		this.eventChannel=this.getOpenerEventChannel()
-		this.init()
+		await this.init()
 		
 		options.plotId && (this.formData.plotId=options.plotId)
 		options.id && this.getDetail(options.id)
@@ -131,6 +131,8 @@ export default {
 			if(res.statu){
 				this.formData=res.data
 				this.fields.images.value=res.data.images.join(',')
+				this.fields.plantType.value=[this.fields.plantType.columns[0].findIndex(v=>v.value==res.data.plantType[0])]
+				this.fields.plantType.value[1]=this.fields.plantType.columns[0][this.fields.plantType.value[0]].children.findIndex(v=>v.value==res.data.plantType[1])
 			}else{
 				uni.showModal({
 					title:"提示",