From 082613d446e29e4ec1c16bfaa52345106a498b23 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:03:49 +0800
Subject: [PATCH] 农事操作隐藏后四个，地图模式2d改为3d

---
 src/views/wel/recovery.vue |   72 +++++++++++++++++++++++------------
 1 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/src/views/wel/recovery.vue b/src/views/wel/recovery.vue
index 34994ea..e0b67f1 100644
--- a/src/views/wel/recovery.vue
+++ b/src/views/wel/recovery.vue
@@ -15,14 +15,14 @@
 <script>
 
 import { mapState } from "vuex";
-import { getLandList } from "@/api/land/land";
+import { getLandList,getByStrainIdFarmId } from "@/api/land/land";
 import { getUserList } from "@/api/system/user";
 import { getStrainList } from "@/api/farmplant/strain";
 import { save } from "@/api/farmplant/recovery";
 export default {
   data() {
     return {
-      title:"采收/捕捞",
+      title:"采收",
       form: {},
       option: {
         emptyBtn: false,
@@ -44,7 +44,7 @@
               {
                 required: true,
                 message: "请输入采收品种",
-                trigger: "blur",
+                trigger: ["blur","change"],
               },
             ],
             disabled:true,
@@ -57,6 +57,7 @@
             prop: "landId",
             type:"tree",
             dicData: [],
+            disabled:false,
             props: {
               label: "landName",
               value: "id"
@@ -65,7 +66,7 @@
               {
                 required: true,
                 message: "请选择采收地块",
-                trigger: "click",
+                trigger: ["blur","change"],
               },
             ],
           },
@@ -82,7 +83,7 @@
               {
                 required: true,
                 message: "请输入采收重量 公斤",
-                trigger: "click",
+                trigger: "change",
               },
             ],
           },
@@ -108,7 +109,7 @@
               {
                 required: true,
                 message: "请选择作业方式",
-                trigger: "click",
+                trigger: ["blur","change"],
               },
             ],
           },
@@ -125,7 +126,7 @@
               {
                 required: true,
                 message: "请选择采收时间",
-                trigger: "click",
+                trigger: ["blur","change"],
               },
             ],
           },
@@ -139,7 +140,7 @@
           //     {
           //       required: true,
           //       message: "请输入采收产品",
-          //       trigger: "click",
+          //       trigger: ["blur","change"],
           //     },
           //   ],
           // },
@@ -159,7 +160,7 @@
               {
                 required: true,
                 message: "请输入操作人",
-                trigger: "click",
+                trigger: ["blur","change"],
               },
             ],
           },
@@ -197,7 +198,7 @@
               {
                 required: true,
                 message: "请输入产品等级",
-                trigger: "click",
+                trigger: ["blur","change"],
               },
             ],
           },
@@ -212,7 +213,7 @@
               {
                 required: false,
                 message: "请输入备注",
-                trigger: "click",
+                trigger: ["blur","change"],
               },
             ],
           },
@@ -221,9 +222,15 @@
       visible: false,
     };
   },
+  props:{
+    farmDetail:{
+      type:Object
+    }
+  },
   computed: {
     ...mapState({
       userInfo: (state) => state.user.userInfo,
+      $farmId : state =>state.user.$farmId,
     }),
   },
   methods: {
@@ -243,10 +250,10 @@
         //秒 getSeconds()：(0 ~ 59)
         var second = date.getSeconds();
         //赋值
-        this.form['time'] = year + '-' 
-                          + this.addZero(month) + '-' 
-                          + this.addZero(day) + ' ' 
-                          + this.addZero(hour) + ':' 
+        this.form['time'] = year + '-'
+                          + this.addZero(month) + '-'
+                          + this.addZero(day) + ' '
+                          + this.addZero(hour) + ':'
                           + this.addZero(minute);
     },
     //小于10的拼接上0字符串
@@ -255,6 +262,7 @@
     },
     //初始化
     init(data) {
+      this.visible = true;
       this.form = {
         farmPlantId:data.id,
         strainId:data.strainId,
@@ -268,18 +276,30 @@
       this.form['operator'] = this.userInfo.user_id;
       //计算当前时间
       this.getNowTime();
-      this.visible = true;
       var that = this;
+      var landIdcolumn = that.findObject(that.option.column, "landId");
       //获取农地数据
-      getLandList(this.userInfo.user_id).then((res) => {
-        if (res.data.code == 200) {
-          var landIdcolumn = that.findObject(that.option.column, "landId");
-          that.landList = res.data.data;
-          landIdcolumn.dicData = res.data.data;
+      if(data.landId != ""){
+        getLandList(this.$farmId).then((res) => {
+          if (res.data.code == 200) {
+            landIdcolumn.dicData = res.data.data;
+            landIdcolumn.disabled = true
+          }
+        });
+      }else{
+        //获取农地数据
+        var params = {
+          strainId : this.form.strainId,
+          farmId:this.farmDetail.id,
+          sfpStatus:1,
         }
-      });
-      
-      //获取操作人
+        getByStrainIdFarmId(params).then((res) => {
+          if (res.data.code == 200) {
+            landIdcolumn.dicData = res.data.data;
+          }
+        });
+      }
+      // 获取操作人
       const user = {
         tenantId: this.userInfo.tenant_id,
       };
@@ -298,9 +318,11 @@
       })
     },
     // 表单提交
-    submit(row,loading,done) {
+    submit(row,done) {
       var that = this;
       row.time = row.time + ":00";
+      row['tenantId'] = this.userInfo.tenant_id;
+      row['deptId'] = this.$farmId;
       save(row).then(
         () => {
           this.$refs.form.resetFields();

--
Gitblit v1.9.3