From e7f31ab44320400916af28ecdc03b7a3ad5efb79 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Fri, 19 May 2023 19:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E6=94=B6=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=9F=E8=B4=A3=E4=BA=BA=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue        |  4 ++--
 pages/massif/plant_info.vue | 14 ++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index 93382f3..4911b6e 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -316,13 +316,13 @@
 			<template v-if="!baseIndex || baseIndex=='record'">
 				<view v-for="(v,k) in baseInfo.farmWork||[]" :key="`${k}_work`" class="item" style="--c:16, 193, 118;">
 					<text>农事</text>
-					<u-notice-bar style="padding:0rpx;" icon="" speed="45" color="#777" bgColor="" :text="`${v.userName}${new Date(v.time).format('yyyy-MM-dd')}日完成了${v.plotName}${v.farmWorkName}任务`"/>
+					<u-notice-bar style="padding:0rpx;" icon="" speed="45" color="#777" bgColor="" :text="`${new Date(v.time).format('yyyy-MM-dd')}：${v.userName} 完成了${v.plotName}${v.farmWorkName}任务`"/>
 				</view>
 			</template>
 			<template v-if="!baseIndex || baseIndex=='input'">
 				<view v-for="(v,k) in baseInfo.farmingInput||[]" :key="`${k}_input`" class="item" style="--c:255, 195, 83;">
 					<text>投入品</text>
-					<u-notice-bar style="padding:0rpx;" icon="" speed="45" color="#777" bgColor="" :text="`${v.userName}${new Date(v.time).format('yyyy-MM-dd')}日完成了${v.plotName}${v.farmWorkName}任务`"/>
+					<u-notice-bar style="padding:0rpx;" icon="" speed="45" color="#777" bgColor="" :text="`${new Date(v.time).format('yyyy-MM-dd')}：${v.userName} 完成了${v.plotName}${v.farmWorkName}任务`"/>
 				</view>
 			</template>
 			<u-empty :show="isEmpty" text="为查询到相关信息" width="50%" icon="/static/noData.png"/>
diff --git a/pages/massif/plant_info.vue b/pages/massif/plant_info.vue
index 74443da..93adcbb 100644
--- a/pages/massif/plant_info.vue
+++ b/pages/massif/plant_info.vue
@@ -32,7 +32,7 @@ export default {
 			fields:{
 				harvestNum:{label:"采收数量",suffix:'kg',type:"digit"},
 				harvestBatch:{label:"收获批次号",btnText:"生成", btnFun:()=>this.formData.harvestBatch=`CS${new Date().format('yyyyMMdd')}${new Date().getTime()}`},
-				principal:{label:"负责人",type:"select",columns:[],value:[]},
+				principal:{label:"负责人",disabled:true},
 				harvestTime:{label:"采收时间",type:"calendar"},
 				status:{label:"采收状态",type:"select",columns:[],value:[]},
 				warehouseId:{label:"仓库",type:"select",columns:[],value:[]},
@@ -40,7 +40,7 @@ export default {
 			formData:{
 				harvestNum:"",
 				harvestBatch:"",
-				principal:"",
+				principal: this.$store.getters.userInfo.realname,
 				harvestTime:"",
 				status:"",
 				warehouseId:"",
@@ -67,16 +67,6 @@ export default {
 	},
 	methods:{
 		async init(){
-			var res=await request("/api/plantHarvest/getUser")
-			if(res.statu){
-				this.fields.principal.columns=[res.data.map(v=>({label:v,value:v}))]
-			}else{
-				uni.showModal({
-					title:"提示",
-					content:res.msg||"获取负责人选项失败！",
-					showCancel:false,
-				})
-			}
 			//仓库 下拉选
 			var res=await request("/api/plantHarvest/getWarehouse",{
 				params:{